5fc861c...
by
Junio C Hamano <email address hidden>
Merge branch 'ps/no-writable-strings' into seen
* ps/no-writable-strings:
SQUASH???
config.mak.dev: enable `-Wwrite-strings` warning
builtin/merge: always store allocated strings in `pull_twohead`
builtin/rebase: adapt code to not assign string constants to non-const
imap-send: fix leaking memory in `imap_server_conf`
imap-send: drop global `imap_server_conf` variable
mailmap: always store allocated strings in mailmap blob
revision: always store allocated strings in output encoding
remote-curl: avoid assigning string constant to non-const variable
send-pack: always allocate receive status
parse-options: cast long name for OPTION_ALIAS
object-file: make `buf` parameter of `index_mem()` a constant
line-log: always allocate the output prefix
http: do not assign string constant to non-const field
refspec: remove global tag refspec structure
reftable: improve const correctness when assigning string constants
compat/win32: fix const-correctness with string constants
global: convert intentionally-leaking config strings to consts
global: assign non-const strings as required
global: improve const correctness when assigning string constants
fd33108...
by
Junio C Hamano <email address hidden>
Merge branch 'gt/decorate-unit-test' into seen
A test helper that essentially is unit tests on the "decorate"
logic has been rewritten using the unit-tests framework.
* gt/decorate-unit-test:
t/: migrate helper/test-example-decorate to the unit testing framework
5754752...
by
Junio C Hamano <email address hidden>
Merge branch 'iw/trace-argv-on-alias' into seen
Log the alias-expanded command lines to the trace output.
* iw/trace-argv-on-alias:
SQUASH???
run-command: show prepared command
Documentation: alias: add notes on shell expansion
Documentation: alias: rework notes into points
53f21cc...
by
Junio C Hamano <email address hidden>
Merge branch 'cc/upload-pack-missing-action' into seen
Allow a server S that is a lazy clone of another repository X to
respond to a request by C that is a lazy clone of S in a way that
it omits objects it itself does not have (and has to be lazily
fetched from X).
I would say this is a terribly irresponsive design, especially
there is no negociation for S to learn if the objects it is going
to omit is obtainable by C from elsewhere.
* cc/upload-pack-missing-action:
upload-pack: allow configuring a missing-action
pack-objects: use the missing action API
rev-list: refactor --missing=<missing-action>
a705f0e...
by
Junio C Hamano <email address hidden>
Merge branch 'ps/document-breaking-changes' into seen
The structure of the document that records longer-term project
decisions to deprecate/remove/update various behaviour has been
outlined.
30c0999...
by
Junio C Hamano <email address hidden>
Merge branch 'ds/doc-config-reflow' into seen
Reflow a paragraph in the documentation source without any effect
to the formatted text.
* ds/doc-config-reflow:
config.txt: perform some minor reformatting
27aed87...
by
Junio C Hamano <email address hidden>
Merge branch 'ie/config-includeif-hostname' into seen
The conditional inclusion mechanism for configuration files learned
to switch on the hostname.
* ie/config-includeif-hostname:
config: learn the "hostname:" includeIf condition
t: add a test helper for getting hostname
6e0dfa3...
by
Junio C Hamano <email address hidden>
Merge branch 'bk/complete-dirname-for-am-and-format-patch' into seen
Command line completion support (in contrib/) has been
updated for a few commands to complete directory names where a
directory name is expected.
* bk/complete-dirname-for-am-and-format-patch:
completion: dir-type optargs for am, format-patch
eb4e143...
by
Junio C Hamano <email address hidden>
Merge branch 'bk/complete-send-email' into seen
Command line completion support (in contrib/) has been taught to
avoid offering revision names as candidates to "git send-email" when
the command is used to send pre-generated files.
* bk/complete-send-email:
completion: don't complete revs when --no-format-patch
4de387e...
by
Junio C Hamano <email address hidden>
Merge branch 'jc/rerere-cleanup' into seen
Code clean-up.
* jc/rerere-cleanup:
rerere: modernize use of empty strbuf
rerere: try_merge() should use LL_MERGE_ERROR when it means an error
rerere: fix comment on handle_file() helper
rerere: simplify check_one_conflict() helper function
