more than one main upstream tarballs listed.
commit ebc9cd037a2731fc4675328fba3242657d022160
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Fri Sep 3 12:15:15 2021 -0700
debian: new "next" snapshot
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Change-Id: I02e427c1d23c3829854ad5b4d4f41cdbc5ea4bed
commit 654868878fa6eb12b17d26468faf0895f291524a
Merge: 454d8c46a1 3052b89438
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Fri Sep 3 12:14:42 2021 -0700
Merge branch 'next' into debian-experimental
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Change-Id: I74ebad44a9f895dcef87a993da1e61e355678d68
commit 3052b894382a0debd2b7c8345f86f70277b76a3e
Merge: 5378ce3817 2dee7e6105
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 1 17:15:46 2021 -0700
Merge branch 'rs/more-fspathcmp' into next
Code simplification.
* rs/more-fspathcmp:
merge-recursive: use fspathcmp() in path_hashmap_cmp()
commit 5378ce3817ab64e90d35891c9ee297f42f373156
Merge: 5ee2615670 614c3d8f2e
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 1 17:15:46 2021 -0700
Merge branch 'sg/set-ceiling-during-tests' into next
Buggy tests could damage repositories outside the throw-away test
area we created. We now by default export GIT_CEILING_DIRECTORIES
to limit the damage from such a stray test.
* sg/set-ceiling-during-tests:
test-lib: set GIT_CEILING_DIRECTORIES to protect the surrounding repository
commit 5ee26156706cdd94f736322359f2427d550e291b
Merge: 73719bee8a d9e9b44d7a
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 1 17:15:45 2021 -0700
Merge branch 'jh/sparse-index-resize-fix' into next
The sparse-index support can corrupt the index structure by storing
a stale and/or uninitialized data, which has been corrected.
* jh/sparse-index-resize-fix:
sparse-index: copy dir_hash in ensure_full_index()
commit 73719bee8a42691f51dc46a507341104868848ba
Merge: 66b0f8564d 469888e6a5
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 1 17:15:45 2021 -0700
Merge branch 'es/walken-tutorial-fix' into next
Typofix.
* es/walken-tutorial-fix:
doc: fix syntax error and the format of printf
commit 66b0f8564d9cc39f03916f8b8f0c521cd4af15b5
Merge: 2440a8a2aa b0173340c6
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 1 17:15:44 2021 -0700
Merge branch 'tb/add-objects-in-unpacked-packs-simplify' into next
Code simplification with reduced memory usage.
* tb/add-objects-in-unpacked-packs-simplify:
builtin/pack-objects.c: remove duplicate hash lookup
builtin/pack-objects.c: simplify add_objects_in_unpacked_packs()
object-store.h: teach for_each_packed_object to ignore kept packs
commit 2440a8a2aa1679371d9a506575fd4c3631cb7db5
Merge: a1075a92a9 f6bb64df82
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 1 17:15:44 2021 -0700
Merge branch 'ps/fetch-omit-formatting-under-quiet' into next
"git fetch --quiet" optimization to avoid useless computation of
info that will never be displayed.
* ps/fetch-omit-formatting-under-quiet:
fetch: skip formatting updated refs with `--quiet`
commit a1075a92a9671812795b22313d8e96a5a54ba1e4
Merge: 6ff491cc09 53a66ec37c
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 1 17:15:43 2021 -0700
Merge branch 'ka/want-ref-in-namespace' into next
"git upload-pack" which runs on the other side of "git fetch"
forgot to take the ref namespaces into account when handling
want-ref requests.
* ka/want-ref-in-namespace:
docs: clarify the interaction of transfer.hideRefs and namespaces
upload-pack.c: treat want-ref relative to namespace
t5730: introduce fetch command helper
commit 6ff491cc0969c1606311ad600931ec498f906056
Merge: bc883fce56 f172556b89
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 1 17:15:43 2021 -0700
Merge branch 'zh/cherry-pick-advice' into next
The advice message that "git cherry-pick" gives when it asks
conflicted replay of a commit to be resolved by the end user has
been updated.
* zh/cherry-pick-advice:
cherry-pick: use better advice message
commit bc883fce56258ef6135fb024dbae3f5d87933b3f
Merge: f2128466b9 767a4ca648
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 1 17:15:42 2021 -0700
Merge branch 'js/advise-when-skipping-cherry-picked' into next
"git rebase" by default skips changes that are equivalent to
commits that are already in the history the branch is rebased onto;
give messages when this happens to let the users be aware of
skipped commits, and also teach them how to tell "rebase" to keep
duplicated changes.
* js/advise-when-skipping-cherry-picked:
sequencer: advise if skipping cherry-picked commit
commit 53a66ec37cfd8fc9f9357f201ae16ae3e8795606
Author: Kim Altintop <kim@eagain.st>
Date: Fri Aug 13 06:23:54 2021 +0000
docs: clarify the interaction of transfer.hideRefs and namespaces
Expand the section about namespaces in the documentation of
`transfer.hideRefs` to point out the subtle differences between
`upload-pack` and `receive-pack`.
ffcfb68176 (upload-pack.c: treat want-ref relative to namespace,
2021-07-30) taught `upload-pack` to reject `want-ref`s for hidden refs,
which is now mentioned. It is clarified that at no point the name of a
hidden ref is revealed, but the object id it points to may.
Signed-off-by: Kim Altintop <kim@eagain.st>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 39551406539e6ea87f89f619f7f0800e887e9b57
Author: Kim Altintop <kim@eagain.st>
Date: Fri Aug 13 06:23:50 2021 +0000
upload-pack.c: treat want-ref relative to namespace
When 'upload-pack' runs within the context of a git namespace, treat any
'want-ref' lines the client sends as relative to that namespace.
Also check if the wanted ref is hidden via 'hideRefs'. If it is hidden,
respond with an error as if the ref didn't exist.
Helped-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Kim Altintop <kim@eagain.st>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit bac01c6469b2489042b867d409894a3152ec98a1
Author: Kim Altintop <kim@eagain.st>
Date: Fri Aug 13 06:23:40 2021 +0000
t5730: introduce fetch command helper
Assembling a "raw" fetch command to be fed directly to "test-tool serve-v2"
is extracted into a test helper.
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Kim Altintop <kim@eagain.st>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 767a4ca648f8791c1fb623bd9f79fd8d7f026499
Author: Josh Steadmon <steadmon@google.com>
Date: Mon Aug 30 14:46:02 2021 -0700
sequencer: advise if skipping cherry-picked commit
Silently skipping commits when rebasing with --no-reapply-cherry-picks
(currently the default behavior) can cause user confusion. Issue
warnings when this happens, as well as advice on how to preserve the
skipped commits.
These warnings and advice are displayed only when using the (default)
"merge" rebase backend.
Update the git-rebase docs to mention the warnings and advice.
Signed-off-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f2128466b98f6f7214f448ad9ae8252811cadb24
Merge: a3cb0f4745 6c40894d24
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:31 2021 -0700
Sync with master
commit a3cb0f4745afbb3e84e5fdaa6b3dc305f093f70f
Merge: 9fe8f1a9b3 c93ca46cf5
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:19 2021 -0700
Merge branch 'sg/column-nl' into next
The parser for the "--nl" option of "git column" has been
corrected.
* sg/column-nl:
column: fix parsing of the '--nl' option
commit 9fe8f1a9b36fef6ebc9626fc51906229c070c669
Merge: e4cbc7243a f32c5d3716
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:19 2021 -0700
Merge branch 'cb/makefile-apple-clang' into next
Build update.
* cb/makefile-apple-clang:
build: catch clang that identifies itself as "$VENDOR clang"
build: clang version may not be followed by extra words
build: update detect-compiler for newer Xcode version
commit e4cbc7243af58fedc97a29a449bb8fb7829d3bc1
Merge: 35b9d158e8 f54b9f21ca
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:19 2021 -0700
Merge branch 'ps/ls-refs-strbuf-optim' into next
Micro-optimization for the wire protocol driver.
* ps/ls-refs-strbuf-optim:
ls-refs: reuse buffer when sending refs
commit 35b9d158e8a72edfdbb78f11aefbe6a4a4acd8d4
Merge: d243498893 597a977489
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:18 2021 -0700
Merge branch 'rs/branch-allow-deleting-dangling' into next
"git branch -D <branch>" used to refuse to remove a broken branch
ref that points at a missing commit, which has been corrected.
* rs/branch-allow-deleting-dangling:
branch: allow deleting dangling branches with --force
commit d243498893dc3390cc9fd714ce43e71045397619
Merge: a8588775c8 7a132c628e
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:18 2021 -0700
Merge branch 'mt/quiet-with-delayed-checkout' into next
The delayed checkout code path in "git checkout" etc. were chatty
even when --quiet and/or --no-progress options were given.
* mt/quiet-with-delayed-checkout:
checkout: make delayed checkout respect --quiet and --no-progress
commit a8588775c86a84101cb8a82f22f9b3333e6e3612
Merge: 63a1bdddfc 66e905b7dd
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:18 2021 -0700
Merge branch 'rs/xopen-reports-open-failures' into next
Error diagnostics improvement.
* rs/xopen-reports-open-failures:
use xopen() to handle fatal open(2) failures
xopen: explicitly report creation failures
commit 63a1bdddfcaa7d4d835d69446e0dcb37963e2354
Merge: 59f5669dd6 8174627b3d
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:17 2021 -0700
Merge branch 'dd/diff-files-unmerged-fix' into next
"git diff --relative" segfaulted and/or produced incorrect result
when there are unmerged paths.
* dd/diff-files-unmerged-fix:
diff-lib: ignore paths that are outside $cwd if --relative asked
commit 59f5669dd6a092400b7da1d54692d805433c9d55
Merge: be9e67bddc 1549577338
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:17 2021 -0700
Merge branch 'dd/t6300-wo-gpg-fix' into next
Test fix.
* dd/t6300-wo-gpg-fix:
t6300: check for cat-file exit status code
t6300: don't run cat-file on non-existent object
commit be9e67bddc928f468fd991d7f9439eca6f6cd180
Merge: 2892635eaf 5146c2f148
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:16 2021 -0700
Merge branch 'mh/credential-leakfix' into next
Leak fix.
* mh/credential-leakfix:
credential: fix leak in credential_apply_config()
commit 2892635eaf4ebfdcee0495313c1754895f9e81ac
Merge: 12a5da47e7 c21b2511c2
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:16 2021 -0700
Merge branch 'jk/t5323-no-pack-test-fix' into next
Test fix.
* jk/t5323-no-pack-test-fix:
t5323: drop mentions of "master"
commit 12a5da47e759fcc22146bec8309e944970875a37
Merge: 256e1cbc9e a16eb6b1ff
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:15 2021 -0700
Merge branch 'js/maintenance-launchctl-fix' into next
"git maintenance" scheduler fix for macOS.
* js/maintenance-launchctl-fix:
maintenance: skip bootout/bootstrap when plist is registered
maintenance: create `launchctl` configuration using a lock file
commit 256e1cbc9eefcea0f027270bf4f381593c5bc2bb
Merge: fec2e5a7eb 0160f7e725
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:15 2021 -0700
Merge branch 'ab/rebase-fatal-fatal-fix' into next
Error message fix.
* ab/rebase-fatal-fatal-fix:
rebase: emit one "fatal" in "fatal: fatal: <error>"
commit fec2e5a7eb1e7cd0df4184d78a3250257471cbe5
Merge: 6339c8e657 f58c7468cd
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:15 2021 -0700
Merge branch 'ab/ls-remote-packet-trace' into next
Debugging aid fix.
* ab/ls-remote-packet-trace:
ls-remote: set packet_trace_identity(<name>)
commit 6339c8e657b4fe761e76d79a0d9f9d461d332b09
Merge: 1bb659c66c 95b4ff3931
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:14 2021 -0700
Merge branch 'rs/git-mmap-uses-malloc' into next
mmap() imitation used to call xmalloc() that dies upon malloc()
failure, which has been corrected to just return an error to the
caller to be handled.
* rs/git-mmap-uses-malloc:
compat: let git_mmap use malloc(3) directly
commit 1bb659c66cd91b0833562b82f332c8a5ce9acf1f
Merge: e92258e72c f6a5af0f62
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:14 2021 -0700
Merge branch 'ga/send-email-sendmail-cmd' into next
Test fix.
* ga/send-email-sendmail-cmd:
t9001: PATH must not use Windows-style paths
commit e92258e72cbaf136773e2231aa77e96be5873d30
Merge: ba50c8fa24 bd72824c60
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:09:13 2021 -0700
Merge branch 'me/t5582-cleanup' into next
Test fix.
* me/t5582-cleanup:
t5582: remove spurious 'cd "$D"' line
commit 6c40894d2466d4e7fddc047a05116aa9d14712ee
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:22 2021 -0700
The second batch
The most significant of this batch is of course "merge -sort".
Thanks, Elijah and everybody who helped the topic.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 85e73cc8ac748a3baa7535261b492a16079db533
Merge: 0d4f46b768 ad51ae4dc0
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:06 2021 -0700
Merge branch 'cb/ci-freebsd-update'
Update FreeBSD CI job
* cb/ci-freebsd-update:
ci: update freebsd 12 cirrus job
commit 0d4f46b7683e4a8d77a8104de1e5d5e46c5d6cb4
Merge: bfd515ac56 b3e36df0d4
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:06 2021 -0700
Merge branch 'tl/traverse-non-commits-rename'
Meh.
* tl/traverse-non-commits-rename:
list-objects.c: rename "traverse_trees_and_blobs" to "traverse_non_commits"
commit bfd515ac56ca8ba71ff9798e625dd1d051842872
Merge: a896086851 b227bead4d
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:05 2021 -0700
Merge branch 'bc/t5607-avoid-broken-test-fail-prereqs'
The current implementation of GIT_TEST_FAIL_PREREQS is broken in
that checking for the lack of a prerequisite would not work. Avoid
the use of "if ! test_have_prereq X" in a test script.
* bc/t5607-avoid-broken-test-fail-prereqs:
t5607: avoid using prerequisites to select algorithm
commit a8960868518aaee85da308f394503dada14bfcbc
Merge: fb0b14df65 a8cbc89589
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:05 2021 -0700
Merge branch 'th/userdiff-more-java'
The userdiff pattern for "java" language has been updated.
* th/userdiff-more-java:
userdiff: improve java hunk header regex
commit fb0b14df651184ef16b7f0dc093b7d46c7062413
Merge: 7e3b9d1534 c4d5907324
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:05 2021 -0700
Merge branch 'jk/range-diff-fixes'
"git range-diff" code clean-up.
* jk/range-diff-fixes:
range-diff: use ssize_t for parsed "len" in read_patches()
range-diff: handle unterminated lines in read_patches()
range-diff: drop useless "offset" variable from read_patches()
commit 7e3b9d15344fa5a09fe5c70270c9f2c2f75d0f90
Merge: e1eb133476 46d723ce57
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:04 2021 -0700
Merge branch 'jk/apply-binary-hunk-parsing-fix'
"git apply" miscounted the bytes and failed to read to the end of
binary hunks.
* jk/apply-binary-hunk-parsing-fix:
apply: keep buffer/size pair in sync when parsing binary hunks
commit e1eb13347610bd5b062377f2e8d7f807c6e89d07
Merge: 669277c551 b6029b3279
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:03 2021 -0700
Merge branch 'jc/userdiff-pattern-hint'
Remind developers that the userdiff patterns should be kept simple
and permissive, assuming that the contents they apply are always
syntactically correct.
* jc/userdiff-pattern-hint:
userdiff: comment on the builtin patterns
commit 669277c551604fddcb4dc9dac888cd956cccacd3
Merge: b81a85ecd8 00e302da76
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:02 2021 -0700
Merge branch 'cb/builtin-merge-format-string-fix'
Code clean-up.
* cb/builtin-merge-format-string-fix:
builtin/merge: avoid -Wformat-extra-args from ancient Xcode
commit b81a85ecd82239386fc22f5f3c6914155e029ce8
Merge: 8778fa8b4f 626beebdf8
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:02 2021 -0700
Merge branch 'js/log-protocol-version'
Debugging aid.
* js/log-protocol-version:
connect, protocol: log negotiated protocol version
commit 8778fa8b4f18a3930101825e5bcff62b5348e918
Merge: aca13c2355 f5a3c5e637
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:01 2021 -0700
Merge branch 'en/ort-becomes-the-default'
Use `ort` instead of `recursive` as the default merge strategy.
* en/ort-becomes-the-default:
Update docs for change of default merge backend
Change default merge backend from recursive to ort
commit aca13c2355e7188432cb32aedf0bb0c477ec011a
Merge: 7d0daf3f12 81483fe613
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:01 2021 -0700
Merge branch 'en/merge-strategy-docs'
Documentation updates.
* en/merge-strategy-docs:
Update error message and code comment
merge-strategies.txt: add coverage of the `ort` merge strategy
git-rebase.txt: correct out-of-date and misleading text about renames
merge-strategies.txt: fix simple capitalization error
merge-strategies.txt: avoid giving special preference to patience algorithm
merge-strategies.txt: do not imply using copy detection is desired
merge-strategies.txt: update wording for the resolve strategy
Documentation: edit awkward references to `git merge-recursive`
directory-rename-detection.txt: small updates due to merge-ort optimizations
git-rebase.txt: correct antiquated claims about --rebase-merges
commit 7d0daf3f12f87799a3b3f524933ef6c15d1f28c3
Merge: c4203212e3 6f843a3355
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Aug 30 16:06:01 2021 -0700
Merge branch 'en/pull-conflicting-options'
"git pull" had various corner cases that were not well thought out
around its --rebase backend, e.g. "git pull --ff-only" did not stop
but went ahead and rebased when the history on other side is not a
descendant of our history. The series tries to fix them up.
* en/pull-conflicting-options:
pull: fix handling of multiple heads
pull: update docs & code for option compatibility with rebasing
pull: abort by default when fast-forwarding is not possible
pull: make --rebase and --no-rebase override pull.ff=only
pull: since --ff-only overrides, handle it first
pull: abort if --ff-only is given and fast-forwarding is impossible
t7601: add tests of interactions with multiple merge heads and config
t7601: test interaction of merge/rebase/fast-forward flags and options
commit 454d8c46a17f76059629d1f5f566a6ab6d5a85de
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Mon Aug 30 11:55:57 2021 -0700
debian: new "next" snapshot
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Change-Id: Icd31130eecd186ea2e74e885ad85ea21401273c5
commit 5f4864929b07bc4392fdc54b4b2b42c6f522bef4
Merge: be35fefcb3 ba50c8fa24
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Mon Aug 30 11:55:24 2021 -0700
Merge branch 'next' into debian-experimental
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Change-Id: I6228a5ede01e3b242981d19ec362e7db05100ba4
commit f6bb64df82ddd050894ca8a2a0bfbd1997602500
Author: Patrick Steinhardt <ps@pks.im>
Date: Mon Aug 30 12:54:26 2021 +0200
fetch: skip formatting updated refs with `--quiet`
When fetching, Git will by default print a list of all updated refs in a
nicely formatted table. In order to come up with this table, Git needs
to iterate refs twice: first to determine the maximum column width, and
a second time to actually format these changed refs.
While this table will not be printed in case the user passes `--quiet`,
we still go out of our way and do all these steps. In fact, we even do
more work compared to not passing `--quiet`: without the flag, we will
skip all references in the column width computation which have not been
updated, but if it is set we will now compute widths for all refs.
Fix this issue by completely skipping both preparation of the format and
formatting data for display in case the user passes `--quiet`, improving
performance especially with many refs. The following benchmark shows a
nice speedup for a quiet mirror-fetch in a repository with 2.3M refs:
Benchmark #1: HEAD~: git-fetch
Time (mean ± σ): 26.929 s ± 0.145 s [User: 24.194 s, System: 4.656 s]
Range (min … max): 26.692 s … 27.068 s 5 runs
Benchmark #2: HEAD: git-fetch
Time (mean ± σ): 25.189 s ± 0.094 s [User: 22.556 s, System: 4.606 s]
Range (min … max): 25.070 s … 25.314 s 5 runs
Summary
'HEAD: git-fetch' ran
1.07 ± 0.01 times faster than 'HEAD~: git-fetch'
While at it, this patch also fixes `adjust_refcol_width()` such that it
skips unchanged refs in case the user passed `--quiet`, where verbosity
will be negative. While this function won't be called anymore if so,
this brings the comment in line with actual code. Furthermore, needless
`verbosity >= 0` checks are now removed in `store_updated_refs()`: we
never print to the `note` buffer anymore in case `verbosity < 0`, so we
won't end up in that code block anyway.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 2dee7e61053ada0197512b71e02581857e2f1b50
Author: René Scharfe <l.s.r@web.de>
Date: Sat Aug 28 23:30:49 2021 +0200
merge-recursive: use fspathcmp() in path_hashmap_cmp()
Call fspathcmp() instead of open-coding it. This shortens the code and
makes it less repetitive.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 614c3d8f2e330baedfdb09fc90803a4c360d39cb
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Sun Aug 29 11:25:36 2021 +0200
test-lib: set GIT_CEILING_DIRECTORIES to protect the surrounding repository
Every once in a while a test somehow manages to escape from its trash
directory and modifies the surrounding repository, whether because of
a bug in git itself, a bug in a test [1], or e.g. when trying to run
tests with a shell that is, in general, unable to run our tests [2].
Set GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/.." as an additional
safety measure to protect the surrounding repository at least from
modifications by git commands executed in the tests (assuming that
handling of ceiling directories during repository discovery is not
broken, and, of course, it won't save us from regular shell commands,
e.g. 'cd .. && rm -f ...').
[1] e.g. https://public-inbox.org/git/20210423051255.GD2947267@szeder.dev
[2] $ git symbolic-ref HEAD
refs/heads/master
$ ksh ./t2011-checkout-invalid-head.sh
[... a lot of "not ok" ...]
$ git symbolic-ref HEAD
refs/heads/other
(In short: 'ksh' doesn't support the 'local' builtin command,
which is used by 'test_oid', causing it to return with error
whenever it's called, leaving ZERO_OID set to empty, so when the
test 'checkout main from invalid HEAD' runs 'echo $ZERO_OID
>.git/HEAD' it writes a corrupt (not invalid) HEAD, and subsequent
git commands don't recognize the repository in the trash directory
anymore, but operate on the surrounding repo.)
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 469888e6a5aabacb18e7c9422a8a8fa4d380fba3
Author: Zoker <kaixuanguiqu@gmail.com>
Date: Sat Aug 28 09:02:12 2021 +0000
doc: fix syntax error and the format of printf
Fix syntax and correct the format of printf in MyFirstObjectWalk.txt
Signed-off-by: Zoker <kaixuanguiqu@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d9e9b44d7a022ebc57caa3762d1af7e6bf608d5f
Author: Jeff Hostetler <jeffhost@microsoft.com>
Date: Mon Aug 16 17:48:55 2021 +0000
sparse-index: copy dir_hash in ensure_full_index()
Copy the 'index_state->dir_hash' back to the real istate after expanding
a sparse index.
A crash was observed in 'git status' during some hashmap lookups with
corrupted hashmap entries. During an index expansion, new cache-entries
are added to the 'index_state->name_hash' and the 'dir_hash' in a
temporary 'index_state' variable 'full'. However, only the 'name_hash'
hashmap from this temp variable was copied back into the real 'istate'
variable. The original copy of the 'dir_hash' was incorrectly
preserved. If the table in the 'full->dir_hash' hashmap were realloced,
the stale version (in 'istate') would be corrupted.
The test suite does not operate on index sizes sufficiently large to
trigger this reallocation, so they do not cover this behavior.
Increasing the test suite to cover such scale is fragile and likely
wasteful.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit b0173340c6b5fb330f5ea22504389fc6c5367f14
Author: Taylor Blau <me@ttaylorr.com>
Date: Sun Aug 29 22:48:57 2021 -0400
builtin/pack-objects.c: remove duplicate hash lookup
In the original code from 08cdfb1337 (pack-objects --keep-unreachable,
2007-09-16), we add each object to the packing list with type
`obj->type`, where `obj` comes from `lookup_unknown_object()`. Unless we
had already looked up and parsed the object, this will be `OBJ_NONE`.
That's fine, since oe_set_type() sets the type_valid bit to '0', and we
determine the real type later on.
So the only thing we need from the object lookup is access to the
`flags` field so that we can mark that we've added the object with
`OBJECT_ADDED` to avoid adding it again (we can just pass `OBJ_NONE`
directly instead of grabbing it from the object).
But add_object_entry() already rejects duplicates! This has been the
behavior since 7a979d99ba (Thin pack - create packfile with missing
delta base., 2006-02-19), but 08cdfb1337 didn't take advantage of it.
Moreover, to do the OBJECT_ADDED check, we have to do a hash lookup in
`obj_hash`.
So we can drop the lookup_unknown_object() call completely, *and* the
OBJECT_ADDED flag, too, since the spot we're touching here is the only
location that checks it.
In the end, we perform the same number of hash lookups, but with the
added bonus that we don't waste memory allocating an OBJ_NONE object (if
we were traversing, we'd need it eventually, but the whole point of this
code path is not to traverse).
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a9fd2f207d0318cd7a4771f13c9fb4759d280f68
Author: Taylor Blau <me@ttaylorr.com>
Date: Sun Aug 29 22:48:54 2021 -0400
builtin/pack-objects.c: simplify add_objects_in_unpacked_packs()
This function is used to implement `pack-objects`'s `--keep-unreachable`
option, but can be simplified in a couple of ways:
- add_objects_in_unpacked_packs() iterates over all packs (and then
all packed objects) itself, but could use for_each_packed_object()
instead since the missing flags necessary were added in the previous
commit
- objects are added to an in_pack array which store (off_t, object)
tuples, and then sorted in offset order when we could iterate
objects in offset order.
There is a slight behavior change here: before we would have added
objects in sorted offset order among _all_ packs. Handing objects to
create_object_entry() in pack order for each pack (instead of
feeding objects from all packs simultaneously their offset relative
to different packs) is much more reasonable, if different than how
the code currently works.
- objects in a single pack are iterated in index order and searched
for in order to discover their offsets, which is much less efficient
than using the on-disk reverse index
Simplify the function by addressing each of the above and moving the
core of the loop into a callback function that we then pass to
for_each_packed_object() instead of open-coding the latter function
ourselves.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a241878ac7b67b1894c14d3c3e33ed13f11ae253
Author: Taylor Blau <me@ttaylorr.com>
Date: Sun Aug 29 22:48:52 2021 -0400
object-store.h: teach for_each_packed_object to ignore kept packs
The next patch will reimplement a function that wants to iterate over
packed objects while ignoring packs which are marked as kept (either
in-core or on-disk).
Teach for_each_packed_object() to ignore all objects from those packs by
adding a new flag for each of the "kept" states that a pack can be in.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 597a97748924e8ce0b829f668acc8f7a6849b05f
Author: René Scharfe <l.s.r@web.de>
Date: Fri Aug 27 20:35:35 2021 +0200
branch: allow deleting dangling branches with --force
git branch only allows deleting branches that point to valid commits.
Skip that check if --force is given, as the caller is indicating with
it that they know what they are doing and accept the consequences.
This allows deleting dangling branches, which previously had to be
reset to a valid start-point using --force first.
Reported-by: Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 7a132c628e57b9bceeb88832ea051395c0637b16
Author: Matheus Tavares <matheus.bernardino@usp.br>
Date: Thu Aug 26 16:10:06 2021 -0300
checkout: make delayed checkout respect --quiet and --no-progress
The 'Filtering contents...' progress report from delayed checkout is
displayed even when checkout and clone are invoked with --quiet or
--no-progress. Furthermore, it is displayed unconditionally, without
first checking whether stdout is a tty. Let's fix these issues and also
add some regression tests for the two code paths that currently use
delayed checkout: unpack_trees.c:check_updates() and
builtin/checkout.c:checkout_worktree().
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit c93ca46cf5d0b0cd22e357a6460fa84fd4633440
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Wed Aug 18 11:24:56 2021 +0200
column: fix parsing of the '--nl' option
'git column's '--nl' option can be used to specify a "string to be
printed at the end of each line" (quoting the man page), but this
option and its mandatory argument has been parsed as OPT_INTEGER since
the introduction of the command in 7e29b8254f (Add column layout
skeleton and git-column, 2012-04-21). Consequently, any non-number
argument is rejected by parse-options, and any number other than 0
leads to segfault:
$ printf "%s\n" one two |git column --mode=plain --nl=foo
error: option `nl' expects a numerical value
$ printf "%s\n" one two |git column --mode=plain --nl=42
Segmentation fault (core dumped)
$ printf "%s\n" one two |git column --mode=plain --nl=0
one
two
Parse this option as OPT_STRING.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f54b9f21cab23209697d9985c16a7bf4ee7b4241
Author: Patrick Steinhardt <ps@pks.im>
Date: Wed Aug 25 15:49:51 2021 +0200
ls-refs: reuse buffer when sending refs
In the initial reference advertisement, the Git server will first
announce all of its references to the client. The logic is handled in
`send_ref()`, which will allocate a new buffer for each refline it is
about to send. This is quite wasteful: instead of allocating a new
buffer each time, we can just reuse a buffer.
Improve this by passing in a buffer via the `ls_refs_data` struct which
is then reused on each reference.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 66e905b7dd0f4e9dd576be681f30fbaeeb19ec4a
Author: René Scharfe <l.s.r@web.de>
Date: Wed Aug 25 22:16:46 2021 +0200
use xopen() to handle fatal open(2) failures
Add and apply a semantic patch for using xopen() instead of calling
open(2) and die() or die_errno() explicitly. This makes the error
messages more consistent and shortens the code.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a7439d0f9dd291e7cc9e6c2dda19cbfdf09b62ee
Author: René Scharfe <l.s.r@web.de>
Date: Wed Aug 25 22:14:09 2021 +0200
xopen: explicitly report creation failures
If the flags O_CREAT and O_EXCL are both given then open(2) is supposed
to create the file and error out if it already exists. The error
message in that case looks like this:
fatal: could not open 'foo' for writing: File exists
Without further context this is confusing: Why should the existence of
the file pose a problem? Isn't that a requirement for writing to it?
Add a more specific error message for that case to tell the user that we
actually don't expect the file to preexist, so the example becomes:
fatal: unable to create 'foo': File exists
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 8174627b3d32dc80cb477b3fa46971955f26c6b2
Author: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date: Sun Aug 22 15:49:08 2021 +0700
diff-lib: ignore paths that are outside $cwd if --relative asked
For diff family commands, we can tell them to exclude changes outside
of some directories if --relative is requested.
In diff_unmerge(), NULL will be returned if the requested path is
outside of the interesting directories, thus we'll run into NULL
pointer dereference in run_diff_files when trying to dereference
its return value.
Checking for return value of diff_unmerge before dereferencing
is not sufficient, though. Since, diff engine will try to work on such
pathspec later.
Let's not run diff on those unintesting entries, instead.
As a side effect, by skipping like that, we can save some CPU cycles.
Reported-by: Thomas De Zeeuw <thomas@slight.dev>
Tested-by: Carlo Arenas <carenas@gmail.com>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 1549577338c7c3a4455e9b3f05f9c8740b8e5337
Author: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date: Sat Aug 21 08:36:34 2021 +0700
t6300: check for cat-file exit status code
In test_atom(), we're piping the output of cat-file to tail(1),
thus, losing its exit status.
Let's use a temporary file to preserve git exit status code.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 597fa8cb430179ec2b28e2d39a857af25717c98c
Author: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date: Sat Aug 21 08:36:33 2021 +0700
t6300: don't run cat-file on non-existent object
In t6300, some tests are guarded behind some prerequisites.
Thus, objects created by those tests ain't available if those
prerequisites are unsatistified. Attempting to run "cat-file"
on those objects will run into failure.
In fact, running t6300 in an environment without gpg(1),
we'll see those warnings:
fatal: Not a valid object name refs/tags/signed-empty
fatal: Not a valid object name refs/tags/signed-short
fatal: Not a valid object name refs/tags/signed-long
Let's put those commands into the real tests, in order to:
* skip their execution if prerequisites aren't satistified.
* check their exit status code
The expected value for objects with type: commit needs to be
computed outside the test because we can't rely on "$3" there.
Furthermore, to prevent the accidental usage of that computed
expected value, BUG out on unknown object's type.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 5146c2f148e903db2d906dae372803d9c8c3bbcf
Author: Mike Hommey <mh@glandium.org>
Date: Fri Aug 20 17:44:13 2021 +0900
credential: fix leak in credential_apply_config()
Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit c21b2511c2b725c47da43d33c253070be6cb4f2d
Author: Jeff King <peff@peff.net>
Date: Tue Aug 24 21:35:52 2021 -0400
t5323: drop mentions of "master"
Commit 0696232390 (pack-redundant: fix crash when one packfile in repo,
2020-12-16) added one some new tests to t5323. At the time, the sub-repo
we used was called "master". But in a parallel branch, this was switched
to "main".
When the latter branch was merged in 27d7c8599b (Merge branch
'js/default-branch-name-tests-final-stretch', 2021-01-25), some of those
spots caused textual conflicts, but some (for tests that were far enough
away from other changed code) were just semantic. The merge resolution
fixed up most spots, but missed this one.
Even though this did impact actual code, it turned out not to fail the
tests. Running 'cd "$master_repo"' ended up staying in the same
directory, running the test in the main trash repo instead of the
sub-repo. But because the point of the test is checking behavior when
there are no packfiles, it worked in either repo (since both are empty
at this point in the script).
Reported-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit ba50c8fa2411f9e6a5c9ec9617eca2637ef4e4cb
Merge: 9a3df9ec56 c4203212e3
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:29 2021 -0700
Sync with master
commit 9a3df9ec5640ac61d63b494c4879d8b8da20d90e
Merge: 8fa66cf037 325b06deda
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:18 2021 -0700
Merge branch 'sg/make-fix-ar-invocation' into next
Build fix.
* sg/make-fix-ar-invocation:
Makefile: remove archives before manipulating them with 'ar'
commit 8fa66cf0373b3ddc679bd63377a0589062276bb2
Merge: 593cd75c64 ff7b83f562
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:18 2021 -0700
Merge branch 'ti/tcsh-completion-regression-fix' into next
Update to the command line completion (in contrib/) for tcsh.
* ti/tcsh-completion-regression-fix:
completion: tcsh: Fix regression by drop of wrapper functions
commit 593cd75c647cbc0ef478c5faac3c5dc4ee8715b9
Merge: 81c6aff70a be6444d1ca
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:17 2021 -0700
Merge branch 'fc/completion-updates' into next
Command line completion updates.
* fc/completion-updates:
completion: bash: add correct suffix in variables
completion: bash: fix for multiple dash commands
completion: bash: fix for suboptions with value
completion: bash: fix prefix detection in branch.*
commit 81c6aff70a20f782e927ff8a3dde628a366e9276
Merge: 73ec41e9dd f2563c9ef3
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:17 2021 -0700
Merge branch 'pw/rebase-r-fixes' into next
Various bugs in "git rebase -r" have been fixed.
* pw/rebase-r-fixes:
rebase -r: fix merge -c with a merge strategy
rebase -r: don't write .git/MERGE_MSG when fast-forwarding
rebase -i: add another reword test
rebase -r: make 'merge -c' behave like reword
commit 73ec41e9ddd37eb79cdd9ed860218a6e608756c8
Merge: afdbb7ee8d e5ee33e855
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:16 2021 -0700
Merge branch 'pw/rebase-skip-final-fix' into next
Checking out all the paths from HEAD during the last conflicted
step in "git rebase" and continuing would cause the step to be
skipped (which is expected), but leaves MERGE_MSG file behind in
$GIT_DIR and confuses the next "git commit", which has been
corrected.
* pw/rebase-skip-final-fix:
rebase --continue: remove .git/MERGE_MSG
rebase --apply: restore some tests
t3403: fix commit authorship
commit afdbb7ee8d77f6acc33bd401cda8fa6cc53f0553
Merge: 1ecf63af7d 3cf9bb36bf
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:16 2021 -0700
Merge branch 'cb/ci-use-upload-artifacts-v1' into next
Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
new version has a blocker bug for that architecture.
* cb/ci-use-upload-artifacts-v1:
ci: use upload-artifacts v1 for dockerized jobs
commit 1ecf63af7d679010337d7e11cffa0e11357024be
Merge: 55cc85c20a ad51ae4dc0
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:15 2021 -0700
Merge branch 'cb/ci-freebsd-update' into next
Update FreeBSD CI job
* cb/ci-freebsd-update:
ci: update freebsd 12 cirrus job
commit 55cc85c20a9d8c4e7819c1fdb87a8a670c1d8e88
Merge: 0c625438c3 b3e36df0d4
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:15 2021 -0700
Merge branch 'tl/traverse-non-commits-rename' into next
Meh.
* tl/traverse-non-commits-rename:
list-objects.c: rename "traverse_trees_and_blobs" to "traverse_non_commits"
commit 0c625438c344aea3ab0e28e72dc421865315f948
Merge: 66c1e510ff 8ef6aad664
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:15 2021 -0700
Merge branch 'jk/commit-edit-fixup-fix' into next
"git commit --fixup" now works with "--edit" again, after it was
broken in v2.32.
* jk/commit-edit-fixup-fix:
commit: restore --edit when combined with --fixup
commit 66c1e510ffd470484a6e11e3303b8c16ae1e4b7f
Merge: a5617abd3e b227bead4d
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:14 2021 -0700
Merge branch 'bc/t5607-avoid-broken-test-fail-prereqs' into next
The current implementation of GIT_TEST_FAIL_PREREQS is broken in
that checking for the lack of a prerequisite would not work. Avoid
the use of "if ! test_have_prereq X" in a test script.
* bc/t5607-avoid-broken-test-fail-prereqs:
t5607: avoid using prerequisites to select algorithm
commit a5617abd3e5658b9452335cfa7d2731f891b49f3
Merge: eff05f579e a8cbc89589
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:14 2021 -0700
Merge branch 'th/userdiff-more-java' into next
The userdiff pattern for "java" language has been updated.
* th/userdiff-more-java:
userdiff: improve java hunk header regex
commit eff05f579e9cbb3371028c47cd66f62a7d6cf05a
Merge: c786cd1e8b c4d5907324
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:13 2021 -0700
Merge branch 'jk/range-diff-fixes' into next
"git range-diff" code clean-up.
* jk/range-diff-fixes:
range-diff: use ssize_t for parsed "len" in read_patches()
range-diff: handle unterminated lines in read_patches()
range-diff: drop useless "offset" variable from read_patches()
commit c786cd1e8b9ad3478d0887500a04eb0a8066b3b5
Merge: f29f51148f 46d723ce57
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:13 2021 -0700
Merge branch 'jk/apply-binary-hunk-parsing-fix' into next
"git apply" miscounted the bytes and failed to read to the end of
binary hunks.
* jk/apply-binary-hunk-parsing-fix:
apply: keep buffer/size pair in sync when parsing binary hunks
commit f29f51148f51d27fcfb9744b057f78c2e923e3f8
Merge: 6e94c19f1e b6029b3279
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:12 2021 -0700
Merge branch 'jc/userdiff-pattern-hint' into next
Remind developers that the userdiff patterns should be kept simple
and permissive, assuming that the contents they apply are always
syntactically correct.
* jc/userdiff-pattern-hint:
userdiff: comment on the builtin patterns
commit 6e94c19f1ecc26623860ff4eaebe68ff9ba24626
Merge: 94a7a04ca4 00e302da76
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:11 2021 -0700
Merge branch 'cb/builtin-merge-format-string-fix' into next
Code clean-up.
* cb/builtin-merge-format-string-fix:
builtin/merge: avoid -Wformat-extra-args from ancient Xcode
commit 94a7a04ca44f9b7c609f589a03ed7141f7f47b74
Merge: aeeaee04fb f559d6d45e
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:10 2021 -0700
Merge branch 'ps/connectivity-optim' into next
The revision traversal API has been optimized by taking advantage
of the commit-graph, when available, to determine if a commit is
reachable from any of the existing refs.
* ps/connectivity-optim:
revision: avoid hitting packfiles when commits are in commit-graph
commit-graph: split out function to search commit position
revision: stop retrieving reference twice
connected: do not sort input revisions
revision: separate walk and unsorted flags
commit aeeaee04fb34b1010ce72a86fd31bd84ddb0eb48
Merge: 92f4e08d83 626beebdf8
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:10 2021 -0700
Merge branch 'js/log-protocol-version' into next
Debugging aid.
* js/log-protocol-version:
connect, protocol: log negotiated protocol version
commit 92f4e08d836e41212e8d38d832a604aa16981b27
Merge: ceb66b1062 f5a3c5e637
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:10 2021 -0700
Merge branch 'en/ort-becomes-the-default' into next
Use `ort` instead of `recursive` as the default merge strategy.
* en/ort-becomes-the-default:
Update docs for change of default merge backend
Change default merge backend from recursive to ort
commit ceb66b1062f3d948c15f6b7ae34dae8178e2daf6
Merge: e1e5b2c551 81483fe613
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:10 2021 -0700
Merge branch 'en/merge-strategy-docs' into next
Documentation updates.
* en/merge-strategy-docs:
Update error message and code comment
merge-strategies.txt: add coverage of the `ort` merge strategy
git-rebase.txt: correct out-of-date and misleading text about renames
merge-strategies.txt: fix simple capitalization error
merge-strategies.txt: avoid giving special preference to patience algorithm
merge-strategies.txt: do not imply using copy detection is desired
merge-strategies.txt: update wording for the resolve strategy
Documentation: edit awkward references to `git merge-recursive`
directory-rename-detection.txt: small updates due to merge-ort optimizations
git-rebase.txt: correct antiquated claims about --rebase-merges
commit e1e5b2c55128496a5ff362c013d49b51025696cf
Merge: 09f9fbdd9f 6f843a3355
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:35:10 2021 -0700
Merge branch 'en/pull-conflicting-options' into next
"git pull" had various corner cases that were not well thought out
around its --rebase backend, e.g. "git pull --ff-only" did not stop
but went ahead and rebased when the history on other side is not a
descendant of our history. The series tries to fix them up.
* en/pull-conflicting-options:
pull: fix handling of multiple heads
pull: update docs & code for option compatibility with rebasing
pull: abort by default when fast-forwarding is not possible
pull: make --rebase and --no-rebase override pull.ff=only
pull: since --ff-only overrides, handle it first
pull: abort if --ff-only is given and fast-forwarding is impossible
t7601: add tests of interactions with multiple merge heads and config
t7601: test interaction of merge/rebase/fast-forward flags and options
commit c4203212e360b25a1c69467b5a8437d45a373cac
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:33:23 2021 -0700
The first batch post 2.33
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 1b2be06e04c5dba2fc25d2eb0cc2bd85d469e350
Merge: 066f6cd447 3e5e6c6e94
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:41 2021 -0700
Merge branch 'ps/fetch-pack-load-refs-optim'
Loading of ref tips to prepare for common ancestry negotiation in
"git fetch-pack" has been optimized by taking advantage of the
commit graph when available.
* ps/fetch-pack-load-refs-optim:
fetch-pack: speed up loading of refs via commit graph
commit 066f6cd44707ca2f8c3dc2a2ae02c2c9784903bf
Merge: 6f64eeab60 82823118b9
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:40 2021 -0700
Merge branch 'jt/push-negotiation-fixes'
Bugfix for common ancestor negotiation recently introduced in "git
push" code path.
* jt/push-negotiation-fixes:
fetch: die on invalid --negotiation-tip hash
send-pack: fix push nego. when remote has refs
send-pack: fix push.negotiate with remote helper
commit 6f64eeab605b82b187b2dd1fc72492f434bad603
Merge: 276bc6357e 2f732bf15e
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:40 2021 -0700
Merge branch 'es/trace2-log-parent-process-name'
trace2 logs learned to show parent process name to see in what
context Git was invoked.
* es/trace2-log-parent-process-name:
tr2: log parent process name
tr2: make process info collection platform-generic
commit 276bc6357ebe50dae070aff9693a21c4a2bafc28
Merge: 08ac213965 977f8acefd
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:39 2021 -0700
Merge branch 'hn/refs-test-cleanup'
A handful of tests that assumed implementation details of files
backend for refs have been cleaned up.
* hn/refs-test-cleanup:
t6001: avoid direct file system access
t6500: use "ls -1" to snapshot ref database state
t7064: use update-ref -d to remove upstream branch
t1410: mark test as REFFILES
t1405: mark test for 'git pack-refs' as REFFILES
t1405: use 'git reflog exists' to check reflog existence
t2402: use ref-store test helper to create broken symlink
t3320: use git-symbolic-ref rather than filesystem access
t6120: use git-update-ref rather than filesystem access
t1503: mark symlink test as REFFILES
t6050: use git-update-ref rather than filesystem access
commit 08ac213965dd861b7182ee7072b613ae29c72ae1
Merge: aab0eeaba5 62a15162fe
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:39 2021 -0700
Merge branch 'en/ort-perf-batch-15'
Final batch for "merge -sort" optimization.
* en/ort-perf-batch-15:
merge-ort: remove compile-time ability to turn off usage of memory pools
merge-ort: reuse path strings in pool_alloc_filespec
merge-ort: store filepairs and filespecs in our mem_pool
diffcore-rename, merge-ort: add wrapper functions for filepair alloc/dealloc
merge-ort: switch our strmaps over to using memory pools
merge-ort: set up a memory pool
merge-ort: add pool_alloc, pool_calloc, and pool_strndup wrappers
diffcore-rename: use a mem_pool for exact rename detection's hashmap
merge-ort: rename str{map,intmap,set}_func()
commit aab0eeaba56e87f4d471b8e2aba9a648e5606d01
Merge: f19b2752e7 7ed37eb8ae
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:38 2021 -0700
Merge branch 'js/expand-runtime-prefix'
Pathname expansion (like "~username/") learned a way to specify a
location relative to Git installation (e.g. its $sharedir which is
$(prefix)/share), with "%(prefix)".
* js/expand-runtime-prefix:
expand_user_path: allow in-flight topics to keep using the old name
interpolate_path(): allow specifying paths relative to the runtime prefix
Use a better name for the function interpolating paths
expand_user_path(): clarify the role of the `real_home` parameter
expand_user_path(): remove stale part of the comment
tests: exercise the RUNTIME_PREFIX feature
commit f19b2752e7788ad3a66812fd37fc482fc247eb4c
Merge: bda891e664 1d9c8daef8
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:37 2021 -0700
Merge branch 'ab/bundle-doc'
Doc update.
* ab/bundle-doc:
bundle doc: replace "basis" with "prerequsite(s)"
bundle doc: elaborate on rev<->ref restriction
bundle doc: elaborate on object prerequisites
bundle doc: rewrite the "DESCRIPTION" section
commit bda891e6647538693d6cec5d3085f1508fbb5f5f
Merge: 5c933f0155 b9dee075eb
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:37 2021 -0700
Merge branch 'zh/ref-filter-raw-data'
Prepare the "ref-filter" machinery that drives the "--format"
option of "git for-each-ref" and its friends to be used in "git
cat-file --batch".
* zh/ref-filter-raw-data:
ref-filter: add %(rest) atom
ref-filter: use non-const ref_format in *_atom_parser()
ref-filter: --format=%(raw) support --perl
ref-filter: add %(raw) atom
ref-filter: add obj-type check in grab contents
commit 5c933f0155959452f299cd4a0a65fe22b5c239be
Merge: e48a623dea 561fa03529
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:36 2021 -0700
Merge branch 'ab/pack-stdin-packs-fix'
Input validation of "git pack-objects --stdin-packs" has been
corrected.
* ab/pack-stdin-packs-fix:
pack-objects: fix segfault in --stdin-packs option
pack-objects tests: cover blindspots in stdin handling
commit e48a623dea0c9170e4daa5e27e5bbc3f1ce84354
Merge: 2f71366878 8dda4cbdf2
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:36 2021 -0700
Merge branch 'ab/http-drop-old-curl'
Support for ancient versions of cURL library (pre 7.19.4) has been
dropped.
* ab/http-drop-old-curl:
http: rename CURLOPT_FILE to CURLOPT_WRITEDATA
http: drop support for curl < 7.19.3 and < 7.17.0 (again)
http: drop support for curl < 7.19.4
http: drop support for curl < 7.16.0
http: drop support for curl < 7.11.1
commit 2f713668784266b4682816fadcf2034d846e9cc1
Merge: ae2d05d0c6 42f8ed6ca2
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:35 2021 -0700
Merge branch 'ds/add-with-sparse-index'
"git add" can work better with the sparse index.
* ds/add-with-sparse-index:
add: remove ensure_full_index() with --renormalize
add: ignore outside the sparse-checkout in refresh()
pathspec: stop calling ensure_full_index
add: allow operating on a sparse-only index
t1092: test merge conflicts outside cone
commit ae2d05d0c6b1834cfcfc5e060db6cf8d91160c5b
Merge: 225bc32a98 1fcc40cd1d
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Aug 24 15:32:35 2021 -0700
Merge branch 'jc/bisect-sans-show-branch'
"git bisect" spawned "git show-branch" only to pretty-print the
title of the commit after checking out the next version to be
tested; this has been rewritten in C.
* jc/bisect-sans-show-branch:
bisect: simplify return code from bisect_checkout()
bisect: do not run show-branch just to show the current commit
There are 2 open security issues in buster.
You can find information about how to handle these issues in the security team's documentation.
![[bug history graph]](https://qa.debian.org/data/bts/graphs/g/git.png){kind=link}