more than one main upstream tarballs listed.
commit ae3f81766363736267f2a2ba04799c4a69284f0d
Merge: df7cdf49f5 616831d46d
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Jun 6 14:42:08 2021 -0700
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: new upstream release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: Idd7c8e4e72206b98f0a21545d860c87e03cf0719
commit df7cdf49f55508d114d86dea30d98b6ac30dd25a
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Jun 6 14:40:52 2021 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I8509bbf74794c492c9d134d8580780a97dba4c56
commit ac0c873fbb1dc960fc4fe25e8be98139298f8193
Merge: 27521096f9 935e593368
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Jun 6 14:37:48 2021 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I9d974d4c3da83afce09fd3a85807f5a7fb645f7a
commit 616831d46dce4a23f129c571e10b0df71715e556
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Jun 6 14:35:42 2021 -0700
debian: new upstream release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 06d5d934bc439d2ca378c876d67dd397cfb2239e
Merge: 67b73aadeb ebf3c04b26
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Jun 6 14:33:52 2021 -0700
Merge tag 'v2.32.0' into debian-sid
Git 2.32
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 935e593368000d8476c1712a0a3d40699d2af34b
Merge: 834ea5e286 ebf3c04b26
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Jun 6 15:42:07 2021 +0900
Sync with Git 2.32
commit 834ea5e286c23d9a897f0b8a3a874d095981de05
Merge: 28992617a1 ebee5580ca
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Jun 6 14:05:53 2021 +0900
Merge branch 'rs/parallel-checkout-test-fix' into next
* rs/parallel-checkout-test-fix:
parallel-checkout: avoid dash local bug in tests
commit 28992617a1a1d4f11b47bcd6cd75152fa298bd17
Merge: 926086ebc4 cccdfd2243
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Jun 5 22:16:23 2021 +0900
Merge branch 'jc/fsync-can-fail-with-eintr' into next
Last minute portability fix.
* jc/fsync-can-fail-with-eintr:
fsync(): be prepared to see EINTR
commit 926086ebc4ae8f6b5c7ad3879ed2adde33d6bb1a
Merge: b8b87a5505 c09b6306c6
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jun 2 12:52:49 2021 +0900
Sync with Git 2.32-rc3
commit b8b87a550550e7db4787c6f808916622bb5a4b29
Merge: 29a9b45dd6 0b18023d00
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jun 2 12:50:14 2021 +0900
Merge branch 'da/zsh-completion-fix-for-2.32' into next
* da/zsh-completion-fix-for-2.32:
contrib/completion: fix zsh completion regression from 59d85a2a05
commit 29a9b45dd62231bbdd8bfb01c4013934dd1c2059
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jun 2 12:49:58 2021 +0900
Revert "Merge branch 'da/zsh-completion-fix-for-2.32' into next"
This reverts commit 3eedc9867480aa1e04526d319179c07bbba81fbe, reversing
changes made to 51b09ce3c035b27356d66abf476140b855762b37.
commit 3eedc9867480aa1e04526d319179c07bbba81fbe
Merge: 51b09ce3c0 135ea5c692
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jun 2 12:14:13 2021 +0900
Merge branch 'da/zsh-completion-fix-for-2.32' into next
Fix breakages to zsh completion script (in contrib/) due to recent
update to the bash completion of the same.
* da/zsh-completion-fix-for-2.32:
contrib/completion: fix zsh completion regression from 59d85a2a05
Git 2.32-rc3
commit 135ea5c692e648ff1107944c28e138fe415594cb
Author: David Aguilar <davvid@gmail.com>
Date: Tue Jun 1 13:52:29 2021 -0700
contrib/completion: fix zsh completion regression from 59d85a2a05
A recent change to make git-completion.bash use $__git_cmd_idx
in more places broke a number of completions on zsh because it
modified __git_main but did not update __git_zsh_main.
Notably, completions for "add", "branch", "mv" and "push" were
broken as a result of this change.
In addition to the undefined variable usage, "git mv <tab>" also
prints the following error:
__git_count_arguments:7: bad math expression:
operand expected at `"1"'
_git_mv:[:7: unknown condition: -gt
Remove the quotes around $__git_cmd_idx in __git_count_arguments
and set __git_cmd_idx=1 early in __git_zsh_main to fix the
regressions from 59d85a2a05.
This was tested on zsh 5.7.1 (x86_64-apple-darwin19.0).
Suggested-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Acked-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 1598de3b30626e6e8efdeae27d1b16a28c0460ff
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jun 2 07:36:22 2021 +0900
Git 2.32-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 51b09ce3c035b27356d66abf476140b855762b37
Merge: af103e12f4 28abf260a5
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jun 2 06:56:32 2021 +0900
Merge branch 'ab/fsck-api-cleanup' into next
Last minute compilation fix.
* ab/fsck-api-cleanup:
builtin/fsck.c: don't conflate "int" and "enum" in callback
commit 27521096f94b5f5caf0b04cf0a9c0d779854f3d6
Merge: 8cb6b53133 67b73aadeb
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon May 31 15:19:52 2021 -0700
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: remove git-el package
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: If6e8e7ef26e56680ecb4a3ff9368144614be4e14
commit 8cb6b53133e1346b29591206b7c964c4c32dafb5
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon May 31 15:12:39 2021 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I85b66a5f03e3c68a3c93545803900d855deab908
commit e741a1132f07a7acf53fa151da8fe7619ffb520d
Merge: 02af911ce5 af103e12f4
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon May 31 15:09:44 2021 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I849fd9e5ad5231f1cc5273596b2a9a667b68c536
commit 67b73aadebd3d0fc8b408a4ef9bf5b54136592bc
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon May 31 15:03:12 2021 -0700
debian: remove git-el package
Since 6d5ed4836d (git{,-blame}.el: remove old bitrotting Emacs code,
2018-04-11), the emacs modules in the git-el package have consisted
only of an "(error)" call to help people find a more modern,
maintained module. Alas, packaging even for that has proven
difficult to maintain, producing errors like
/usr/lib/emacsen-common/packages/install/git emacs xemacs21 failed at /usr/lib/emacsen-common/lib.pl line 19, <TSORT> line 1.
Remove the compatibility package, with a Breaks to ensure that
people's installations get cleaned up.
Fixes: https://bugs.debian.org/987264
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 7c02b1c91f609903782a42ce340acdd00e0a45e1
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon May 31 14:53:41 2021 -0700
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 729b69e4327a755c2ed21a2464c6ec6edce04bbf
Merge: 794632f442 4e42405f00
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon May 31 14:51:57 2021 -0700
Merge tag 'v2.32.0-rc2' into debian-sid
Git 2.32-rc2
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit af103e12f45b229bf1f6e8d1f64a2d86be594b4b
Merge: 73bf1ecb31 7ba3016729
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon May 31 13:06:58 2021 +0900
Merge branch 'fc/doc-build-cleanup' into next
Preparatory build procedure clean-up for documentation.
* fc/doc-build-cleanup:
doc: avoid using rm directly
doc: simplify Makefile using .DELETE_ON_ERROR
doc: remove unnecessary rm instances
doc: improve asciidoc dependencies
doc: refactor common asciidoc dependencies
commit 73bf1ecb31d7627b062cd9267ff9e15fe55b2560
Merge: 280156cefb f0d4d398e2
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon May 31 13:06:58 2021 +0900
Merge branch 'ab/test-lib-updates' into next
Test clean-up.
* ab/test-lib-updates:
test-lib: split up and deprecate test_create_repo()
test-lib: do not show advice about init.defaultBranch under --verbose
test-lib: reformat argument list in test_create_repo()
submodule tests: use symbolic-ref --short to discover branch name
test-lib functions: add --printf option to test_commit
describe tests: convert setup to use test_commit
test-lib functions: add an --annotated option to "test_commit"
test-lib-functions: document test_commit --no-tag
test-lib-functions: reword "test_commit --append" docs
test-lib tests: remove dead GIT_TEST_FRAMEWORK_SELFTEST variable
test-lib: bring $remove_trash out of retirement
commit 280156cefb2268b8300e6278adc4f77af04d439f
Merge: 56961581ce 4e42405f00
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 28 13:20:00 2021 +0900
Sync with Git 2.32-rc2
commit 56961581ce84011c5e1d921a4f6b7da095f7ec88
Merge: 562b4e6f10 5317dfeaed
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 28 13:13:27 2021 +0900
Merge branch 'dd/honor-users-tar-in-tests' into next
Test portability fix.
* dd/honor-users-tar-in-tests:
t: use configured TAR instead of tar
commit 562b4e6f1018e360911ceb5a6d4aec3373eb9d39
Merge: 09820da41b 8013d7d9ee
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 28 13:13:27 2021 +0900
Merge branch 'ah/setup-extensions-message-i18n-fix' into next
Message update.
* ah/setup-extensions-message-i18n-fix:
setup: split "extensions found" messages into singular and plural
commit 09820da41ba739088bba20271a5009fe50845019
Merge: f22e938f3e 09667e9516
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 28 13:13:26 2021 +0900
Merge branch 'ah/fetch-reject-warning-grammofix' into next
Message update.
* ah/fetch-reject-warning-grammofix:
fetch: improve grammar of "shallow roots" message
commit f22e938f3eee39a6492dcb5fc80e95e6a4889b59
Merge: 6c7a015f99 225f7fa847
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 28 13:13:26 2021 +0900
Merge branch 'ps/rev-list-object-type-filter' into next
Message update.
* ps/rev-list-object-type-filter:
help: fix small typo in error message
commit 6c7a015f99cf176f83c2c1566c230f060dccd8a0
Merge: 2733ec2409 4e0a64a713
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 28 13:13:26 2021 +0900
Merge branch 'ab/trace2-squelch-gcc-warning' into next
Workaround compiler warnings.
* ab/trace2-squelch-gcc-warning:
trace2: refactor to avoid gcc warning under -O3
commit 2733ec24090c696ce82f203b99fe7821832623d2
Merge: 58a8b85d6a f5bfcc823b
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 28 13:13:25 2021 +0900
Merge branch 'so/log-m-implies-p' into next
The "-m" option in "git log -m" that does not specify which format,
if any, of diff is desired did not have any visible effect; it now
implies some form of diff (by default "--patch") is produced.
* so/log-m-implies-p:
diff-merges: let "-m" imply "-p"
diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
stash list: stop passing "-m" to "git log"
git-svn: stop passing "-m" to "git rev-list"
diff-merges: move specific diff-index "-m" handling to diff-index
t4013: test "git diff-index -m"
t4013: test "git diff-tree -m"
t4013: test "git log -m --stat"
t4013: test "git log -m --raw"
t4013: test that "-m" alone has no effect in "git log"
commit 58a8b85d6a433c41126f2ae8d8e02ae0cd7cec7e
Merge: 56e97ec2df 25e65b6dd5
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 28 13:13:25 2021 +0900
Merge branch 'en/ort-perf-batch-11' into next
Optimize out repeated rename detection in a sequence of mergy
operations.
* en/ort-perf-batch-11:
merge-ort, diffcore-rename: employ cached renames when possible
merge-ort: handle interactions of caching and rename/rename(1to1) cases
merge-ort: add helper functions for using cached renames
merge-ort: preserve cached renames for the appropriate side
merge-ort: avoid accidental API mis-use
merge-ort: add code to check for whether cached renames can be reused
merge-ort: populate caches of rename detection results
merge-ort: add data structures for in-memory caching of rename detection
t6429: testcases for remembering renames
fast-rebase: write conflict state to working tree, index, and HEAD
fast-rebase: change assert() to BUG()
Documentation/technical: describe remembering renames optimization
t6423: rename file within directory that other side renamed
commit 56e97ec2df09093f3fc39cf6c080f464d70ec6a2
Merge: 52e4aa77df ae1a7eefff
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 28 13:13:25 2021 +0900
Merge branch 'jk/fetch-pack-v2-half-close-early' into next
"git fetch" over protocol v2 left its side of the socket open after
it finished speaking, which unnecessarily wasted the resource on
the other side.
* jk/fetch-pack-v2-half-close-early:
fetch-pack: signal v2 server that we are done making requests
commit 52e4aa77dfe1f31818fb768617477a7eddaf1748
Merge: f0c51ddf7c a84216c684
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 28 13:13:24 2021 +0900
Merge branch 'jk/doc-color-pager' into next
The documentation for "color.pager" configuration variable has been
updated.
* jk/doc-color-pager:
doc: explain the use of color.pager
commit f0c51ddf7c0009ebdb05e372db2dcef1967bdeea
Merge: 3e70b5a671 f6e2cd0625
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 28 13:13:24 2021 +0900
Merge branch 'ds/write-index-with-hashfile-api' into next
Use the hashfile API in the codepath that writes the index file to
reduce code duplication.
* ds/write-index-with-hashfile-api:
read-cache: delete unused hashing methods
read-cache: use hashfile instead of git_hash_ctx
csum-file.h: increase hashfile buffer size
hashfile: use write_in_full()
commit 02af911ce534691433ea5b7cbeb2d1a16bc4cef1
Author: Josh Steadmon <steadmon@google.com>
Date: Thu May 27 14:03:59 2021 -0700
debian: new "next" snapshot
Signed-off-by: Josh Steadmon <steadmon@google.com>
Change-Id: Ie32be7ae5daba6cf2ced02392ef84e8223006a0b
commit d369190f70198933022567d351d994db233c312e
Merge: b01ac54119 3e70b5a671
Author: Josh Steadmon <steadmon@google.com>
Date: Thu May 27 14:01:56 2021 -0700
Merge branch 'next' into debian-experimental
Signed-off-by: Josh Steadmon <steadmon@google.com>
Change-Id: Ie40ae9fe38c6094030c0cbd0b42a7d4553faf02a
commit 3e70b5a67195e9253b0ec892b4f703eaf0bc5c1c
Merge: ac6ac28bcc 906fc557b7
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 27 14:25:34 2021 +0900
Merge branch 'en/dir-traversal' into next
Fix-up to a topic that is already in 'master'.
* en/dir-traversal:
dir: introduce readdir_skip_dot_and_dotdot() helper
dir: update stale description of treat_directory()
Revert "dir: update stale description of treat_directory()"
Revert "dir: introduce readdir_skip_dot_and_dotdot() helper"
commit ac6ac28bcc8949840d3e1c59887012efb0860bd0
Merge: 120d76a959 5afd72a96f
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 27 12:37:52 2021 +0900
Sync with master
commit 120d76a959bc534e0b4dd609ee8c82a67066d4ee
Merge: 0b90c816b3 7d089fb9b7
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 27 12:18:24 2021 +0900
Merge branch 'ab/pack-linkage-fix' into next
"ld" on Solaris fails to link some test helpers, which has been
worked around by reshuffling the inline function definitions from a
header file to a source file that is the only user of them.
* ab/pack-linkage-fix:
pack-objects: move static inline from a header to the sole consumer
commit 0b90c816b372261a2eb664b6fbb447880a1246a4
Merge: 402272f99e ea08db7473
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 27 12:18:24 2021 +0900
Merge branch 'mt/t2080-cp-symlink-fix' into next
Test portability fix.
* mt/t2080-cp-symlink-fix:
t2080: fix cp invocation to copy symlinks instead of following them
commit 402272f99e228ebee287d01c31358d3aefe83369
Merge: 5c116071b1 7cbc0455cc
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 27 12:18:24 2021 +0900
Merge branch 'ab/send-email-inline-hooks-path' into next
Code simplification.
* ab/send-email-inline-hooks-path:
send-email: move "hooks_path" invocation to git-send-email.perl
send-email: don't needlessly abs_path() the core.hooksPath
commit 5c116071b177d84e4c9020dbc6470c21e2725af3
Merge: 3a1982b559 a96355d84c
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 26 06:26:02 2021 +0900
Merge branch 'ds/t1092-fix-flake-from-progress' into next
Workaround flaky tests introduced recently.
* ds/t1092-fix-flake-from-progress:
t1092: revert the "-1" hack for emulating "no progress meter"
commit 3a1982b559e5a2c57b0d15527d9ce543b7ecd34f
Merge: 023521fbe0 e2b05746e1
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 26 04:51:43 2021 +0900
Merge branch 'ds/t1092-fix-flake-from-progress' into next
Workaround flaky tests introduced recently.
* ds/t1092-fix-flake-from-progress:
t1092: use GIT_PROGRESS_DELAY for consistent results
commit 023521fbe0eb473b264b5acb6ade11eed64f60b6
Merge: a1b42bf271 5d5b147345
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue May 25 16:22:48 2021 +0900
Sync with master
commit a1b42bf271a6921cf67e597ffaa1f1f5dd39bfbc
Merge: f7659a41c8 a185dd58ec
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue May 25 14:56:51 2021 +0900
Merge branch 'mt/init-template-userpath-fix' into next
Regression fix.
* mt/init-template-userpath-fix:
init: fix bug regarding ~/ expansion in init.templateDir
commit f7659a41c8c1fbb1313870c148718da29749601b
Merge: 1e78c17669 53753a37d0
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue May 25 14:56:51 2021 +0900
Merge branch 'jt/send-email-validate-errors-fix' into next
Fix a test breakage.
* jt/send-email-validate-errors-fix:
t9001-send-email.sh: fix expected absolute paths on Windows
commit 1e78c17669ee8e0e5ce9f6bf4d40d1ce29214e5e
Merge: d047277014 5b719b7552
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue May 25 14:56:51 2021 +0900
Merge branch 'ab/send-email-validate-errors-fix' into next
* ab/send-email-validate-errors-fix:
send-email: fix missing error message regression
commit d047277014af4803f7847914ce2f62666ec66aff
Merge: 3cb6fa43cd 3127ff90ea
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue May 25 12:30:53 2021 +0900
Merge branch 'tl/fix-packfile-uri-doc' into next
Doc fix.
* tl/fix-packfile-uri-doc:
packfile-uri.txt: fix blobPackfileUri description
commit 3127ff90ea359c5be0d61c2885b3f0f74d602faf
Author: Teng Long <dyroneteng@gmail.com>
Date: Thu May 13 15:15:47 2021 +0800
packfile-uri.txt: fix blobPackfileUri description
Fix the 'uploadpack.blobPackfileUri' description in packfile-uri.txt
and the correct format also can be seen in t5702.
Signed-off-by: Teng Long <dyroneteng@gmail.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 7ba30167291eb89f2e587b7cabfa4e7555de4ed5
Author: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri May 21 17:29:41 2021 -0500
doc: avoid using rm directly
That's what we have $(RM) for.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit db10fc6c09f1f74c4d0a9294ecbb68d390f54f15
Author: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri May 21 17:29:40 2021 -0500
doc: simplify Makefile using .DELETE_ON_ERROR
Currently GNU make already removes files when catching an interruption
signal, however, in order to deal with other kinds of errors a
workaround is in place to store target output to a temporary file, and
only move it to its right place on success.
By enabling the built-in .DELETE_ON_ERROR we let make do this task, so
we don't have to.
This way the rules can be simplified a lot.
Suggested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 471e7b2cf6ab5ef057feed03b35dde9a26357611
Author: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri May 21 17:29:39 2021 -0500
doc: remove unnecessary rm instances
Commits 50cff52f1a (When generating manpages, delete outdated targets
first., 2007-08-02) and f9286765b2 (Documentation/Makefile: remove
cmd-list.made before redirecting to it., 2007-08-06) created these rm
instances for a very rare corner-case: building as root by mistake.
It's odd to have workarounds here, but nowhere else in the Makefile--
which already fails in this stuation, starting from
Documentation/technical/.
We gain nothing but complexity, so let's remove them.
Comments-by: Jeff King <peff@peff.net>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 56da21392b10ebe161dbf426f170e74f800178cf
Author: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri May 21 17:29:38 2021 -0500
doc: improve asciidoc dependencies
asciidoc needs asciidoc.conf, asciidoctor asciidoctor-extensions.rb.
Neither needs the other.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 12d078ed2b64df220f2fe8f6a050f271133ccda9
Author: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri May 21 17:29:37 2021 -0500
doc: refactor common asciidoc dependencies
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 3cb6fa43cd00a825d13bf67004b2df69d9efb73b
Merge: 97a851d59f de88ac70f3
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat May 22 18:31:01 2021 +0900
Sync with Git 2.32-rc1
commit 97a851d59f1b51f581b0c3bdf4b6ffd0b43bc2d9
Merge: 464b1f187c e22f2daed0
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat May 22 18:19:41 2021 +0900
Merge branch 'ry/clarify-fast-forward-in-glossary' into next
The description of "fast-forward" in the glossary has been updated.
* ry/clarify-fast-forward-in-glossary:
docs: improve fast-forward in glossary content
commit 464b1f187c7111045bffabd6707ea6fa48e80a0c
Merge: 65c256d92b 6aacb7d861
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat May 22 18:19:41 2021 +0900
Merge branch 'jk/clone-clean-upon-transport-error' into next
Recent "git clone" left a temporary directory behind when the
transport layer returned an failure.
* jk/clone-clean-upon-transport-error:
clone: clean up directory after transport_fetch_refs() failure
commit 65c256d92b253ac5a77c80477b745d998333cc41
Merge: 83a689d8ad e2c5993744
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat May 22 18:19:41 2021 +0900
Merge branch 'wm/rev-parse-die-i18n' into next
Quite a many die() messages in rev-parse haven't been marked for
translation.
* wm/rev-parse-die-i18n:
rev-parse: mark die() messages for translation
commit 83a689d8addae2b54257ca5547b34a7de2b8f17d
Merge: 755df67f0e f302c1e4aa
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat May 22 18:19:40 2021 +0900
Merge branch 'jc/clarify-revision-range' into next
Doc update.
* jc/clarify-revision-range:
revisions(7): clarify that most commands take a single revision range
commit 755df67f0e87f505a3aa1489f573e5a777b3558b
Merge: 8f3925fd41 cd5b33fbdc
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat May 22 18:19:40 2021 +0900
Merge branch 'ga/send-email-sendmail-cmd' into next
"git send-email" learned the "--sendmail-cmd" command line option
and the "sendemail.sendmailCmd" configuration variable, which is a
more sensible approach than the current way of repurposing the
"smtp-server" that is meant to name the server to instead name the
command to talk to the server.
* ga/send-email-sendmail-cmd:
git-send-email: add option to specify sendmail command
commit 8f3925fd41a5f7bf09f8e5d6345eb223689a5dfb
Merge: bbe06ef834 bfe35a6165
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat May 22 18:19:40 2021 +0900
Merge branch 'ah/doc-describe' into next
Doc update.
* ah/doc-describe:
describe-doc: clarify default length of abbreviation
commit bbe06ef8348bd11662bbc5c4a3c85df6286493f4
Merge: 4332dd2012 af5cd44b6f
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat May 22 18:19:39 2021 +0900
Merge branch 'dl/stash-show-untracked-fixup' into next
Another brown paper bag inconsistency fix for a new feature
introduced during this cycle.
* dl/stash-show-untracked-fixup:
stash show: use stash.showIncludeUntracked even when diff options given
commit 4332dd20125dfe425f4f7cfc250e7613606f8e1e
Merge: 9fa02ecfa5 6aac70a870
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat May 22 18:19:38 2021 +0900
Merge branch 'jh/simple-ipc-sans-pthread' into next
The "simple-ipc" did not compile without pthreads support, but the
build procedure was not properly account for it.
* jh/simple-ipc-sans-pthread:
simple-ipc: correct ifdefs when NO_PTHREADS is defined
commit 5317dfeaed30fbe647899ece261e3dd40e5ced1f
Author: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date: Sat May 22 14:10:08 2021 +0700
t: use configured TAR instead of tar
Despite that tar is available everywhere, it's not required by POSIX.
In our build system, users are allowed to specify which tar to be used
in Makefile knobs. Furthermore, GNU tar (gtar) is prefered when autotools
is being used.
In our testsuite, 7 out of 9 tar-required-tests use "$TAR", the other
two use "tar".
Let's change the remaining two tests to "$TAR".
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit b01ac541195a5a2063e23f51943217df88ffcc80
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Fri May 21 10:02:31 2021 -0700
debian: new "next" snapshot
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Change-Id: I395fb3c5b2d4be8eab59c720de7fc09d0f3ea8f4
commit 01bfb14977b10040bad3742485114fc90b230805
Merge: 6d2ed6c676 9fa02ecfa5
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Fri May 21 10:00:49 2021 -0700
Merge branch 'next' into debian-experimental
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Change-Id: I356c9bec4b10113005a9611a31ec32d402a763ef
commit f5bfcc823ba242a46e20fb6f71c9fbf7ebb222fe
Author: Sergey Organov <sorganov@gmail.com>
Date: Fri May 21 00:47:03 2021 +0300
diff-merges: let "-m" imply "-p"
Fix long standing inconsistency between -c/--cc that do imply -p on
one side, and -m that did not imply -p on the other side.
Change corresponding test accordingly, as "log -m" output should now
match one from "log -m -p", rather than from just "log".
Change documentation accordingly.
NOTES:
After this patch
git log -m
produces diffs without need to provide -p as well, that improves both
consistency and usability. It gets even more useful if one sets
"log.diffMerges" configuration variable to "first-parent" to force -m
produce usual diff with respect to first parent only.
This patch, however, does not change behavior when specific diff
format is explicitly provided on the command-line, so that commands
like
git log -m --raw
git log -m --stat
are not affected, nor does it change commands where specific diff
format is active by default, such as:
git diff-tree -m
It's also worth to be noticed that exact historical semantics of -m is
still provided by --diff-merges=separate.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit fd16a39944ce2f2967ed015379f5bd05bac639bb
Author: Sergey Organov <sorganov@gmail.com>
Date: Fri May 21 00:47:02 2021 +0300
diff-merges: rename "combined_imply_patch" to "merges_imply_patch"
This is refactoring change in preparation for the next commit that
will let -m imply -p.
The old name doesn't match the intention to let not only -c/-cc imply
-p, but also -m, that is not a "combined" format, so we rename the
flag accordingly.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 1e20a407fe28b4bdba3b973b26b0b60ff6b6c97d
Author: Sergey Organov <sorganov@gmail.com>
Date: Fri May 21 00:47:01 2021 +0300
stash list: stop passing "-m" to "git log"
Passing "-m" in "git log --first-parent -m" is not needed as
--first-parent implies --diff-merges=first-parent anyway. OTOH, it
will stop being harmless once we let "-m" imply "-p".
While we are at it, fix corresponding test description in t3903-stash
to match what it actually tests.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 23f6d40dd3e7aad72c7706bb75f77a6c73b69b56
Author: Sergey Organov <sorganov@gmail.com>
Date: Fri May 21 00:47:00 2021 +0300
git-svn: stop passing "-m" to "git rev-list"
rev-list doesn't utilize -m. It happens to eat it silently, so this
bug went unnoticed.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 19b2517f95a0a908a8ada7417cf0717299e7e1aa
Author: Sergey Organov <sorganov@gmail.com>
Date: Fri May 21 00:46:59 2021 +0300
diff-merges: move specific diff-index "-m" handling to diff-index
Move specific handling of "-m" for diff-index to diff-index.c, so
diff-merges is left to handle only diff for merges options.
Being a better design by itself, this is especially essential in
preparation for letting -m imply -p, as "diff-index -m" obviously
should not imply -p, as it's entirely unrelated.
To handle this, in addition to moving specific diff-index "-m" code
out of diff-merges, we introduce new
diff_merges_suppress_options_parsing()
and call it before generic options processing in cmd_diff_index().
This new diff_merges_suppress_options_parsing() could then be reused
and called before invocations of setup_revisions() for other commands
that don't need --diff-merges options, but that's outside of the scope
of these patch series.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit e0b16421b17fffa2544eebfcb570fdb766fd0bc4
Author: Sergey Organov <sorganov@gmail.com>
Date: Fri May 21 00:46:58 2021 +0300
t4013: test "git diff-index -m"
-m in "git diff-index" means "match missing", that differs
from its meaning in "git diff". Let's check it in diff-index.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 3ae7fe2b0f8528305bc871738dd12cde23024556
Author: Sergey Organov <sorganov@gmail.com>
Date: Fri May 21 00:46:57 2021 +0300
t4013: test "git diff-tree -m"
We want to ensure we don't affect plumbing commands with our changes
of "-m" semantics, so add corresponding test.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit faf16d4e97ed45e8e570a8d1d568449e948284f0
Author: Sergey Organov <sorganov@gmail.com>
Date: Fri May 21 00:46:56 2021 +0300
t4013: test "git log -m --stat"
This is to ensure we won't break different diff formats when we start
to imply "-p" by "-m".
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 48229c193d2e6e728d3243bacea2f1e1490ced8a
Author: Sergey Organov <sorganov@gmail.com>
Date: Fri May 21 00:46:55 2021 +0300
t4013: test "git log -m --raw"
This is to ensure we won't break different diff formats when we start
to imply "-p" by "-m".
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 7a55fa0e0bb88e2bf721bc65cc55cd6b435a8373
Author: Sergey Organov <sorganov@gmail.com>
Date: Fri May 21 00:46:54 2021 +0300
t4013: test that "-m" alone has no effect in "git log"
This is to notice current behavior that we are going to change when we
start to imply "-p" by "-m".
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 9fa02ecfa5e5f011e451f8bd05fb4d21cca946ed
Merge: 928e72b83f 107691cb07
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 21 09:01:56 2021 +0900
Sync with master
commit 225f7fa84790a50dc95ffc21ef8f601f0f5e9da5
Author: Jean-Noël Avila <jn.avila@free.fr>
Date: Thu May 20 09:42:14 2021 +0200
help: fix small typo in error message
Classic string concatenation while forgetting a space character.
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 4e0a64a7135b204f140058ed9f53299819db447e
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu May 20 13:05:45 2021 +0200
trace2: refactor to avoid gcc warning under -O3
Refactor tr2_dst_try_uds_connect() to avoid a gcc warning[1] that
appears under -O3 (but not -O2). This makes the build pass under
DEVELOPER=1 without needing a DEVOPTS=no-error.
This can be reproduced with GCC Debian 8.3.0-6, but not e.g. with
clang 7.0.1-8+deb10u2. We've had this warning since
ee4512ed481 (trace2: create new combined trace facility, 2019-02-22).
As noted in [2] this warning happens because the compiler doesn't
assume that errno must be non-zero after a failed syscall.
Let's work around by using the well-established "saved_errno" pattern,
along with returning -1 ourselves instead of "errno". The caller can
thus rely on our "errno" on failure.
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61846 for a related
bug report against GCC.
1.
trace2/tr2_dst.c: In function ‘tr2_dst_get_trace_fd.part.5’:
trace2/tr2_dst.c:296:10: warning: ‘fd’ may be used uninitialized in this function [-Wmaybe-uninitialized]
dst->fd = fd;
~~~~~~~~^~~~
trace2/tr2_dst.c:229:6: note: ‘fd’ was declared here
int fd;
^~
2. https://lore.kernel.org/git/20200404142131.GA679473@coredump.intra.peff.net/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 6d2ed6c676232e0fbf69edd5acb937df57c4d245
Merge: 8d893af25d 794632f442
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 20 13:25:01 2021 -0700
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I7aec56862c69d9bfb1bf844933f37cb139699ed6
commit 8d893af25dde3e0a1eb6dc9cabbd56cf3f2e357c
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 20 13:23:52 2021 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I2844c1b8e755ea81cfaf93f823d12bd25dbeaf0c
commit 3b4a48382787076cb0f582f5f7f59404820c7005
Merge: 1b95f1302f 928e72b83f
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 20 13:22:24 2021 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: Ib2483ba5eeda3c08109b9ea4265520118e8124bd
commit 794632f44234315694c46ce8661ea8feeaff59b7
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 20 13:20:28 2021 -0700
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 9c1a23fbf85bcffcfc3cabeea35e4fafbf40223e
Merge: 4d57e56e5b bf949ade81
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Thu May 20 13:18:46 2021 -0700
Merge tag 'v2.32.0-rc0' into debian-sid
Git 2.32-rc0
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 25e65b6dd52c987056f1cac00fe6073fbf8ea237
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:41 2021 +0000
merge-ort, diffcore-rename: employ cached renames when possible
When there are many renames between the old base of a series of commits
and the new base, the way sequencer.c, merge-recursive.c, and
diffcore-rename.c have traditionally split the work resulted in
redetecting the same renames with each and every commit being
transplanted. To address this, the last several commits have been
creating a cache of rename detection results, determining when it was
safe to use such a cache in subsequent merge operations, adding helper
functions, and so on. See the previous half dozen commit messages for
additional discussion of this optimization, particularly the message a
few commits ago entitled "add code to check for whether cached renames
can be reused". This commit finally ties all of that work together,
modifying the merge algorithm to make use of these cached renames.
For the testcases mentioned in commit 557ac0350d ("merge-ort: begin
performance work; instrument with trace2_region_* calls", 2020-10-28),
this change improves the performance as follows:
Before After
no-renames: 5.665 s ± 0.129 s 5.622 s ± 0.059 s
mega-renames: 11.435 s ± 0.158 s 10.127 s ± 0.073 s
just-one-mega: 494.2 ms ± 6.1 ms 500.3 ms ± 3.8 ms
That's a fairly small improvement, but mostly because the previous
optimizations were so effective for these particular testcases; this
optimization only kicks in when the others don't. If we undid the
basename-guided rename detection and skip-irrelevant-renames
optimizations, then we'd see that this series by itself improved
performance as follows:
Before Basename Series After Just This Series
no-renames: 13.815 s ± 0.062 s 5.697 s ± 0.080 s
mega-renames: 1799.937 s ± 0.493 s 205.709 s ± 0.457 s
Since this optimization kicks in to help accelerate cases where the
previous optimizations do not apply, this last comparison shows that
this cached-renames optimization has the potential to help signficantly
in cases that don't meet the requirements for the other optimizations to
be effective.
The changes made in this optimization also lay some important groundwork
for a future optimization around having collect_merge_info() avoid
recursing into subtrees in more cases.
However, for this optimization to be effective, merge_switch_to_result()
should only be called when the rebase or cherry-pick operation has
either completed or hit a case where the user needs to resolve a
conflict or edit the result. If it is called after every commit, as
sequencer.c does, then the working tree and index are needlessly updated
with every commit and the cached metadata is tossed, defeating this
optimization. Refactoring sequencer.c to only call
merge_switch_to_result() at the end of the operation is a bigger
undertaking, and the practical benefits of this optimization will not be
realized until that work is performed. Since `test-tool fast-rebase`
only updates at the end of the operation, it was used to obtain the
timings above.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit cbdca289fbb011e7397fecfebeeac3f887ef22d1
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:40 2021 +0000
merge-ort: handle interactions of caching and rename/rename(1to1) cases
As documented in Documentation/technical/remembering-renames.txt, and as
tested for in the two testcases in t6429 with "rename same file
identically" in their description, there is one case where we need to
have renames in one commit NOT be cached for the next commit in our
rebase sequence -- namely, rename/rename(1to1) cases. Rather than
specifically trying to uncache those and fix up dir_rename_counts() to
match (which would also be valid but more work), we simply disable the
optimization when this really rare type of rename occurs.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 86b41b389546e68164ed58f6e60297a391cdca83
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:39 2021 +0000
merge-ort: add helper functions for using cached renames
If we have a usable rename cache, then we can remove from
relevant_sources all the paths that were cached;
diffcore_rename_extended() can then consider an even smaller set of
relevant_sources in its rename detection.
However, when diffcore_rename_extended() is done, we will need to take
the renames it detected and then add back in all the ones we had cached
from before.
Add helper functions for doing these two operations; the next commit
will make use of them.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d509802993e8423d459a05fcd6151ca1782caa07
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:38 2021 +0000
merge-ort: preserve cached renames for the appropriate side
Previous commits created an in-memory cache of the results of rename
detection, and added logic to detect when that cache could appropriately
be used in a subsequent merge operation -- but we were still
unconditionally clearing the cache with each new merge operation anyway.
If it is valid to reuse the cache from one of the two sides of history,
preserve that side.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 19ceb486f8dd25fb5782724c454edb2f06f1ed71
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:37 2021 +0000
merge-ort: avoid accidental API mis-use
Previously, callers of the merge-ort API could have passed an
uninitialized value for struct merge_result *result. However, we want
to check result to see if it has cached renames from a previous merge
that we can reuse; such values would be found behind result->priv.
However, if result->priv is uninitialized, attempting to access behind
it will give a segfault. So, we need result->priv to be NULL (which
will be the case if the caller does a memset(&result, 0)), or be written
by a previous call to the merge-ort machinery. Documenting this
requirement may help, but despite being the person who introduced this
requirement, I still missed it once and it did not fail in a very clear
way and led to a long debugging session.
Add a _properly_initialized field to merge_result; that value will be
0 if the caller zero'ed the merge_result, it will be set to a very
specific value by a previous run by the merge-ort machinery, and if it's
uninitialized it will most likely either be 0 or some value that does
not match the specific one we'd expect allowing us to throw a much more
meaningful error.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 64aceb6d738394130a6e215dc6de51d8452313e0
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:36 2021 +0000
merge-ort: add code to check for whether cached renames can be reused
We need to know when renames detected in a previous merge operation can
be reused in a later merge operation. Consider the following setup
(from the git-rebase manpage):
A---B---C topic
/
D---E---F---G master
After rebasing, this will appear as:
A'--B'--C' topic
/
D---E---F---G master
Further, let's say that 'oldfile' was renamed to 'newfile' between E
and G. The rebase or cherry-pick of A onto G will involve a three-way
merge between E (as the merge base) and G and A. After detecting the
rename between E:oldfile and G:newfile, there will be a three-way
content merge of the following:
E:oldfile
G:newfile
A:oldfile
and produce a new result:
A':newfile
Now, when we want to pick B onto A', we will need to do a three-way
merge between A (as the merge-base) and A' and B. This will involve
a three-way content merge of
A:oldfile
A':newfile
B:oldfile
but only if we can detect that A:oldfile is similar enough to A':newfile
to be used together in a three-way content merge, i.e. only if we can
detect that A:oldfile and A':newfile are a rename. But we already know
that A:oldfile and A':newfile are similar enough to be used in a
three-way content merge, because that is precisely where A':newfile came
from in the previous merge.
Note that A & A' both appear in both merges. That gives us the
condition under which we can reuse renames.
There are a couple important points about this optimization:
- If the rebase or cherry-pick halts for user conflicts, these caches
are NOT saved anywhere. Thus, resuming a halted rebase or
cherry-pick will result in no reused renames for the next commit.
This is intentional, as user resolution can change files
significantly and in ways that violate the similarity assumptions
here.
- Technically, in a *very* narrow case this might give slightly
different results for rename detection. Using the example above,
if:
* E:oldfile had 20 lines
* G:newfile added 10 new lines at the beginning of the file
* A:oldfile deleted all but the first three lines of the file
then
=> A':newfile would have 13 lines, 3 of which matches those
in A:oldfile.
Consider the two cases:
* Without this optimization:
- the next step of the rebase operation (moving B to B')
would not detect the rename betwen A:oldfile and A':newfile
- we'd thus get a modify/delete conflict with the rebase
operation halting for the user to resolve, and have both
A':newfile and B:oldfile sitting in the working tree.
* With this optimization:
- the rename between A:oldfile and A':newfile would be detected
via the cache of renames
- a three-way merge between A:oldfile, A':newfile, and B:oldfile
would commence and be written to A':newfile
Now, is the difference in behavior a bug...or a bugfix? I can't
tell. Given that A:oldfile and A':newfile are not very similar,
when we three-way merge with B:oldfile it seems likely we'll hit a
conflict for the user to resolve. And it shouldn't be too hard for
users to see why we did that three-way merge; oldfile and newfile
*were* renames somewhere in the sequence. So, most of these corner
cases will still behave similarly -- namely, a conflict given to the
user to resolve. Also, consider the interesting case when commit B
is a clean revert of commit A. Without this optimization, a rebase
could not both apply a weird patch like A and then immediately
revert it; users would be forced to resolve merge conflicts. With
this optimization, it would successfully apply the clean revert.
So, there is certainly at least one case that behaves better. Even
if it's considered a "difference in behavior", I think both behaviors
are reasonable, and the time savings provided by this optimization
justify using the slightly altered rename heuristics.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 2734f2e3243ce19af1d9c9c92dffae13af7b0fe5
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:35 2021 +0000
merge-ort: populate caches of rename detection results
Fill in cache_pairs, cached_target_names, and cached_irrelevant based on
rename detection results. Future commits will make use of these values.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d29bd6d73da5c40935713731919b1950692aff15
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:34 2021 +0000
merge-ort: add data structures for in-memory caching of rename detection
When there are many renames between the old base of a series of commits
and the new base for a series of commits, the sequence of merges
employed to transplant those commits (from a cherry-pick or rebase
operation) will repeatedly detect the exact same renames. This is
wasted effort.
Add data structures which will be used to cache rename detection
results, along with the initialization and deallocation of these data
structures. Future commits will populate these caches, detect the
appropriate circumstances when they can be used, and employ them to
avoid re-detecting the same renames repeatedly.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a22099f552d5e67dc71c2bd92c4b711387e9695f
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:33 2021 +0000
t6429: testcases for remembering renames
We will soon be adding an optimization that caches (in memory only,
never written to disk) upstream renames during a sequence of merges such
as occurs during a cherry-pick or rebase operation. Add several tests
meant to stress such an implementation to ensure it does the right
thing, and include a test whose outcome we will later change due to this
optimization as well.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f9500261e0aea2bebb527281462d650be1db38a4
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:32 2021 +0000
fast-rebase: write conflict state to working tree, index, and HEAD
Previously, when fast-rebase hit a conflict, it simply aborted and left
HEAD, the index, and the working tree where they were before the
operation started. While fast-rebase does not support restarting from a
conflicted state, write the conflicted state out anyway as it gives us a
way to see what the conflicts are and write tests that check for them.
This will be important in the upcoming commits, because sequencer.c is
only superficially integrated with merge-ort.c; in particular, it calls
merge_switch_to_result() after EACH merge instead of only calling it at
the end of all the sequence of merges (or when a conflict is hit). This
not only causes needless updates to the working copy and index, but also
causes all intermediate data to be freed and tossed, preventing caching
information from one merge to the next. However, integrating
sequencer.c more deeply with merge-ort.c is a big task, and making this
small extension to fast-rebase.c provides us with a simple way to test
the edge and corner cases that we want to make sure continue working.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit caba91c373127a316b5442a6aac7080fee9bd624
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:31 2021 +0000
fast-rebase: change assert() to BUG()
assert() can succinctly document expectations for the code, and do so in
a way that may be useful to future folks trying to refactor the code and
change basic assumptions; it allows them to more quickly find some
places where their violations of previous assumptions trips things up.
Unfortunately, assert() can surround a function call with important
side-effects, which is a huge mistake since some users will compile with
assertions disabled. I've had to debug such mistakes before in other
codebases, so I should know better. Luckily, this was only in test
code, but it's still very embarrassing. Change an assert() to an if
(...) BUG (...).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit bb80333c0853b04ff789de8037bef5a4ade1da8c
Author: Elijah Newren <newren@gmail.com>
Date: Thu May 20 06:09:30 2021 +0000
Documentation/technical: describe remembering renames optimization
Remembering renames on the upstream side of history in an early merge of
a rebase or cherry-pick for re-use in a latter merge of the same
operation makes pretty good intuitive sense. However, trying to show
that it doesn't cause some subtle behavioral difference or some funny
edge or corner case is much more involved. And, in fact, it does
introduce a subtle behavioral change.
Document all the assumptions, special cases, and logic involved in such
an optimization, and describe why this optimization is safe under the
current optimizations/features/etc. -- even when the subtle behavioral
change is triggered.
Part of the point of adding this document that goes over the
optimization in such laborious detail, is that it is possible that
significant future changes (optimizations or feature changes) could
interact with this optimization in interesting ways; this document is
here to help folks making big changes sanity check that the assumptions
and arguments underlying this optimization are still valid. (As a side
note, creating this document forced me to review things in sufficient
detail that I found I was not properly caching directory-rename-induced
renames, resulting in the code not being aware of those renames and
causing unnecessary diffcore_rename_extended() calls in subsequent
merges.)
A subsequent commit will add several testcases based on this document
meant to stress-test the implementation and also document the case with
the subtle behavioral change.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a84216c68435f545de38d69c771a6f2ade480394
Author: Jeff King <peff@peff.net>
Date: Wed May 19 05:17:09 2021 -0400
doc: explain the use of color.pager
The current documentation for color.pager is technically correct, but
slightly misleading and doesn't really clarify the purpose of the
variable. As explained in the original thread which added it:
https://lore.kernel.org/git/E1G6zPH-00062L-Je@moooo.ath.cx/
the point is to deal with pagers that don't understand colors. And hence it
being set to "true" is necessary for colorizing output to the pager, but
not sufficient by itself (you must also have enabled one of the other
color options, though note that these are set to "auto" by default these
days).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 928e72b83f63a1ed3c7106c732d6dc2334b5a87f
Merge: 68e6a46117 f5f5a61d5a
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 20 14:45:07 2021 +0900
Merge branch 'ah/submodule-helper-module-summary-parseopt' into next
Message update.
* ah/submodule-helper-module-summary-parseopt:
submodule: use the imperative mood to describe the --files option
commit 68e6a46117948c9e0b53790522a2d92e1d7792c8
Merge: 5d3c8ba2bf 4901884a23
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 20 14:45:06 2021 +0900
Merge branch 'ah/stash-usage-i18n-fix' into next
i18n update.
* ah/stash-usage-i18n-fix:
stash: don't translate literal commands
commit 5d3c8ba2bf27c8bcab2fced1784ad3ed7daa4bee
Merge: e26a60d624 99fc555188
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 20 14:45:06 2021 +0900
Merge branch 'wm/rev-parse-path-format-wo-arg' (early part) into next
* 'wm/rev-parse-path-format-wo-arg' (early part):
rev-parse: fix segfault with missing --path-format argument
There is 1 open security issue in buster.
You can find information about how to handle this issue in the security team's documentation.
![[bug history graph]](https://qa.debian.org/data/bts/graphs/g/git.png){kind=link}