Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.14.2 2017-09-10T08:03:02Z 2017-09-10T08:03:02Z Junio C Hamano gitster@pobox.com 2017-09-10T08:03:02Z urn:sha1:afa6608b930b722dbf93dfc44f4cc225862d33ed Code clean-up. * rs/merge-microcleanup: merge: use skip_prefix() 2017-09-10T08:03:00Z Junio C Hamano gitster@pobox.com 2017-09-10T08:03:00Z urn:sha1:70def2c47fd541b6c62629a23054c317428ea43e Message fix. * rj/add-chmod-error-message: builtin/add: add detail to a 'cannot chmod' error message 2017-09-10T08:02:55Z Junio C Hamano gitster@pobox.com 2017-09-10T08:02:55Z urn:sha1:78ad09403c0c87ae52573bbac2fa7e093152891d Killing "git merge --edit" before the editor returns control left the repository in a state with MERGE_MSG but without MERGE_HEAD, which incorrectly tells the subsequent "git commit" that there was a squash merge in progress. This has been fixed. * mg/killed-merge: merge: save merge state earlier merge: split write_merge_state in two merge: clarify call chain Documentation/git-merge: explain --continue 2017-09-10T08:02:53Z Junio C Hamano gitster@pobox.com 2017-09-10T08:02:52Z urn:sha1:c3b931e162919da99517cc6b0d73303befcfd1db Memory leak in an error codepath has been plugged. * rs/fsck-obj-leakfix: fsck: free buffers on error in fsck_obj() 2017-09-10T08:02:51Z Junio C Hamano gitster@pobox.com 2017-09-10T08:02:51Z urn:sha1:00fd0afefd6b2a37497141d1d2a0d95210806406 "git am -s" has been taught that some input may end with a trailer block that is not Signed-off-by: and it should refrain from adding an extra blank line before adding a new sign-off in such a case. * pw/am-signoff: am: fix signoff when other trailers are present 2017-09-10T08:02:49Z Junio C Hamano gitster@pobox.com 2017-09-10T08:02:49Z urn:sha1:277194a28050c2eabb605994d592d8e46cab6302 "git clone --recurse-submodules --quiet" did not pass the quiet option down to submodules. * bw/clone-recursive-quiet: clone: teach recursive clones to respect -q 2017-09-10T08:02:49Z Junio C Hamano gitster@pobox.com 2017-09-10T08:02:49Z urn:sha1:86c726f0d1ac91a6dacb3ae306d830e9686ae703 Commands like "git rebase" accepted the --rerere-autoupdate option from the command line, but did not always use it. This has been fixed. * pw/sequence-rerere-autoupdate: cherry-pick/revert: reject --rerere-autoupdate when continuing cherry-pick/revert: remember --rerere-autoupdate t3504: use test_commit rebase -i: honor --rerere-autoupdate rebase: honor --rerere-autoupdate am: remember --rerere-autoupdate setting 2017-09-10T08:02:49Z Junio C Hamano gitster@pobox.com 2017-09-10T08:02:49Z urn:sha1:eba2a68f25c8afc56e204daf707e80613cc6e926 "git push --recurse-submodules $there HEAD:$target" was not propagated down to the submodules, but now it is. * bw/push-options-recursively-to-submodules: submodule--helper: teach push-check to handle HEAD 2017-09-10T08:02:48Z Junio C Hamano gitster@pobox.com 2017-09-10T08:02:48Z urn:sha1:702239d049dbd95f55c898c4707a3615b0237abd The "tag.pager" configuration variable was useless for those who actually create tag objects, as it interfered with the use of an editor. A new mechanism has been introduced for commands to enable pager depending on what operation is being carried out to fix this, and then "git tag -l" is made to run pager by default. If this works out OK, I think there are low-hanging fruits in other commands like "git branch" that outputs long list in one mode while taking input in another. * ma/pager-per-subcommand-action: git.c: ignore pager.* when launching builtin as dashed external tag: change default of `pager.tag` to "on" tag: respect `pager.tag` in list-mode only t7006: add tests for how git tag paginates git.c: provide setup_auto_pager() git.c: let builtins opt for handling `pager.foo` themselves builtin.h: take over documentation from api-builtin.txt 2017-09-10T08:02:48Z Junio C Hamano gitster@pobox.com 2017-09-10T08:02:48Z urn:sha1:c2a3bb47f0a5cf8537b3d79cd01b11a5726afb02 "git log --tag=no-such-tag" showed log starting from HEAD, which has been fixed---it now shows nothing. * jk/rev-list-empty-input: revision: do not fallback to default when rev_input_given is set rev-list: don't show usage when we see empty ref patterns revision: add rev_input_given flag t6018: flesh out empty input/output rev-list tests