* Re: [BUG] mv: can trigger assertion failure with three parameters (builtin/mv.c:481)
@ 2024-02-18 12:42 12% ` Kristoffer Haugsbakk
0 siblings, 0 replies; 200+ results
From: Kristoffer Haugsbakk @ 2024-02-18 12:42 UTC (permalink / raw)
To: git; +Cc: Kristoffer Haugsbakk, Junio C Hamano, Dragan Simic
Here’s a failing test. This fails on top of `master` (3e0d3cd5c7 (Merge branch
'jx/dirstat-parseopt-help', 2024-02-15)).
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
-- >8 --
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 879a6dce601..4f180903486 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -549,4 +549,16 @@ test_expect_success 'moving nested submodules' '
git status
'
+test_expect_success '(TODO title) nonsense move' '
+ test_when_finished git reset --hard HEAD &&
+ git reset --hard HEAD &&
+ mkdir -p a &&
+ mkdir -p b &&
+ >a/a.txt &&
+ git add a/a.txt &&
+ test_must_fail git mv a/a.txt a b &&
+ git status --porcelain >actual &&
+ grep "^A[ ]*a/a.txt$" actual
+'
+
test_done
^ permalink raw reply related [relevance 12%]
* [PATCH 0/2] Deprecate test_i18ngrep further
@ 2023-10-31 5:23 2% ` Junio C Hamano
2023-10-31 5:23 1% ` [PATCH 2/2] tests: teach callers of test_i18ngrep to use test_grep Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2023-10-31 5:23 UTC (permalink / raw)
To: git
As an attempt to come up with a useful mechanism to ensure that
certain messages are left untranslated [*], we earlier wrote
GIT_TEST_GETTEXT_POISON off as a failed experiment.
But the output from the test helper was easier to use while
debugging failed tests, compared to the same test writtein with the
plain-vanilla "grep". Especially when a test that expects a certain
string to appear in the output (e.g. "this test must fail with this
message") fails, "grep message output" would just silently fail and
in a &&-chained sequence of commands, it is hard to tell which step
failed. test_i18ngrep explicitly said "we wanted to see a line that
match this pattern but did not see a hit in this file".
Let's introduce test_grep and replace existing uses of test_i18ngrep
with it. The helper is still useful, but now has nothing to do with
i18n.
Junio C Hamano (2):
test framework: further deprecate test_i18ngrep
tests: teach callers of test_i18ngrep to use test_grep
t/lib-httpd.sh | 2 +-
t/lib-submodule-update.sh | 2 +-
t/t0001-init.sh | 16 +--
t/t0002-gitfile.sh | 4 +-
t/t0003-attributes.sh | 4 +-
t/t0008-ignores.sh | 4 +-
t/t0012-help.sh | 16 +--
t/t0013-sha1dc.sh | 2 +-
t/t0014-alias.sh | 8 +-
t/t0021-conversion.sh | 6 +-
t/t0028-working-tree-encoding.sh | 32 ++---
t/t0040-parse-options.sh | 4 +-
t/t0041-usage.sh | 32 ++---
t/t0061-run-command.sh | 6 +-
t/t0070-fundamental.sh | 4 +-
t/t0091-bugreport.sh | 2 +-
t/t0300-credentials.sh | 2 +-
t/t1060-object-corruption.sh | 2 +-
t/t1091-sparse-checkout-builtin.sh | 68 ++++-----
t/t1092-sparse-checkout-compatibility.sh | 6 +-
t/t1300-config.sh | 44 +++---
t/t1307-config-blob.sh | 2 +-
t/t1308-config-set.sh | 10 +-
t/t1309-early-config.sh | 2 +-
t/t1310-config-default.sh | 4 +-
t/t1400-update-ref.sh | 22 +--
t/t1404-update-ref-errors.sh | 4 +-
t/t1410-reflog.sh | 6 +-
t/t1416-ref-transaction-hooks.sh | 2 +-
t/t1430-bad-ref-name.sh | 22 +--
t/t1450-fsck.sh | 80 +++++------
t/t1506-rev-parse-diagnosis.sh | 34 ++---
t/t1512-rev-parse-disambiguation.sh | 6 +-
t/t2004-checkout-cache-temp.sh | 2 +-
t/t2006-checkout-index-basic.sh | 14 +-
t/t2010-checkout-ambiguous.sh | 4 +-
t/t2018-checkout-branch.sh | 4 +-
t/t2019-checkout-ambiguous-ref.sh | 8 +-
t/t2020-checkout-detach.sh | 8 +-
t/t2024-checkout-dwim.sh | 8 +-
t/t2025-checkout-no-overlay.sh | 2 +-
t/t2026-checkout-pathspec-file.sh | 8 +-
t/t2027-checkout-track.sh | 2 +-
t/t2030-unresolve-info.sh | 2 +-
t/t2072-restore-pathspec-file.sh | 8 +-
t/t2106-update-index-assume-unchanged.sh | 2 +-
t/t2107-update-index-basic.sh | 4 +-
t/t2203-add-intent.sh | 6 +-
t/t2204-add-ignored.sh | 8 +-
t/t2401-worktree-prune.sh | 10 +-
t/t2402-worktree-list.sh | 6 +-
t/t2403-worktree-move.sh | 2 +-
t/t2406-worktree-repair.sh | 24 ++--
t/t3004-ls-files-basic.sh | 4 +-
t/t3007-ls-files-recurse-submodules.sh | 4 +-
t/t3200-branch.sh | 18 +--
t/t3202-show-branch.sh | 2 +-
t/t3206-range-diff.sh | 22 +--
t/t3210-pack-refs.sh | 2 +-
t/t3301-notes.sh | 4 +-
t/t3310-notes-merge-manual-resolve.sh | 16 +--
t/t3320-notes-merge-worktrees.sh | 4 +-
t/t3321-notes-stripspace.sh | 2 +-
t/t3400-rebase.sh | 6 +-
t/t3402-rebase-merge.sh | 2 +-
t/t3403-rebase-skip.sh | 30 ++--
t/t3404-rebase-interactive.sh | 38 ++---
t/t3406-rebase-message.sh | 18 +--
t/t3418-rebase-continue.sh | 6 +-
t/t3431-rebase-fork-point.sh | 2 +-
t/t3501-revert-cherry-pick.sh | 6 +-
t/t3507-cherry-pick-conflict.sh | 8 +-
t/t3510-cherry-pick-sequence.sh | 6 +-
t/t3600-rm.sh | 8 +-
t/t3601-rm-pathspec-file.sh | 6 +-
t/t3700-add.sh | 6 +-
t/t3701-add-interactive.sh | 8 +-
t/t3704-add-pathspec-file.sh | 12 +-
t/t3900-i18n-commit.sh | 8 +-
t/t3901-i18n-patch.sh | 2 +-
t/t3903-stash.sh | 10 +-
t/t3905-stash-include-untracked.sh | 2 +-
t/t3909-stash-pathspec-file.sh | 6 +-
t/t4001-diff-rename.sh | 34 ++---
t/t4013-diff-various.sh | 2 +-
t/t4014-format-patch.sh | 12 +-
t/t4015-diff-whitespace.sh | 20 +--
t/t4018-diff-funcname.sh | 14 +-
t/t4031-diff-rewrite-binary.sh | 2 +-
t/t4047-diff-dirstat.sh | 22 +--
t/t4053-diff-no-index.sh | 2 +-
t/t4055-diff-context.sh | 4 +-
t/t4068-diff-symmetric-merge-base.sh | 28 ++--
t/t4115-apply-symlink.sh | 2 +-
t/t4120-apply-popt.sh | 4 +-
t/t4122-apply-symlink-inside.sh | 14 +-
t/t4129-apply-samemode.sh | 4 +-
t/t4133-apply-filenames.sh | 8 +-
t/t4150-am.sh | 4 +-
t/t4151-am-abort.sh | 2 +-
t/t4153-am-resume-override-opts.sh | 2 +-
t/t4200-rerere.sh | 4 +-
t/t4201-shortlog.sh | 2 +-
t/t4202-log.sh | 18 +--
t/t4203-mailmap.sh | 2 +-
t/t4208-log-magic-pathspec.sh | 6 +-
t/t4209-log-pickaxe.sh | 4 +-
t/t4211-line-log.sh | 4 +-
t/t4212-log-corrupt.sh | 2 +-
t/t4256-am-format-flowed.sh | 2 +-
t/t5300-pack-object.sh | 4 +-
t/t5302-pack-index.sh | 4 +-
t/t5304-prune.sh | 4 +-
t/t5310-pack-bitmaps.sh | 8 +-
t/t5318-commit-graph.sh | 18 +--
t/t5319-multi-pack-index.sh | 10 +-
t/t5324-split-commit-graph.sh | 16 +--
t/t5331-pack-objects-stdin.sh | 4 +-
t/t5411/test-0026-push-options.sh | 2 +-
t/t5411/test-0027-push-options--porcelain.sh | 2 +-
t/t5500-fetch-pack.sh | 10 +-
t/t5504-fetch-receive-strict.sh | 26 ++--
t/t5505-remote.sh | 22 +--
t/t5510-fetch.sh | 8 +-
t/t5512-ls-remote.sh | 2 +-
t/t5514-fetch-multiple.sh | 4 +-
t/t5516-fetch-push.sh | 8 +-
t/t5520-pull.sh | 34 ++---
t/t5521-pull-options.sh | 2 +-
t/t5523-push-upstream.sh | 12 +-
t/t5528-push-default.sh | 2 +-
t/t5530-upload-pack-error.sh | 4 +-
t/t5531-deep-submodule-push.sh | 2 +-
t/t5534-push-signed.sh | 6 +-
t/t5536-fetch-conflicts.sh | 8 +-
t/t5541-http-push-smart.sh | 20 +--
t/t5545-push-options.sh | 2 +-
t/t5550-http-fetch-dumb.sh | 8 +-
t/t5551-http-fetch-smart.sh | 4 +-
t/t5570-git-daemon.sh | 10 +-
t/t5572-pull-submodule.sh | 2 +-
t/t5573-pull-verify-signatures.sh | 26 ++--
t/t5574-fetch-output.sh | 4 +-
t/t5580-unc-paths.sh | 2 +-
t/t5601-clone.sh | 6 +-
t/t5604-clone-reference.sh | 2 +-
t/t5606-clone-options.sh | 10 +-
t/t5607-clone-bundle.sh | 4 +-
t/t5611-clone-config.sh | 4 +-
t/t5616-partial-clone.sh | 22 +--
t/t5701-git-serve.sh | 8 +-
t/t5702-protocol-v2.sh | 34 ++---
t/t5703-upload-pack-ref-in-want.sh | 4 +-
t/t5704-protocol-violations.sh | 4 +-
t/t5801-remote-helpers.sh | 8 +-
t/t5812-proto-disable-http.sh | 2 +-
t/t6001-rev-list-graft.sh | 4 +-
t/t6021-rev-list-exclude-hidden.sh | 4 +-
t/t6030-bisect-porcelain.sh | 24 ++--
t/t6040-tracking-info.sh | 18 +--
t/t6050-replace.sh | 14 +-
t/t6102-rev-list-unexpected-objects.sh | 16 +--
t/t6112-rev-list-filters-objects.sh | 2 +-
t/t6120-describe.sh | 2 +-
t/t6134-pathspec-in-submodule.sh | 2 +-
t/t6135-pathspec-with-attrs.sh | 8 +-
t/t6136-pathspec-in-bare.sh | 8 +-
t/t6402-merge-rename.sh | 16 +--
t/t6422-merge-rename-corner-cases.sh | 16 +--
t/t6423-merge-rename-directories.sh | 140 +++++++++----------
t/t6424-merge-unrelated-index-changes.sh | 6 +-
t/t6425-merge-rename-delete.sh | 4 +-
t/t6426-merge-skip-unneeded-updates.sh | 2 +-
t/t6430-merge-recursive.sh | 8 +-
t/t6433-merge-toplevel.sh | 4 +-
t/t6436-merge-overwrite.sh | 4 +-
t/t6437-submodule-merge.sh | 2 +-
t/t6500-gc.sh | 14 +-
t/t7001-mv.sh | 4 +-
t/t7105-reset-patch.sh | 6 +-
t/t7106-reset-unborn-branch.sh | 2 +-
t/t7107-reset-pathspec-file.sh | 10 +-
t/t7110-reset-merge.sh | 6 +-
t/t7201-co.sh | 4 +-
t/t7300-clean.sh | 2 +-
t/t7400-submodule-basic.sh | 64 ++++-----
t/t7403-submodule-sync.sh | 4 +-
t/t7406-submodule-update.sh | 6 +-
t/t7411-submodule-config.sh | 4 +-
t/t7414-submodule-mistakes.sh | 8 +-
t/t7416-submodule-dash-url.sh | 4 +-
t/t7417-submodule-path-url.sh | 4 +-
t/t7450-bad-git-dotfiles.sh | 12 +-
t/t7500-commit-template-squash-signoff.sh | 2 +-
t/t7501-commit-basic-functionality.sh | 6 +-
t/t7502-commit-porcelain.sh | 32 ++---
t/t7506-status-submodule.sh | 28 ++--
t/t7507-commit-verbose.sh | 4 +-
t/t7508-status.sh | 24 ++--
t/t7509-commit-authorship.sh | 4 +-
t/t7518-ident-corner-cases.sh | 10 +-
t/t7519-status-fsmonitor.sh | 6 +-
t/t7520-ignored-hook-warning.sh | 8 +-
t/t7525-status-rename.sh | 54 +++----
t/t7526-commit-pathspec-file.sh | 14 +-
t/t7600-merge.sh | 30 ++--
t/t7601-merge-pull-config.sh | 50 +++----
t/t7611-merge-abort.sh | 4 +-
t/t7612-merge-verify-signatures.sh | 24 ++--
t/t7703-repack-geometric.sh | 4 +-
t/t7800-difftool.sh | 4 +-
t/t7810-grep.sh | 4 +-
t/t7811-grep-open.sh | 2 +-
t/t7814-grep-recurse-submodules.sh | 2 +-
t/t7816-grep-binary-pattern.sh | 4 +-
t/t7900-maintenance.sh | 24 ++--
t/t8003-blame-corner-cases.sh | 2 +-
t/t8013-blame-ignore-revs.sh | 6 +-
t/t9001-send-email.sh | 8 +-
t/t9300-fast-import.sh | 26 ++--
t/t9800-git-p4-basic.sh | 18 +--
t/t9801-git-p4-branch.sh | 2 +-
t/t9807-git-p4-submit.sh | 12 +-
t/t9815-git-p4-submit-fail.sh | 12 +-
t/test-lib-functions.sh | 10 +-
225 files changed, 1196 insertions(+), 1194 deletions(-)
--
2.42.0-530-g692be87cbb
^ permalink raw reply [relevance 2%]
* [PATCH 2/2] tests: teach callers of test_i18ngrep to use test_grep
2023-10-31 5:23 2% ` [PATCH 0/2] Deprecate test_i18ngrep further Junio C Hamano
@ 2023-10-31 5:23 1% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2023-10-31 5:23 UTC (permalink / raw)
To: git
They are equivalents and the former still exists, so as long as the
only change this commit makes are to rewrite test_i18ngrep to
test_grep, there won't be any new bug, even if there still are
callers of test_i18ngrep remaining in the tree, or when merged to
other topics that add new uses of test_i18ngrep.
This patch was produced more or less with
git grep -l -e 'test_i18ngrep ' 't/t[0-9][0-9][0-9][0-9]-*.sh' |
xargs perl -p -i -e 's/test_i18ngrep /test_grep /'
and a good way to sanity check the result yourself is to run the
above in a checkout of c4603c1c (test framework: further deprecate
test_i18ngrep, 2023-10-31) and compare the resulting working tree
contents with the result of applying this patch to the same commit.
You'll see that test_i18ngrep in a few t/lib-*.sh files corrected,
in addition to the manual reproduction.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
t/lib-httpd.sh | 2 +-
t/lib-submodule-update.sh | 2 +-
t/t0001-init.sh | 16 +--
t/t0002-gitfile.sh | 4 +-
t/t0003-attributes.sh | 4 +-
t/t0008-ignores.sh | 4 +-
t/t0012-help.sh | 16 +--
t/t0013-sha1dc.sh | 2 +-
t/t0014-alias.sh | 8 +-
t/t0021-conversion.sh | 6 +-
t/t0028-working-tree-encoding.sh | 32 ++---
t/t0040-parse-options.sh | 4 +-
t/t0041-usage.sh | 32 ++---
t/t0061-run-command.sh | 6 +-
t/t0070-fundamental.sh | 4 +-
t/t0091-bugreport.sh | 2 +-
t/t0300-credentials.sh | 2 +-
t/t1060-object-corruption.sh | 2 +-
t/t1091-sparse-checkout-builtin.sh | 68 ++++-----
t/t1092-sparse-checkout-compatibility.sh | 6 +-
t/t1300-config.sh | 44 +++---
t/t1307-config-blob.sh | 2 +-
t/t1308-config-set.sh | 10 +-
t/t1309-early-config.sh | 2 +-
t/t1310-config-default.sh | 4 +-
t/t1400-update-ref.sh | 22 +--
t/t1404-update-ref-errors.sh | 4 +-
t/t1410-reflog.sh | 6 +-
t/t1416-ref-transaction-hooks.sh | 2 +-
t/t1430-bad-ref-name.sh | 22 +--
t/t1450-fsck.sh | 80 +++++------
t/t1506-rev-parse-diagnosis.sh | 34 ++---
t/t1512-rev-parse-disambiguation.sh | 6 +-
t/t2004-checkout-cache-temp.sh | 2 +-
t/t2006-checkout-index-basic.sh | 14 +-
t/t2010-checkout-ambiguous.sh | 4 +-
t/t2018-checkout-branch.sh | 4 +-
t/t2019-checkout-ambiguous-ref.sh | 8 +-
t/t2020-checkout-detach.sh | 8 +-
t/t2024-checkout-dwim.sh | 8 +-
t/t2025-checkout-no-overlay.sh | 2 +-
t/t2026-checkout-pathspec-file.sh | 8 +-
t/t2027-checkout-track.sh | 2 +-
t/t2030-unresolve-info.sh | 2 +-
t/t2072-restore-pathspec-file.sh | 8 +-
t/t2106-update-index-assume-unchanged.sh | 2 +-
t/t2107-update-index-basic.sh | 4 +-
t/t2203-add-intent.sh | 6 +-
t/t2204-add-ignored.sh | 8 +-
t/t2401-worktree-prune.sh | 10 +-
t/t2402-worktree-list.sh | 6 +-
t/t2403-worktree-move.sh | 2 +-
t/t2406-worktree-repair.sh | 24 ++--
t/t3004-ls-files-basic.sh | 4 +-
t/t3007-ls-files-recurse-submodules.sh | 4 +-
t/t3200-branch.sh | 18 +--
t/t3202-show-branch.sh | 2 +-
t/t3206-range-diff.sh | 22 +--
t/t3210-pack-refs.sh | 2 +-
t/t3301-notes.sh | 4 +-
t/t3310-notes-merge-manual-resolve.sh | 16 +--
t/t3320-notes-merge-worktrees.sh | 4 +-
t/t3321-notes-stripspace.sh | 2 +-
t/t3400-rebase.sh | 6 +-
t/t3402-rebase-merge.sh | 2 +-
t/t3403-rebase-skip.sh | 30 ++--
t/t3404-rebase-interactive.sh | 38 ++---
t/t3406-rebase-message.sh | 18 +--
t/t3418-rebase-continue.sh | 6 +-
t/t3431-rebase-fork-point.sh | 2 +-
t/t3501-revert-cherry-pick.sh | 6 +-
t/t3507-cherry-pick-conflict.sh | 8 +-
t/t3510-cherry-pick-sequence.sh | 6 +-
t/t3600-rm.sh | 8 +-
t/t3601-rm-pathspec-file.sh | 6 +-
t/t3700-add.sh | 6 +-
t/t3701-add-interactive.sh | 8 +-
t/t3704-add-pathspec-file.sh | 12 +-
t/t3900-i18n-commit.sh | 8 +-
t/t3901-i18n-patch.sh | 2 +-
t/t3903-stash.sh | 10 +-
t/t3905-stash-include-untracked.sh | 2 +-
t/t3909-stash-pathspec-file.sh | 6 +-
t/t4001-diff-rename.sh | 34 ++---
t/t4013-diff-various.sh | 2 +-
t/t4014-format-patch.sh | 12 +-
t/t4015-diff-whitespace.sh | 20 +--
t/t4018-diff-funcname.sh | 14 +-
t/t4031-diff-rewrite-binary.sh | 2 +-
t/t4047-diff-dirstat.sh | 22 +--
t/t4053-diff-no-index.sh | 2 +-
t/t4055-diff-context.sh | 4 +-
t/t4068-diff-symmetric-merge-base.sh | 28 ++--
t/t4115-apply-symlink.sh | 2 +-
t/t4120-apply-popt.sh | 4 +-
t/t4122-apply-symlink-inside.sh | 14 +-
t/t4129-apply-samemode.sh | 4 +-
t/t4133-apply-filenames.sh | 8 +-
t/t4150-am.sh | 4 +-
t/t4151-am-abort.sh | 2 +-
t/t4153-am-resume-override-opts.sh | 2 +-
t/t4200-rerere.sh | 4 +-
t/t4201-shortlog.sh | 2 +-
t/t4202-log.sh | 18 +--
t/t4203-mailmap.sh | 2 +-
t/t4208-log-magic-pathspec.sh | 6 +-
t/t4209-log-pickaxe.sh | 4 +-
t/t4211-line-log.sh | 4 +-
t/t4212-log-corrupt.sh | 2 +-
t/t4256-am-format-flowed.sh | 2 +-
t/t5300-pack-object.sh | 4 +-
t/t5302-pack-index.sh | 4 +-
t/t5304-prune.sh | 4 +-
t/t5310-pack-bitmaps.sh | 8 +-
t/t5318-commit-graph.sh | 18 +--
t/t5319-multi-pack-index.sh | 10 +-
t/t5324-split-commit-graph.sh | 16 +--
t/t5331-pack-objects-stdin.sh | 4 +-
t/t5411/test-0026-push-options.sh | 2 +-
t/t5411/test-0027-push-options--porcelain.sh | 2 +-
t/t5500-fetch-pack.sh | 10 +-
t/t5504-fetch-receive-strict.sh | 26 ++--
t/t5505-remote.sh | 22 +--
t/t5510-fetch.sh | 8 +-
t/t5512-ls-remote.sh | 2 +-
t/t5514-fetch-multiple.sh | 4 +-
t/t5516-fetch-push.sh | 8 +-
t/t5520-pull.sh | 34 ++---
t/t5521-pull-options.sh | 2 +-
t/t5523-push-upstream.sh | 12 +-
t/t5528-push-default.sh | 2 +-
t/t5530-upload-pack-error.sh | 4 +-
t/t5531-deep-submodule-push.sh | 2 +-
t/t5534-push-signed.sh | 6 +-
t/t5536-fetch-conflicts.sh | 8 +-
t/t5541-http-push-smart.sh | 20 +--
t/t5545-push-options.sh | 2 +-
t/t5550-http-fetch-dumb.sh | 8 +-
t/t5551-http-fetch-smart.sh | 4 +-
t/t5570-git-daemon.sh | 10 +-
t/t5572-pull-submodule.sh | 2 +-
t/t5573-pull-verify-signatures.sh | 26 ++--
t/t5574-fetch-output.sh | 4 +-
t/t5580-unc-paths.sh | 2 +-
t/t5601-clone.sh | 6 +-
t/t5604-clone-reference.sh | 2 +-
t/t5606-clone-options.sh | 10 +-
t/t5607-clone-bundle.sh | 4 +-
t/t5611-clone-config.sh | 4 +-
t/t5616-partial-clone.sh | 22 +--
t/t5701-git-serve.sh | 8 +-
t/t5702-protocol-v2.sh | 34 ++---
t/t5703-upload-pack-ref-in-want.sh | 4 +-
t/t5704-protocol-violations.sh | 4 +-
t/t5801-remote-helpers.sh | 8 +-
t/t5812-proto-disable-http.sh | 2 +-
t/t6001-rev-list-graft.sh | 4 +-
t/t6021-rev-list-exclude-hidden.sh | 4 +-
t/t6030-bisect-porcelain.sh | 24 ++--
t/t6040-tracking-info.sh | 18 +--
t/t6050-replace.sh | 14 +-
t/t6102-rev-list-unexpected-objects.sh | 16 +--
t/t6112-rev-list-filters-objects.sh | 2 +-
t/t6120-describe.sh | 2 +-
t/t6134-pathspec-in-submodule.sh | 2 +-
t/t6135-pathspec-with-attrs.sh | 8 +-
t/t6136-pathspec-in-bare.sh | 8 +-
t/t6402-merge-rename.sh | 16 +--
t/t6422-merge-rename-corner-cases.sh | 16 +--
t/t6423-merge-rename-directories.sh | 140 +++++++++----------
t/t6424-merge-unrelated-index-changes.sh | 6 +-
t/t6425-merge-rename-delete.sh | 4 +-
t/t6426-merge-skip-unneeded-updates.sh | 2 +-
t/t6430-merge-recursive.sh | 8 +-
t/t6433-merge-toplevel.sh | 4 +-
t/t6436-merge-overwrite.sh | 4 +-
t/t6437-submodule-merge.sh | 2 +-
t/t6500-gc.sh | 14 +-
t/t7001-mv.sh | 4 +-
t/t7105-reset-patch.sh | 6 +-
t/t7106-reset-unborn-branch.sh | 2 +-
t/t7107-reset-pathspec-file.sh | 10 +-
t/t7110-reset-merge.sh | 6 +-
t/t7201-co.sh | 4 +-
t/t7300-clean.sh | 2 +-
t/t7400-submodule-basic.sh | 64 ++++-----
t/t7403-submodule-sync.sh | 4 +-
t/t7406-submodule-update.sh | 6 +-
t/t7411-submodule-config.sh | 4 +-
t/t7414-submodule-mistakes.sh | 8 +-
t/t7416-submodule-dash-url.sh | 4 +-
t/t7417-submodule-path-url.sh | 4 +-
t/t7450-bad-git-dotfiles.sh | 12 +-
t/t7500-commit-template-squash-signoff.sh | 2 +-
t/t7501-commit-basic-functionality.sh | 6 +-
t/t7502-commit-porcelain.sh | 32 ++---
t/t7506-status-submodule.sh | 28 ++--
t/t7507-commit-verbose.sh | 4 +-
t/t7508-status.sh | 24 ++--
t/t7509-commit-authorship.sh | 4 +-
t/t7518-ident-corner-cases.sh | 10 +-
t/t7519-status-fsmonitor.sh | 6 +-
t/t7520-ignored-hook-warning.sh | 8 +-
t/t7525-status-rename.sh | 54 +++----
t/t7526-commit-pathspec-file.sh | 14 +-
t/t7600-merge.sh | 30 ++--
t/t7601-merge-pull-config.sh | 50 +++----
t/t7611-merge-abort.sh | 4 +-
t/t7612-merge-verify-signatures.sh | 24 ++--
t/t7703-repack-geometric.sh | 4 +-
t/t7800-difftool.sh | 4 +-
t/t7810-grep.sh | 4 +-
t/t7811-grep-open.sh | 2 +-
t/t7814-grep-recurse-submodules.sh | 2 +-
t/t7816-grep-binary-pattern.sh | 4 +-
t/t7900-maintenance.sh | 24 ++--
t/t8003-blame-corner-cases.sh | 2 +-
t/t8013-blame-ignore-revs.sh | 6 +-
t/t9001-send-email.sh | 8 +-
t/t9300-fast-import.sh | 26 ++--
t/t9800-git-p4-basic.sh | 18 +--
t/t9801-git-p4-branch.sh | 2 +-
t/t9807-git-p4-submit.sh | 12 +-
t/t9815-git-p4-submit-fail.sh | 12 +-
224 files changed, 1190 insertions(+), 1190 deletions(-)
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 2fb1b2ae56..5fe3c8ab69 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -255,7 +255,7 @@ test_http_push_nonff () {
'
test_expect_success 'non-fast-forward push shows help message' '
- test_i18ngrep "Updates were rejected because" output
+ test_grep "Updates were rejected because" output
'
test_expect_${EXPECT_CAS_RESULT} 'force with lease aka cas' '
diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
index 9acb0d5d19..36f767cb74 100644
--- a/t/lib-submodule-update.sh
+++ b/t/lib-submodule-update.sh
@@ -830,7 +830,7 @@ test_submodule_recursing_with_args_common () {
cd submodule_update &&
git branch -t invalid_sub1 origin/invalid_sub1 &&
test_must_fail $command invalid_sub1 2>err &&
- test_i18ngrep sub1 err &&
+ test_grep sub1 err &&
test_superproject_content origin/add_sub1 &&
test_submodule_content sub1 origin/add_sub1
)
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 30a6edca1d..2b78e3be47 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -168,8 +168,8 @@ test_expect_success 'reinit' '
git -c init.defaultBranch=initial init >out1 2>err1 &&
git init >out2 2>err2
) &&
- test_i18ngrep "Initialized empty" again/out1 &&
- test_i18ngrep "Reinitialized existing" again/out2 &&
+ test_grep "Initialized empty" again/out1 &&
+ test_grep "Reinitialized existing" again/out2 &&
test_must_be_empty again/err1 &&
test_must_be_empty again/err2
'
@@ -332,7 +332,7 @@ test_expect_success 'init with separate gitdir' '
test_expect_success 'explicit bare & --separate-git-dir incompatible' '
test_must_fail git init --bare --separate-git-dir goop.git bare.git 2>err &&
- test_i18ngrep "cannot be used together" err
+ test_grep "cannot be used together" err
'
test_expect_success 'implicit bare & --separate-git-dir incompatible' '
@@ -340,7 +340,7 @@ test_expect_success 'implicit bare & --separate-git-dir incompatible' '
mkdir -p bare.git &&
test_must_fail env GIT_DIR=. \
git -C bare.git init --separate-git-dir goop.git 2>err &&
- test_i18ngrep "incompatible" err
+ test_grep "incompatible" err
'
test_expect_success 'bare & --separate-git-dir incompatible within worktree' '
@@ -349,7 +349,7 @@ test_expect_success 'bare & --separate-git-dir incompatible within worktree' '
git clone --bare . bare.git &&
git -C bare.git worktree add --detach ../linkwt &&
test_must_fail git -C linkwt init --separate-git-dir seprepo 2>err &&
- test_i18ngrep "incompatible" err
+ test_grep "incompatible" err
'
test_lazy_prereq GETCWD_IGNORES_PERMS '
@@ -563,7 +563,7 @@ test_expect_success '--initial-branch' '
: re-initializing should not change the branch name &&
git init --initial-branch=ignore initial-branch-option 2>err &&
- test_i18ngrep "ignored --initial-branch" err &&
+ test_grep "ignored --initial-branch" err &&
git -C initial-branch-option symbolic-ref HEAD >actual &&
grep hello actual
'
@@ -579,7 +579,7 @@ test_expect_success 'advice on unconfigured init.defaultBranch' '
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= git -c color.advice=always \
init unconfigured-default-branch-name 2>err &&
test_decode_color <err >decoded &&
- test_i18ngrep "<YELLOW>hint: " decoded
+ test_grep "<YELLOW>hint: " decoded
'
test_expect_success 'overridden default main branch name (env)' '
@@ -592,7 +592,7 @@ test_expect_success 'overridden default main branch name (env)' '
test_expect_success 'invalid default branch name' '
test_must_fail env GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME="with space" \
git init initial-branch-invalid 2>err &&
- test_i18ngrep "invalid branch name" err
+ test_grep "invalid branch name" err
'
test_expect_success 'branch -m with the initial branch' '
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index e013d38f48..736516cc6a 100755
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -22,13 +22,13 @@ test_expect_success 'initial setup' '
test_expect_success 'bad setup: invalid .git file format' '
echo "gitdir $REAL" >.git &&
test_must_fail git rev-parse 2>.err &&
- test_i18ngrep "invalid gitfile format" .err
+ test_grep "invalid gitfile format" .err
'
test_expect_success 'bad setup: invalid .git file path' '
echo "gitdir: $REAL.not" >.git &&
test_must_fail git rev-parse 2>.err &&
- test_i18ngrep "not a git repository" .err
+ test_grep "not a git repository" .err
'
test_expect_success 'final setup + check rev-parse --git-dir' '
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 26e082f05b..42695e143d 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -259,7 +259,7 @@ test_expect_success 'root subdir attribute test' '
test_expect_success 'negative patterns' '
echo "!f test=bar" >.gitattributes &&
git check-attr test -- '"'"'!f'"'"' 2>errors &&
- test_i18ngrep "Negative patterns are ignored" errors
+ test_grep "Negative patterns are ignored" errors
'
test_expect_success 'patterns starting with exclamation' '
@@ -424,7 +424,7 @@ test_expect_success SYMLINKS 'symlinks not respected in-tree' '
mkdir subdir &&
ln -s ../attr subdir/.gitattributes &&
attr_check_basic subdir/file unspecified &&
- test_i18ngrep "unable to access.*gitattributes" err
+ test_grep "unable to access.*gitattributes" err
'
test_expect_success 'large attributes line ignored in tree' '
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index c70d11bc91..361446b2f4 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -49,7 +49,7 @@ broken_c_unquote_verbose () {
stderr_contains () {
regexp="$1"
- if test_i18ngrep "$regexp" "$HOME/stderr"
+ if test_grep "$regexp" "$HOME/stderr"
then
return 0
else
@@ -942,7 +942,7 @@ test_expect_success SYMLINKS 'symlinks not respected in-tree' '
ln -s ignore subdir/.gitignore &&
test_must_fail git check-ignore subdir/file >actual 2>err &&
test_must_be_empty actual &&
- test_i18ngrep "unable to access.*gitignore" err
+ test_grep "unable to access.*gitignore" err
'
test_done
diff --git a/t/t0012-help.sh b/t/t0012-help.sh
index dbfc5c8267..1d273d91c2 100755
--- a/t/t0012-help.sh
+++ b/t/t0012-help.sh
@@ -100,17 +100,17 @@ test_expect_success "--help does not work for guides" "
test_expect_success 'git help' '
git help >help.output &&
- test_i18ngrep "^ clone " help.output &&
- test_i18ngrep "^ add " help.output &&
- test_i18ngrep "^ log " help.output &&
- test_i18ngrep "^ commit " help.output &&
- test_i18ngrep "^ fetch " help.output
+ test_grep "^ clone " help.output &&
+ test_grep "^ add " help.output &&
+ test_grep "^ log " help.output &&
+ test_grep "^ commit " help.output &&
+ test_grep "^ fetch " help.output
'
test_expect_success 'git help -g' '
git help -g >help.output &&
- test_i18ngrep "^ everyday " help.output &&
- test_i18ngrep "^ tutorial " help.output
+ test_grep "^ everyday " help.output &&
+ test_grep "^ tutorial " help.output
'
test_expect_success 'git help fails for non-existing html pages' '
@@ -257,7 +257,7 @@ do
export GIT_CEILING_DIRECTORIES &&
test_expect_code 129 git -C sub $builtin -h >output 2>&1
) &&
- test_i18ngrep usage output
+ test_grep usage output
'
done <builtins
diff --git a/t/t0013-sha1dc.sh b/t/t0013-sha1dc.sh
index 5324047689..08814173cb 100755
--- a/t/t0013-sha1dc.sh
+++ b/t/t0013-sha1dc.sh
@@ -16,7 +16,7 @@ fi
test_expect_success 'test-sha1 detects shattered pdf' '
test_must_fail test-tool sha1 <"$TEST_DATA/shattered-1.pdf" 2>err &&
- test_i18ngrep collision err &&
+ test_grep collision err &&
grep 38762cf7f55934b34d179ae6a4c80cadccbb7f0a err
'
diff --git a/t/t0014-alias.sh b/t/t0014-alias.sh
index 8d3d9144c0..95568342be 100755
--- a/t/t0014-alias.sh
+++ b/t/t0014-alias.sh
@@ -8,7 +8,7 @@ test_expect_success 'nested aliases - internal execution' '
git config alias.nested-internal-1 nested-internal-2 &&
git config alias.nested-internal-2 status &&
git nested-internal-1 >output &&
- test_i18ngrep "^On branch " output
+ test_grep "^On branch " output
'
test_expect_success 'nested aliases - mixed execution' '
@@ -16,7 +16,7 @@ test_expect_success 'nested aliases - mixed execution' '
git config alias.nested-external-2 "!git nested-external-3" &&
git config alias.nested-external-3 status &&
git nested-external-1 >output &&
- test_i18ngrep "^On branch " output
+ test_grep "^On branch " output
'
test_expect_success 'looping aliases - internal execution' '
@@ -24,7 +24,7 @@ test_expect_success 'looping aliases - internal execution' '
git config alias.loop-internal-2 loop-internal-3 &&
git config alias.loop-internal-3 loop-internal-2 &&
test_must_fail git loop-internal-1 2>output &&
- test_i18ngrep "^fatal: alias loop detected: expansion of" output
+ test_grep "^fatal: alias loop detected: expansion of" output
'
# This test is disabled until external loops are fixed, because would block
@@ -34,7 +34,7 @@ test_expect_success 'looping aliases - internal execution' '
# git config alias.loop-mixed-1 loop-mixed-2 &&
# git config alias.loop-mixed-2 "!git loop-mixed-1" &&
# test_must_fail git loop-mixed-1 2>output &&
-# test_i18ngrep "^fatal: alias loop detected: expansion of" output
+# test_grep "^fatal: alias loop detected: expansion of" output
#'
test_expect_success 'run-command formats empty args properly' '
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 46abbeed68..0b4997022b 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -263,7 +263,7 @@ test_expect_success 'required filter with absent clean field' '
echo test >test.ac &&
test_must_fail git add test.ac 2>stderr &&
- test_i18ngrep "fatal: test.ac: clean filter .absentclean. failed" stderr
+ test_grep "fatal: test.ac: clean filter .absentclean. failed" stderr
'
test_expect_success 'required filter with absent smudge field' '
@@ -276,7 +276,7 @@ test_expect_success 'required filter with absent smudge field' '
git add test.as &&
rm -f test.as &&
test_must_fail git checkout -- test.as 2>stderr &&
- test_i18ngrep "fatal: test.as: smudge filter absentsmudge failed" stderr
+ test_grep "fatal: test.as: smudge filter absentsmudge failed" stderr
'
test_expect_success 'filtering large input to small output should use little memory' '
@@ -733,7 +733,7 @@ test_expect_success 'process filter should restart after unexpected write failur
git checkout --quiet --no-progress . 2>git-stderr.log &&
grep "smudge write error" git-stderr.log &&
- test_i18ngrep "error: external filter" git-stderr.log &&
+ test_grep "error: external filter" git-stderr.log &&
cat >expected.log <<-EOF &&
START
diff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh
index c196fdb0ee..1b55f59c23 100755
--- a/t/t0028-working-tree-encoding.sh
+++ b/t/t0028-working-tree-encoding.sh
@@ -92,23 +92,23 @@ do
# In these cases the BOM is prohibited.
cp bebom.utf${i}be.raw bebom.utf${i}be &&
test_must_fail git add bebom.utf${i}be 2>err.out &&
- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out &&
+ test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
+ test_grep "use UTF-${i} as working-tree-encoding" err.out &&
cp lebom.utf${i}le.raw lebom.utf${i}be &&
test_must_fail git add lebom.utf${i}be 2>err.out &&
- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out &&
+ test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
+ test_grep "use UTF-${i} as working-tree-encoding" err.out &&
cp bebom.utf${i}be.raw bebom.utf${i}le &&
test_must_fail git add bebom.utf${i}le 2>err.out &&
- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out &&
+ test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
+ test_grep "use UTF-${i} as working-tree-encoding" err.out &&
cp lebom.utf${i}le.raw lebom.utf${i}le &&
test_must_fail git add lebom.utf${i}le 2>err.out &&
- test_i18ngrep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
- test_i18ngrep "use UTF-${i} as working-tree-encoding" err.out
+ test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
+ test_grep "use UTF-${i} as working-tree-encoding" err.out
'
test_expect_success "check required UTF-${i} BOM" '
@@ -118,13 +118,13 @@ do
cp nobom.utf${i}be.raw nobom.utf${i} &&
test_must_fail git add nobom.utf${i} 2>err.out &&
- test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out &&
- test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out &&
+ test_grep "fatal: BOM is required .* utf-${i}" err.out &&
+ test_grep "use UTF-${i}BE or UTF-${i}LE" err.out &&
cp nobom.utf${i}le.raw nobom.utf${i} &&
test_must_fail git add nobom.utf${i} 2>err.out &&
- test_i18ngrep "fatal: BOM is required .* utf-${i}" err.out &&
- test_i18ngrep "use UTF-${i}BE or UTF-${i}LE" err.out
+ test_grep "fatal: BOM is required .* utf-${i}" err.out &&
+ test_grep "use UTF-${i}BE or UTF-${i}LE" err.out
'
test_expect_success "eol conversion for UTF-${i} encoded files on checkout" '
@@ -169,7 +169,7 @@ test_expect_success 'check unsupported encodings' '
echo "*.set text working-tree-encoding" >.gitattributes &&
printf "set" >t.set &&
test_must_fail git add t.set 2>err.out &&
- test_i18ngrep "true/false are no valid working-tree-encodings" err.out &&
+ test_grep "true/false are no valid working-tree-encodings" err.out &&
echo "*.unset text -working-tree-encoding" >.gitattributes &&
printf "unset" >t.unset &&
@@ -182,7 +182,7 @@ test_expect_success 'check unsupported encodings' '
echo "*.garbage text working-tree-encoding=garbage" >.gitattributes &&
printf "garbage" >t.garbage &&
test_must_fail git add t.garbage 2>err.out &&
- test_i18ngrep "failed to encode" err.out
+ test_grep "failed to encode" err.out
'
test_expect_success 'error if encoding round trip is not the same during refresh' '
@@ -201,7 +201,7 @@ test_expect_success 'error if encoding round trip is not the same during refresh
git update-ref refs/heads/main $COMMIT &&
test_must_fail git checkout HEAD^ 2>err.out &&
- test_i18ngrep "error: .* overwritten by checkout:" err.out
+ test_grep "error: .* overwritten by checkout:" err.out
'
test_expect_success 'error if encoding garbage is already in Git' '
@@ -217,7 +217,7 @@ test_expect_success 'error if encoding garbage is already in Git' '
git update-ref refs/heads/main $COMMIT &&
git diff 2>err.out &&
- test_i18ngrep "error: BOM is required" err.out
+ test_grep "error: BOM is required" err.out
'
test_lazy_prereq ICONV_SHIFT_JIS '
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index e19a199636..c8cc0fd8d0 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -366,13 +366,13 @@ test_expect_success 'OPT_CMDMODE() works' '
test_expect_success 'OPT_CMDMODE() detects incompatibility' '
test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err &&
test_must_be_empty output &&
- test_i18ngrep "incompatible with --mode" output.err
+ test_grep "incompatible with --mode" output.err
'
test_expect_success 'OPT_CMDMODE() detects incompatibility with something else' '
test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err &&
test_must_be_empty output &&
- test_i18ngrep "incompatible with something else" output.err
+ test_grep "incompatible with something else" output.err
'
test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '
diff --git a/t/t0041-usage.sh b/t/t0041-usage.sh
index 9ea974b0c6..1464294bd1 100755
--- a/t/t0041-usage.sh
+++ b/t/t0041-usage.sh
@@ -21,8 +21,8 @@ test_expect_success 'tag --contains <existent_tag>' '
test_expect_success 'tag --contains <inexistent_tag>' '
test_must_fail git tag --contains "notag" >actual 2>actual.err &&
test_line_count = 0 actual &&
- test_i18ngrep "error" actual.err &&
- test_i18ngrep ! "usage" actual.err
+ test_grep "error" actual.err &&
+ test_grep ! "usage" actual.err
'
test_expect_success 'tag --no-contains <existent_tag>' '
@@ -34,27 +34,27 @@ test_expect_success 'tag --no-contains <existent_tag>' '
test_expect_success 'tag --no-contains <inexistent_tag>' '
test_must_fail git tag --no-contains "notag" >actual 2>actual.err &&
test_line_count = 0 actual &&
- test_i18ngrep "error" actual.err &&
- test_i18ngrep ! "usage" actual.err
+ test_grep "error" actual.err &&
+ test_grep ! "usage" actual.err
'
test_expect_success 'tag usage error' '
test_must_fail git tag --noopt >actual 2>actual.err &&
test_line_count = 0 actual &&
- test_i18ngrep "usage" actual.err
+ test_grep "usage" actual.err
'
test_expect_success 'branch --contains <existent_commit>' '
git branch --contains "main" >actual 2>actual.err &&
- test_i18ngrep "main" actual &&
+ test_grep "main" actual &&
test_line_count = 0 actual.err
'
test_expect_success 'branch --contains <inexistent_commit>' '
test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
test_line_count = 0 actual &&
- test_i18ngrep "error" actual.err &&
- test_i18ngrep ! "usage" actual.err
+ test_grep "error" actual.err &&
+ test_grep ! "usage" actual.err
'
test_expect_success 'branch --no-contains <existent_commit>' '
@@ -66,14 +66,14 @@ test_expect_success 'branch --no-contains <existent_commit>' '
test_expect_success 'branch --no-contains <inexistent_commit>' '
test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
test_line_count = 0 actual &&
- test_i18ngrep "error" actual.err &&
- test_i18ngrep ! "usage" actual.err
+ test_grep "error" actual.err &&
+ test_grep ! "usage" actual.err
'
test_expect_success 'branch usage error' '
test_must_fail git branch --noopt >actual 2>actual.err &&
test_line_count = 0 actual &&
- test_i18ngrep "usage" actual.err
+ test_grep "usage" actual.err
'
test_expect_success 'for-each-ref --contains <existent_object>' '
@@ -85,8 +85,8 @@ test_expect_success 'for-each-ref --contains <existent_object>' '
test_expect_success 'for-each-ref --contains <inexistent_object>' '
test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
test_line_count = 0 actual &&
- test_i18ngrep "error" actual.err &&
- test_i18ngrep ! "usage" actual.err
+ test_grep "error" actual.err &&
+ test_grep ! "usage" actual.err
'
test_expect_success 'for-each-ref --no-contains <existent_object>' '
@@ -98,14 +98,14 @@ test_expect_success 'for-each-ref --no-contains <existent_object>' '
test_expect_success 'for-each-ref --no-contains <inexistent_object>' '
test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
test_line_count = 0 actual &&
- test_i18ngrep "error" actual.err &&
- test_i18ngrep ! "usage" actual.err
+ test_grep "error" actual.err &&
+ test_grep ! "usage" actual.err
'
test_expect_success 'for-each-ref usage error' '
test_must_fail git for-each-ref --noopt >actual 2>actual.err &&
test_line_count = 0 actual &&
- test_i18ngrep "usage" actual.err
+ test_grep "usage" actual.err
'
test_done
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index e2411f6a9b..20986b693c 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -19,12 +19,12 @@ test_expect_success MINGW 'subprocess inherits only std handles' '
test_expect_success 'start_command reports ENOENT (slash)' '
test-tool run-command start-command-ENOENT ./does-not-exist 2>err &&
- test_i18ngrep "\./does-not-exist" err
+ test_grep "\./does-not-exist" err
'
test_expect_success 'start_command reports ENOENT (no slash)' '
test-tool run-command start-command-ENOENT does-not-exist 2>err &&
- test_i18ngrep "does-not-exist" err
+ test_grep "does-not-exist" err
'
test_expect_success 'run_command can run a command' '
@@ -49,7 +49,7 @@ test_expect_success !RUNS_COMMANDS_FROM_PWD 'run_command is restricted to PATH'
echo yikes
EOF
test_must_fail test-tool run-command run-command should-not-run 2>err &&
- test_i18ngrep "should-not-run" err
+ test_grep "should-not-run" err
'
test_expect_success !MINGW 'run_command can run a script without a #! line' '
diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh
index 574de34198..487bc8d905 100755
--- a/t/t0070-fundamental.sh
+++ b/t/t0070-fundamental.sh
@@ -44,13 +44,13 @@ test_expect_success 'incomplete sideband messages are reassembled' '
test_expect_success 'eof on sideband message is reported' '
printf 1234 >input &&
test-tool pkt-line receive-sideband <input 2>err &&
- test_i18ngrep "unexpected disconnect" err
+ test_grep "unexpected disconnect" err
'
test_expect_success 'missing sideband designator is reported' '
printf 0004 >input &&
test-tool pkt-line receive-sideband <input 2>err &&
- test_i18ngrep "missing sideband" err
+ test_grep "missing sideband" err
'
test_done
diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh
index f6998269be..150cc1dea2 100755
--- a/t/t0091-bugreport.sh
+++ b/t/t0091-bugreport.sh
@@ -65,7 +65,7 @@ test_expect_success '--output-directory puts the report in the provided dir' '
test_expect_success 'incorrect arguments abort with usage' '
test_must_fail git bugreport --false 2>output &&
- test_i18ngrep usage output &&
+ test_grep usage output &&
test_path_is_missing git-bugreport-*
'
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
index a4f5bba507..400f6bdbca 100755
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@ -827,7 +827,7 @@ test_expect_success 'credential config with partial URLs' '
git -c credential.$partial.helper=yep \
-c credential.with%0anewline.username=uh-oh \
credential fill <stdin 2>stderr &&
- test_i18ngrep "skipping credential lookup for key" stderr
+ test_grep "skipping credential lookup for key" stderr
'
test_done
diff --git a/t/t1060-object-corruption.sh b/t/t1060-object-corruption.sh
index 35261afc9d..5e0f0a334f 100755
--- a/t/t1060-object-corruption.sh
+++ b/t/t1060-object-corruption.sh
@@ -125,7 +125,7 @@ test_expect_success 'fetch into corrupted repo with index-pack' '
cd bit-error-cp &&
test_must_fail git -c transfer.unpackLimit=1 \
fetch ../no-bit-error 2>stderr &&
- test_i18ngrep ! -i collision stderr
+ test_grep ! -i collision stderr
)
'
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
index 9ceb17f911..f67611da28 100755
--- a/t/t1091-sparse-checkout-builtin.sh
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -47,7 +47,7 @@ test_expect_success 'setup' '
test_expect_success 'git sparse-checkout list (not sparse)' '
test_must_fail git -C repo sparse-checkout list >list 2>err &&
test_must_be_empty list &&
- test_i18ngrep "this worktree is not sparse" err
+ test_grep "this worktree is not sparse" err
'
test_expect_success 'git sparse-checkout list (not sparse)' '
@@ -55,7 +55,7 @@ test_expect_success 'git sparse-checkout list (not sparse)' '
rm repo/.git/info/sparse-checkout &&
git -C repo sparse-checkout list >list 2>err &&
test_must_be_empty list &&
- test_i18ngrep "this worktree is not sparse (sparse-checkout file may not exist)" err
+ test_grep "this worktree is not sparse (sparse-checkout file may not exist)" err
'
test_expect_success 'git sparse-checkout list (populated)' '
@@ -230,7 +230,7 @@ test_expect_success 'cone mode: match patterns' '
git -C repo config --worktree core.sparseCheckoutCone true &&
rm -rf repo/a repo/folder1 repo/folder2 &&
git -C repo read-tree -mu HEAD 2>err &&
- test_i18ngrep ! "disabling cone patterns" err &&
+ test_grep ! "disabling cone patterns" err &&
git -C repo reset --hard &&
check_files repo a folder1 folder2
'
@@ -240,7 +240,7 @@ test_expect_success 'cone mode: warn on bad pattern' '
cp repo/.git/info/sparse-checkout . &&
echo "!/deep/deeper/*/" >>repo/.git/info/sparse-checkout &&
git -C repo read-tree -mu HEAD 2>err &&
- test_i18ngrep "unrecognized negative pattern" err
+ test_grep "unrecognized negative pattern" err
'
test_expect_success 'sparse-checkout disable' '
@@ -283,7 +283,7 @@ test_expect_success 'sparse-index enabled and disabled' '
test_expect_success 'cone mode: init and set' '
git -C repo sparse-checkout init --cone &&
git -C repo config --list >config &&
- test_i18ngrep "core.sparsecheckoutcone=true" config &&
+ test_grep "core.sparsecheckoutcone=true" config &&
list_files repo >dir &&
echo a >expect &&
test_cmp expect dir &&
@@ -386,7 +386,7 @@ test_expect_success 'not-up-to-date does not block rest of sparsification' '
git -C repo sparse-checkout set deep/deeper1 2>err &&
- test_i18ngrep "The following paths are not up to date" err &&
+ test_grep "The following paths are not up to date" err &&
test_cmp expect repo/.git/info/sparse-checkout &&
check_files repo/deep a deeper1 deeper2 &&
check_files repo/deep/deeper1 a deepest &&
@@ -401,8 +401,8 @@ test_expect_success 'revert to old sparse-checkout on empty update' '
git add file &&
git commit -m "test" &&
git sparse-checkout set nothing 2>err &&
- test_i18ngrep ! "Sparse checkout leaves no entry on working directory" err &&
- test_i18ngrep ! ".git/index.lock" err &&
+ test_grep ! "Sparse checkout leaves no entry on working directory" err &&
+ test_grep ! ".git/index.lock" err &&
git sparse-checkout set --no-cone file
)
'
@@ -411,14 +411,14 @@ test_expect_success 'fail when lock is taken' '
test_when_finished rm -rf repo/.git/info/sparse-checkout.lock &&
touch repo/.git/info/sparse-checkout.lock &&
test_must_fail git -C repo sparse-checkout set deep 2>err &&
- test_i18ngrep "Unable to create .*\.lock" err
+ test_grep "Unable to create .*\.lock" err
'
test_expect_success '.gitignore should not warn about cone mode' '
git -C repo config --worktree core.sparseCheckoutCone true &&
echo "**/bin/*" >repo/.gitignore &&
git -C repo reset --hard 2>err &&
- test_i18ngrep ! "disabling cone patterns" err
+ test_grep ! "disabling cone patterns" err
'
test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status' '
@@ -426,10 +426,10 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status'
echo dirty >dirty/folder1/a &&
git -C dirty sparse-checkout init --no-cone 2>err &&
- test_i18ngrep "warning.*The following paths are not up to date" err &&
+ test_grep "warning.*The following paths are not up to date" err &&
git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
- test_i18ngrep "warning.*The following paths are not up to date" err &&
+ test_grep "warning.*The following paths are not up to date" err &&
test_path_is_file dirty/folder1/a &&
git -C dirty sparse-checkout disable 2>err &&
@@ -453,14 +453,14 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with unmerged stat
git -C unmerged update-index --index-info <input &&
git -C unmerged sparse-checkout init --no-cone 2>err &&
- test_i18ngrep "warning.*The following paths are unmerged" err &&
+ test_grep "warning.*The following paths are unmerged" err &&
git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
- test_i18ngrep "warning.*The following paths are unmerged" err &&
+ test_grep "warning.*The following paths are unmerged" err &&
test_path_is_file dirty/folder1/a &&
git -C unmerged sparse-checkout disable 2>err &&
- test_i18ngrep "warning.*The following paths are unmerged" err &&
+ test_grep "warning.*The following paths are unmerged" err &&
git -C unmerged reset --hard &&
git -C unmerged sparse-checkout init --no-cone &&
@@ -480,24 +480,24 @@ test_expect_failure 'sparse-checkout reapply' '
git -C tweak update-index --index-info <input &&
git -C tweak sparse-checkout init --cone 2>err &&
- test_i18ngrep "warning.*The following paths are not up to date" err &&
- test_i18ngrep "warning.*The following paths are unmerged" err &&
+ test_grep "warning.*The following paths are not up to date" err &&
+ test_grep "warning.*The following paths are unmerged" err &&
git -C tweak sparse-checkout set folder2 deep/deeper1 2>err &&
- test_i18ngrep "warning.*The following paths are not up to date" err &&
- test_i18ngrep "warning.*The following paths are unmerged" err &&
+ test_grep "warning.*The following paths are not up to date" err &&
+ test_grep "warning.*The following paths are unmerged" err &&
git -C tweak sparse-checkout reapply 2>err &&
- test_i18ngrep "warning.*The following paths are not up to date" err &&
+ test_grep "warning.*The following paths are not up to date" err &&
test_path_is_file tweak/deep/deeper2/a &&
- test_i18ngrep "warning.*The following paths are unmerged" err &&
+ test_grep "warning.*The following paths are unmerged" err &&
test_path_is_file tweak/folder1/a &&
git -C tweak checkout HEAD deep/deeper2/a &&
git -C tweak sparse-checkout reapply 2>err &&
- test_i18ngrep ! "warning.*The following paths are not up to date" err &&
+ test_grep ! "warning.*The following paths are not up to date" err &&
test_path_is_missing tweak/deep/deeper2/a &&
- test_i18ngrep "warning.*The following paths are unmerged" err &&
+ test_grep "warning.*The following paths are unmerged" err &&
test_path_is_file tweak/folder1/a &&
# NEEDSWORK: We are asking to update a file outside of the
@@ -578,8 +578,8 @@ test_expect_success 'check-rules interaction with submodules' '
git -C super ls-tree --name-only -r HEAD >all-files &&
git -C super sparse-checkout check-rules >check-rules-matches <all-files &&
- test_i18ngrep ! "modules/" check-rules-matches &&
- test_i18ngrep "folder1/" check-rules-matches
+ test_grep ! "modules/" check-rules-matches &&
+ test_grep "folder1/" check-rules-matches
'
test_expect_success 'different sparse-checkouts with worktrees' '
@@ -616,7 +616,7 @@ check_read_tree_errors () {
then
test_must_be_empty err
else
- test_i18ngrep "$ERRORS" err
+ test_grep "$ERRORS" err
fi &&
check_files $REPO $FILES
}
@@ -898,32 +898,32 @@ test_expect_success 'setup bare repo' '
'
test_expect_success 'list fails outside work tree' '
test_must_fail git -C bare sparse-checkout list 2>err &&
- test_i18ngrep "this operation must be run in a work tree" err
+ test_grep "this operation must be run in a work tree" err
'
test_expect_success 'add fails outside work tree' '
test_must_fail git -C bare sparse-checkout add deeper 2>err &&
- test_i18ngrep "this operation must be run in a work tree" err
+ test_grep "this operation must be run in a work tree" err
'
test_expect_success 'set fails outside work tree' '
test_must_fail git -C bare sparse-checkout set deeper 2>err &&
- test_i18ngrep "this operation must be run in a work tree" err
+ test_grep "this operation must be run in a work tree" err
'
test_expect_success 'init fails outside work tree' '
test_must_fail git -C bare sparse-checkout init 2>err &&
- test_i18ngrep "this operation must be run in a work tree" err
+ test_grep "this operation must be run in a work tree" err
'
test_expect_success 'reapply fails outside work tree' '
test_must_fail git -C bare sparse-checkout reapply 2>err &&
- test_i18ngrep "this operation must be run in a work tree" err
+ test_grep "this operation must be run in a work tree" err
'
test_expect_success 'disable fails outside work tree' '
test_must_fail git -C bare sparse-checkout disable 2>err &&
- test_i18ngrep "this operation must be run in a work tree" err
+ test_grep "this operation must be run in a work tree" err
'
test_expect_success 'setup clean' '
@@ -946,8 +946,8 @@ test_expect_success 'check-rules cone mode' '
git -C repo sparse-checkout check-rules >check-rules-default <all-files &&
- test_i18ngrep "deep/deeper1/deepest/a" check-rules-file &&
- test_i18ngrep ! "deep/deeper2" check-rules-file &&
+ test_grep "deep/deeper1/deepest/a" check-rules-file &&
+ test_grep ! "deep/deeper2" check-rules-file &&
test_cmp check-rules-file ls-files &&
test_cmp check-rules-file check-rules-default
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index 8a95adf4b5..12e971b1d1 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -337,8 +337,8 @@ test_expect_success 'status reports sparse-checkout' '
init_repos &&
git -C sparse-checkout status >full &&
git -C sparse-index status >sparse &&
- test_i18ngrep "You are in a sparse checkout with " full &&
- test_i18ngrep "You are in a sparse checkout." sparse
+ test_grep "You are in a sparse checkout with " full &&
+ test_grep "You are in a sparse checkout." sparse
'
test_expect_success 'add, commit, checkout' '
@@ -1182,7 +1182,7 @@ test_expect_success 'checkout-index outside sparse definition' '
# Without --ignore-skip-worktree-bits, outside-of-cone files will trigger
# an error
test_sparse_match test_must_fail git checkout-index -- folder1/a &&
- test_i18ngrep "folder1/a has skip-worktree enabled" sparse-checkout-err &&
+ test_grep "folder1/a has skip-worktree enabled" sparse-checkout-err &&
test_path_is_missing folder1/a &&
# With --ignore-skip-worktree-bits, outside-of-cone files are checked out
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 387d336c91..f4e2752134 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -453,7 +453,7 @@ test_expect_success 'get bool variable with empty value' '
test_expect_success 'no arguments, but no crash' '
test_must_fail git config >output 2>&1 &&
- test_i18ngrep usage output
+ test_grep usage output
'
cat > .git/config << EOF
@@ -720,25 +720,25 @@ test_expect_success 'invalid unit' '
git config aninvalid.unit "1auto" &&
test_cmp_config 1auto aninvalid.unit &&
test_must_fail git config --int --get aninvalid.unit 2>actual &&
- test_i18ngrep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual
+ test_grep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual
'
test_expect_success 'invalid unit boolean' '
git config commit.gpgsign "1true" &&
test_cmp_config 1true commit.gpgsign &&
test_must_fail git config --bool --get commit.gpgsign 2>actual &&
- test_i18ngrep "bad boolean config value .1true. for .commit.gpgsign." actual
+ test_grep "bad boolean config value .1true. for .commit.gpgsign." actual
'
test_expect_success 'line number is reported correctly' '
printf "[bool]\n\tvar\n" >invalid &&
test_must_fail git config -f invalid --path bool.var 2>actual &&
- test_i18ngrep "line 2" actual
+ test_grep "line 2" actual
'
test_expect_success 'invalid stdin config' '
echo "[broken" | test_must_fail git config --list --file - >output 2>&1 &&
- test_i18ngrep "bad config line 1 in standard input" output
+ test_grep "bad config line 1 in standard input" output
'
cat > expect << EOF
@@ -919,7 +919,7 @@ test_expect_success !MINGW 'get --path copes with unset $HOME' '
git config --get --path path.normal >>result &&
git config --get --path path.trailingtilde >>result
) &&
- test_i18ngrep "[Ff]ailed to expand.*~/" msg &&
+ test_grep "[Ff]ailed to expand.*~/" msg &&
test_cmp expect result
'
@@ -986,7 +986,7 @@ test_expect_success 'get --type=color barfs on non-color' '
test_expect_success 'set --type=color barfs on non-color' '
test_must_fail git config --type=color foo.color "not-a-color" 2>error &&
- test_i18ngrep "cannot parse color" error
+ test_grep "cannot parse color" error
'
cat > expect << EOF
@@ -1447,12 +1447,12 @@ test_expect_success 'git --config-env with missing value' '
test_expect_success 'git --config-env fails with invalid parameters' '
test_must_fail git --config-env=foo.flag config --bool foo.flag 2>error &&
- test_i18ngrep "invalid config format: foo.flag" error &&
+ test_grep "invalid config format: foo.flag" error &&
test_must_fail git --config-env=foo.flag= config --bool foo.flag 2>error &&
- test_i18ngrep "missing environment variable name for configuration ${SQ}foo.flag${SQ}" error &&
+ test_grep "missing environment variable name for configuration ${SQ}foo.flag${SQ}" error &&
sane_unset NONEXISTENT &&
test_must_fail git --config-env=foo.flag=NONEXISTENT config --bool foo.flag 2>error &&
- test_i18ngrep "missing environment variable ${SQ}NONEXISTENT${SQ} for configuration ${SQ}foo.flag${SQ}" error
+ test_grep "missing environment variable ${SQ}NONEXISTENT${SQ} for configuration ${SQ}foo.flag${SQ}" error
'
test_expect_success 'git -c and --config-env work together' '
@@ -1533,21 +1533,21 @@ test_expect_success 'git config ignores pairs with empty count' '
test_expect_success 'git config fails with invalid count' '
test_must_fail env GIT_CONFIG_COUNT=10a git config --list 2>error &&
- test_i18ngrep "bogus count" error &&
+ test_grep "bogus count" error &&
test_must_fail env GIT_CONFIG_COUNT=9999999999999999 git config --list 2>error &&
- test_i18ngrep "too many entries" error
+ test_grep "too many entries" error
'
test_expect_success 'git config fails with missing config key' '
test_must_fail env GIT_CONFIG_COUNT=1 GIT_CONFIG_VALUE_0="value" \
git config --list 2>error &&
- test_i18ngrep "missing config key" error
+ test_grep "missing config key" error
'
test_expect_success 'git config fails with missing config value' '
test_must_fail env GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0="pair.one" \
git config --list 2>error &&
- test_i18ngrep "missing config value" error
+ test_grep "missing config value" error
'
test_expect_success 'git config fails with invalid config pair key' '
@@ -1617,7 +1617,7 @@ test_expect_success 'barf on syntax error' '
key garbage
EOF
test_must_fail git config --get section.key 2>error &&
- test_i18ngrep " line 3 " error
+ test_grep " line 3 " error
'
test_expect_success 'barf on incomplete section header' '
@@ -1627,7 +1627,7 @@ test_expect_success 'barf on incomplete section header' '
key = value
EOF
test_must_fail git config --get section.key 2>error &&
- test_i18ngrep " line 2 " error
+ test_grep " line 2 " error
'
test_expect_success 'barf on incomplete string' '
@@ -1637,7 +1637,7 @@ test_expect_success 'barf on incomplete string' '
key = "value string
EOF
test_must_fail git config --get section.key 2>error &&
- test_i18ngrep " line 3 " error
+ test_grep " line 3 " error
'
test_expect_success 'urlmatch' '
@@ -2266,17 +2266,17 @@ test_expect_success 'identical mixed --type specifiers are allowed' '
test_expect_success 'non-identical modern --type specifiers are not allowed' '
test_must_fail git config --type=int --type=bool section.big 2>error &&
- test_i18ngrep "only one type at a time" error
+ test_grep "only one type at a time" error
'
test_expect_success 'non-identical legacy --type specifiers are not allowed' '
test_must_fail git config --int --bool section.big 2>error &&
- test_i18ngrep "only one type at a time" error
+ test_grep "only one type at a time" error
'
test_expect_success 'non-identical mixed --type specifiers are not allowed' '
test_must_fail git config --type=int --bool section.big 2>error &&
- test_i18ngrep "only one type at a time" error
+ test_grep "only one type at a time" error
'
test_expect_success '--type allows valid type specifiers' '
@@ -2293,7 +2293,7 @@ test_expect_success 'unset type specifiers may be reset to conflicting ones' '
test_expect_success '--type rejects unknown specifiers' '
test_must_fail git config --type=nonsense section.foo 2>error &&
- test_i18ngrep "unrecognized --type argument" error
+ test_grep "unrecognized --type argument" error
'
test_expect_success '--type=int requires at least one digit' '
@@ -2339,7 +2339,7 @@ test_expect_success 'set all config with value-pattern' '
# multiple matches => failure
test_must_fail git config --file=config abc.key three o+ 2>err &&
- test_i18ngrep "has multiple values" err &&
+ test_grep "has multiple values" err &&
# multiple values, no match => add
git config --file=config abc.key three a+ &&
diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh
index 0a7099d6f5..b9852fe40e 100755
--- a/t/t1307-config-blob.sh
+++ b/t/t1307-config-blob.sh
@@ -63,7 +63,7 @@ test_expect_success 'parse errors in blobs are properly attributed' '
git commit -m broken &&
test_must_fail git config --blob=HEAD:config some.value 2>err &&
- test_i18ngrep "HEAD:config" err
+ test_grep "HEAD:config" err
'
test_expect_success 'can parse blob ending with CR' '
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 777648722c..3bfec07f1a 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -172,7 +172,7 @@ test_expect_success 'find string value for a key' '
test_expect_success 'check line error when NULL string is queried' '
test_expect_code 128 test-tool config get_string case.foo 2>result &&
- test_i18ngrep "fatal: .*case\.foo.*\.git/config.*line 7" result
+ test_grep "fatal: .*case\.foo.*\.git/config.*line 7" result
'
test_expect_success 'find integer if value is non parse-able' '
@@ -342,14 +342,14 @@ test_expect_success 'check line errors for malformed values' '
br
EOF
test_expect_code 128 git br 2>result &&
- test_i18ngrep "missing value for .alias\.br" result &&
- test_i18ngrep "fatal: .*\.git/config" result &&
- test_i18ngrep "fatal: .*line 2" result
+ test_grep "missing value for .alias\.br" result &&
+ test_grep "fatal: .*\.git/config" result &&
+ test_grep "fatal: .*line 2" result
'
test_expect_success 'error on modifying repo config without repo' '
nongit test_must_fail git config a.b c 2>err &&
- test_i18ngrep "not in a git directory" err
+ test_grep "not in a git directory" err
'
cmdline_config="'foo.bar=from-cmdline'"
diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index 537435b90a..523aa99a1e 100755
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -78,7 +78,7 @@ test_with_config () {
test_expect_success 'ignore .git/ with incompatible repository version' '
test_with_config "[core]repositoryformatversion = 999999" 2>err &&
- test_i18ngrep "warning:.* Expected git repo version <= [1-9]" err
+ test_grep "warning:.* Expected git repo version <= [1-9]" err
'
test_expect_failure 'ignore .git/ with invalid repository version' '
diff --git a/t/t1310-config-default.sh b/t/t1310-config-default.sh
index 09b10c144b..1a90d31201 100755
--- a/t/t1310-config-default.sh
+++ b/t/t1310-config-default.sh
@@ -26,12 +26,12 @@ test_expect_success 'canonicalizes --default with appropriate type' '
test_expect_success 'dies when --default cannot be parsed' '
test_must_fail git config -f config --type=expiry-date --default=x --get \
not.a.section 2>error &&
- test_i18ngrep "failed to format default config value" error
+ test_grep "failed to format default config value" error
'
test_expect_success 'does not allow --default without --get' '
test_must_fail git config --default=quux --unset a.section >output 2>&1 &&
- test_i18ngrep "\-\-default is only applicable to" output
+ test_grep "\-\-default is only applicable to" output
'
test_done
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 4d66cd7f4a..9ac4b7036b 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -410,7 +410,7 @@ test_expect_success 'Query "main@{2005-05-26 23:33:01}" (middle of history with
git rev-parse --verify "main@{2005-05-26 23:33:01}" >o 2>e &&
echo "$B" >expect &&
test_cmp expect o &&
- test_i18ngrep -F "warning: log for ref $m has gap after $gd" e
+ test_grep -F "warning: log for ref $m has gap after $gd" e
'
test_expect_success 'Query "main@{2005-05-26 23:38:00}" (middle of history)' '
test_when_finished "rm -f o e" &&
@@ -431,7 +431,7 @@ test_expect_success 'Query "main@{2005-05-28}" (past end of history)' '
git rev-parse --verify "main@{2005-05-28}" >o 2>e &&
echo "$D" >expect &&
test_cmp expect o &&
- test_i18ngrep -F "warning: log for ref $m unexpectedly ended on $ld" e
+ test_grep -F "warning: log for ref $m unexpectedly ended on $ld" e
'
rm -f .git/$m .git/logs/$m expect
@@ -486,7 +486,7 @@ test_expect_success 'git cat-file blob main@{2005-05-26 23:42}:F (expect OTHER)'
test_expect_success 'given old value for missing pseudoref, do not create' '
test_must_fail git update-ref PSEUDOREF $A $B 2>err &&
test_must_fail git rev-parse PSEUDOREF &&
- test_i18ngrep "unable to resolve reference" err
+ test_grep "unable to resolve reference" err
'
test_expect_success 'create pseudoref' '
@@ -507,7 +507,7 @@ test_expect_success 'overwrite pseudoref with correct old value' '
test_expect_success 'do not overwrite pseudoref with wrong old value' '
test_must_fail git update-ref PSEUDOREF $D $E 2>err &&
test $C = $(git rev-parse PSEUDOREF) &&
- test_i18ngrep "cannot lock ref.*expected" err
+ test_grep "cannot lock ref.*expected" err
'
test_expect_success 'delete pseudoref' '
@@ -519,7 +519,7 @@ test_expect_success 'do not delete pseudoref with wrong old value' '
git update-ref PSEUDOREF $A &&
test_must_fail git update-ref -d PSEUDOREF $B 2>err &&
test $A = $(git rev-parse PSEUDOREF) &&
- test_i18ngrep "cannot lock ref.*expected" err
+ test_grep "cannot lock ref.*expected" err
'
test_expect_success 'delete pseudoref with correct old value' '
@@ -536,7 +536,7 @@ test_expect_success 'do not overwrite pseudoref with old OID zero' '
test_when_finished git update-ref -d PSEUDOREF &&
test_must_fail git update-ref PSEUDOREF $B $Z 2>err &&
test $A = $(git rev-parse PSEUDOREF) &&
- test_i18ngrep "already exists" err
+ test_grep "already exists" err
'
# Test --stdin
@@ -556,7 +556,7 @@ test_expect_success 'stdin test setup' '
test_expect_success '-z fails without --stdin' '
test_must_fail git update-ref -z $m $m $m 2>err &&
- test_i18ngrep "usage: git update-ref" err
+ test_grep "usage: git update-ref" err
'
test_expect_success 'stdin works with no input' '
@@ -674,7 +674,7 @@ test_expect_success 'stdin fails with duplicate refs' '
create $a $m
EOF
test_must_fail git update-ref --stdin <stdin 2>err &&
- test_i18ngrep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed" err
+ test_grep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed" err
'
test_expect_success 'stdin create ref works' '
@@ -1107,7 +1107,7 @@ test_expect_success 'stdin -z fails option with unknown name' '
test_expect_success 'stdin -z fails with duplicate refs' '
printf $F "create $a" "$m" "create $b" "$m" "create $a" "$m" >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err &&
- test_i18ngrep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed" err
+ test_grep "fatal: multiple updates for ref '"'"'$a'"'"' not allowed" err
'
test_expect_success 'stdin -z create ref works' '
@@ -1338,7 +1338,7 @@ test_expect_success 'fails with duplicate HEAD update' '
update HEAD $B
EOF
test_must_fail git update-ref --stdin <stdin 2>err &&
- test_i18ngrep "fatal: multiple updates for '\''HEAD'\'' (including one via its referent .refs/heads/target1.) are not allowed" err &&
+ test_grep "fatal: multiple updates for '\''HEAD'\'' (including one via its referent .refs/heads/target1.) are not allowed" err &&
echo "refs/heads/target1" >expect &&
git symbolic-ref HEAD >actual &&
test_cmp expect actual &&
@@ -1355,7 +1355,7 @@ test_expect_success 'fails with duplicate ref update via symref' '
update refs/heads/symref2 $B
EOF
test_must_fail git update-ref --stdin <stdin 2>err &&
- test_i18ngrep "fatal: multiple updates for '\''refs/heads/target2'\'' (including one via symref .refs/heads/symref2.) are not allowed" err &&
+ test_grep "fatal: multiple updates for '\''refs/heads/target2'\'' (including one via symref .refs/heads/symref2.) are not allowed" err &&
echo "refs/heads/target2" >expect &&
git symbolic-ref refs/heads/symref2 >actual &&
test_cmp expect actual &&
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
index 937ae0d733..0369beea33 100755
--- a/t/t1404-update-ref-errors.sh
+++ b/t/t1404-update-ref-errors.sh
@@ -29,7 +29,7 @@ test_update_rejected () {
fi &&
printf "create $prefix/%s $C\n" $create >input &&
test_must_fail git update-ref --stdin <input 2>output.err &&
- test_i18ngrep -F "$error" output.err &&
+ test_grep -F "$error" output.err &&
git for-each-ref $prefix >actual &&
test_cmp unchanged actual
}
@@ -613,7 +613,7 @@ test_expect_success REFFILES 'delete fails cleanly if packed-refs file is locked
test_when_finished "rm -f .git/packed-refs.lock" &&
test_must_fail git update-ref -d $prefix/foo >out 2>err &&
git for-each-ref $prefix >actual &&
- test_i18ngrep "Unable to create $SQ.*packed-refs.lock$SQ: " err &&
+ test_grep "Unable to create $SQ.*packed-refs.lock$SQ: " err &&
test_cmp unchanged actual
'
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 6c45965b1e..e1fc949f9a 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -29,7 +29,7 @@ check_fsck () {
'')
test_must_be_empty fsck.output ;;
*)
- test_i18ngrep "$1" fsck.output ;;
+ test_grep "$1" fsck.output ;;
esac
}
@@ -308,9 +308,9 @@ test_expect_success 'git reflog expire unknown reference' '
test_config gc.reflogexpireunreachable never &&
test_must_fail git reflog expire main@{123} 2>stderr &&
- test_i18ngrep "points nowhere" stderr &&
+ test_grep "points nowhere" stderr &&
test_must_fail git reflog expire does-not-exist 2>stderr &&
- test_i18ngrep "points nowhere" stderr
+ test_grep "points nowhere" stderr
'
test_expect_success 'checkout should not delete log for packed ref' '
diff --git a/t/t1416-ref-transaction-hooks.sh b/t/t1416-ref-transaction-hooks.sh
index b32ca798f9..2092488090 100755
--- a/t/t1416-ref-transaction-hooks.sh
+++ b/t/t1416-ref-transaction-hooks.sh
@@ -37,7 +37,7 @@ test_expect_success 'hook aborts updating ref in prepared state' '
fi
EOF
test_must_fail git update-ref HEAD POST 2>err &&
- test_i18ngrep "ref updates aborted by hook" err
+ test_grep "ref updates aborted by hook" err
'
test_expect_success 'hook gets all queued updates in prepared state' '
diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
index ff1c967d55..4da539cf50 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -47,7 +47,7 @@ test_expect_success 'git branch shows badly named ref as warning' '
test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch >output 2>error &&
- test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
+ test_grep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
! grep -e "broken\.\.\.ref" output
'
@@ -158,7 +158,7 @@ test_expect_success 'rev-parse skips symref pointing to broken name' '
git rev-parse --verify one >expect &&
git rev-parse --verify shadow >actual 2>err &&
test_cmp expect actual &&
- test_i18ngrep "ignoring dangling symref refs/tags/shadow" err
+ test_grep "ignoring dangling symref refs/tags/shadow" err
'
test_expect_success 'for-each-ref emits warnings for broken names' '
@@ -172,9 +172,9 @@ test_expect_success 'for-each-ref emits warnings for broken names' '
! grep -e "broken\.\.\.ref" output &&
! grep -e "badname" output &&
! grep -e "broken\.\.\.symref" output &&
- test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
- test_i18ngrep ! "ignoring broken ref refs/heads/badname" error &&
- test_i18ngrep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error
+ test_grep "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
+ test_grep ! "ignoring broken ref refs/heads/badname" error &&
+ test_grep "ignoring ref with broken name refs/heads/broken\.\.\.symref" error
'
test_expect_success 'update-ref -d can delete broken name' '
@@ -192,7 +192,7 @@ test_expect_success 'branch -d can delete broken name' '
test-tool ref-store main update-ref msg "refs/heads/broken...ref" $main_sha1 $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...ref" &&
git branch -d broken...ref >output 2>error &&
- test_i18ngrep "Deleted branch broken...ref (was broken)" output &&
+ test_grep "Deleted branch broken...ref (was broken)" output &&
test_must_be_empty error &&
git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error &&
@@ -218,7 +218,7 @@ test_expect_success 'branch -d can delete symref to broken name' '
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git branch -d badname >output 2>error &&
test_path_is_missing .git/refs/heads/badname &&
- test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+ test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
test_must_be_empty error
'
@@ -236,7 +236,7 @@ test_expect_success 'branch -d can delete dangling symref to broken name' '
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/badname" &&
git branch -d badname >output 2>error &&
test_path_is_missing .git/refs/heads/badname &&
- test_i18ngrep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
+ test_grep "Deleted branch badname (was refs/heads/broken\.\.\.ref)" output &&
test_must_be_empty error
'
@@ -265,7 +265,7 @@ test_expect_success 'branch -d can delete symref with broken name' '
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git branch -d broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref &&
- test_i18ngrep "Deleted branch broken...symref (was refs/heads/main)" output &&
+ test_grep "Deleted branch broken...symref (was refs/heads/main)" output &&
test_must_be_empty error
'
@@ -283,7 +283,7 @@ test_expect_success 'branch -d can delete dangling symref with broken name' '
test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/broken...symref" &&
git branch -d broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref &&
- test_i18ngrep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
+ test_grep "Deleted branch broken...symref (was refs/heads/idonotexist)" output &&
test_must_be_empty error
'
@@ -292,7 +292,7 @@ test_expect_success 'update-ref -d cannot delete non-ref in .git dir' '
echo precious >expect &&
test_must_fail git update-ref -d my-private-file >output 2>error &&
test_must_be_empty output &&
- test_i18ngrep -e "refusing to update ref with bad name" error &&
+ test_grep -e "refusing to update ref with bad name" error &&
test_cmp expect .git/my-private-file
'
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 5805d47eb9..e2b30fb75e 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -118,7 +118,7 @@ test_expect_success 'branch pointing to non-commit' '
git rev-parse HEAD^{tree} >.git/refs/heads/invalid &&
test_when_finished "git update-ref -d refs/heads/invalid" &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "not a commit" out
+ test_grep "not a commit" out
'
test_expect_success 'HEAD link pointing at a funny object' '
@@ -127,7 +127,7 @@ test_expect_success 'HEAD link pointing at a funny object' '
echo $ZERO_OID >.git/HEAD &&
# avoid corrupt/broken HEAD from interfering with repo discovery
test_must_fail env GIT_DIR=.git git fsck 2>out &&
- test_i18ngrep "detached HEAD points" out
+ test_grep "detached HEAD points" out
'
test_expect_success 'HEAD link pointing at a funny place' '
@@ -136,7 +136,7 @@ test_expect_success 'HEAD link pointing at a funny place' '
echo "ref: refs/funny/place" >.git/HEAD &&
# avoid corrupt/broken HEAD from interfering with repo discovery
test_must_fail env GIT_DIR=.git git fsck 2>out &&
- test_i18ngrep "HEAD points to something strange" out
+ test_grep "HEAD points to something strange" out
'
test_expect_success 'HEAD link pointing at a funny object (from different wt)' '
@@ -147,7 +147,7 @@ test_expect_success 'HEAD link pointing at a funny object (from different wt)' '
echo $ZERO_OID >.git/HEAD &&
# avoid corrupt/broken HEAD from interfering with repo discovery
test_must_fail git -C wt fsck 2>out &&
- test_i18ngrep "main-worktree/HEAD: detached HEAD points" out
+ test_grep "main-worktree/HEAD: detached HEAD points" out
'
test_expect_success 'other worktree HEAD link pointing at a funny object' '
@@ -155,7 +155,7 @@ test_expect_success 'other worktree HEAD link pointing at a funny object' '
git worktree add other &&
echo $ZERO_OID >.git/worktrees/other/HEAD &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "worktrees/other/HEAD: detached HEAD points" out
+ test_grep "worktrees/other/HEAD: detached HEAD points" out
'
test_expect_success 'other worktree HEAD link pointing at missing object' '
@@ -163,7 +163,7 @@ test_expect_success 'other worktree HEAD link pointing at missing object' '
git worktree add other &&
echo "Contents missing from repo" | git hash-object --stdin >.git/worktrees/other/HEAD &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "worktrees/other/HEAD: invalid sha1 pointer" out
+ test_grep "worktrees/other/HEAD: invalid sha1 pointer" out
'
test_expect_success 'other worktree HEAD link pointing at a funny place' '
@@ -171,7 +171,7 @@ test_expect_success 'other worktree HEAD link pointing at a funny place' '
git worktree add other &&
echo "ref: refs/funny/place" >.git/worktrees/other/HEAD &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "worktrees/other/HEAD points to something strange" out
+ test_grep "worktrees/other/HEAD points to something strange" out
'
test_expect_success 'commit with multiple signatures is okay' '
@@ -217,7 +217,7 @@ test_expect_success 'email with embedded > is not okay' '
git update-ref refs/heads/bogus "$new" &&
test_when_finished "git update-ref -d refs/heads/bogus" &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "error in commit $new" out
+ test_grep "error in commit $new" out
'
test_expect_success 'missing < email delimiter is reported nicely' '
@@ -228,7 +228,7 @@ test_expect_success 'missing < email delimiter is reported nicely' '
git update-ref refs/heads/bogus "$new" &&
test_when_finished "git update-ref -d refs/heads/bogus" &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "error in commit $new.* - bad name" out
+ test_grep "error in commit $new.* - bad name" out
'
test_expect_success 'missing email is reported nicely' '
@@ -239,7 +239,7 @@ test_expect_success 'missing email is reported nicely' '
git update-ref refs/heads/bogus "$new" &&
test_when_finished "git update-ref -d refs/heads/bogus" &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "error in commit $new.* - missing email" out
+ test_grep "error in commit $new.* - missing email" out
'
test_expect_success '> in name is reported' '
@@ -250,7 +250,7 @@ test_expect_success '> in name is reported' '
git update-ref refs/heads/bogus "$new" &&
test_when_finished "git update-ref -d refs/heads/bogus" &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "error in commit $new" out
+ test_grep "error in commit $new" out
'
# date is 2^64 + 1
@@ -263,7 +263,7 @@ test_expect_success 'integer overflow in timestamps is reported' '
git update-ref refs/heads/bogus "$new" &&
test_when_finished "git update-ref -d refs/heads/bogus" &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "error in commit $new.*integer overflow" out
+ test_grep "error in commit $new.*integer overflow" out
'
test_expect_success 'commit with NUL in header' '
@@ -274,7 +274,7 @@ test_expect_success 'commit with NUL in header' '
git update-ref refs/heads/bogus "$new" &&
test_when_finished "git update-ref -d refs/heads/bogus" &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "error in commit $new.*unterminated header: NUL at offset" out
+ test_grep "error in commit $new.*unterminated header: NUL at offset" out
'
test_expect_success 'tree object with duplicate entries' '
@@ -295,7 +295,7 @@ test_expect_success 'tree object with duplicate entries' '
git hash-object --literally -w -t tree --stdin
) &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "error in tree .*contains duplicate file entries" out
+ test_grep "error in tree .*contains duplicate file entries" out
'
check_duplicate_names () {
@@ -318,8 +318,8 @@ check_duplicate_names () {
done >badtree &&
badtree=$(git mktree <badtree) &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "$badtree" out &&
- test_i18ngrep "error in tree .*contains duplicate file entries" out
+ test_grep "$badtree" out &&
+ test_grep "error in tree .*contains duplicate file entries" out
'
}
@@ -341,9 +341,9 @@ test_expect_success 'unparseable tree object' '
commit_sha1=$(git commit-tree $tree_sha1) &&
git update-ref refs/heads/wrong $commit_sha1 &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "error: empty filename in tree entry" out &&
- test_i18ngrep "$tree_sha1" out &&
- test_i18ngrep ! "fatal: empty filename in tree entry" out
+ test_grep "error: empty filename in tree entry" out &&
+ test_grep "$tree_sha1" out &&
+ test_grep ! "fatal: empty filename in tree entry" out
'
test_expect_success 'tree entry with type mismatch' '
@@ -360,8 +360,8 @@ test_expect_success 'tree entry with type mismatch' '
commit=$(git commit-tree $tree) &&
git update-ref refs/heads/type_mismatch $commit &&
test_must_fail git fsck >out 2>&1 &&
- test_i18ngrep "is a blob, not a tree" out &&
- test_i18ngrep ! "dangling blob" out
+ test_grep "is a blob, not a tree" out &&
+ test_grep ! "dangling blob" out
'
test_expect_success 'tree entry with bogus mode' '
@@ -394,7 +394,7 @@ test_expect_success 'tag pointing to nonexistent' '
echo $tag >.git/refs/tags/invalid &&
test_when_finished "git update-ref -d refs/tags/invalid" &&
test_must_fail git fsck --tags >out &&
- test_i18ngrep "broken link" out
+ test_grep "broken link" out
'
test_expect_success 'tag pointing to something else than its type' '
@@ -455,7 +455,7 @@ test_expect_success 'tag with bad tagger' '
echo $tag >.git/refs/tags/wrong &&
test_when_finished "git update-ref -d refs/tags/wrong" &&
test_must_fail git fsck --tags 2>out &&
- test_i18ngrep "error in tag .*: invalid author/committer" out
+ test_grep "error in tag .*: invalid author/committer" out
'
test_expect_success 'tag with NUL in header' '
@@ -474,7 +474,7 @@ test_expect_success 'tag with NUL in header' '
echo $tag >.git/refs/tags/wrong &&
test_when_finished "git update-ref -d refs/tags/wrong" &&
test_must_fail git fsck --tags 2>out &&
- test_i18ngrep "error in tag $tag.*unterminated header: NUL at offset" out
+ test_grep "error in tag $tag.*unterminated header: NUL at offset" out
'
test_expect_success 'cleaned up' '
@@ -504,7 +504,7 @@ test_expect_success 'rev-list --verify-objects with bad sha1' '
test_when_finished "git update-ref -d refs/heads/bogus" &&
test_might_fail git rev-list --verify-objects refs/heads/bogus >/dev/null 2>out &&
- test_i18ngrep -q "error: hash mismatch $(dirname $new)$(test_oid ff_2)" out
+ test_grep -q "error: hash mismatch $(dirname $new)$(test_oid ff_2)" out
'
# An actual bit corruption is more likely than swapped commits, but
@@ -575,7 +575,7 @@ test_expect_success 'fsck notices blob entry pointing to null sha1' '
sha=$(printf "100644 file$_bz$_bzoid" |
git hash-object --literally -w --stdin -t tree) &&
git fsck 2>out &&
- test_i18ngrep "warning.*null sha1" out
+ test_grep "warning.*null sha1" out
)
'
@@ -585,7 +585,7 @@ test_expect_success 'fsck notices submodule entry pointing to null sha1' '
sha=$(printf "160000 submodule$_bz$_bzoid" |
git hash-object --literally -w --stdin -t tree) &&
git fsck 2>out &&
- test_i18ngrep "warning.*null sha1" out
+ test_grep "warning.*null sha1" out
)
'
@@ -606,7 +606,7 @@ while read name path pretty; do
printf "$mode $type %s\t%s" "$value" "$path" >bad &&
bad_tree=$(git mktree <bad) &&
git fsck 2>out &&
- test_i18ngrep "warning.*tree $bad_tree" out
+ test_grep "warning.*tree $bad_tree" out
)'
done <<-\EOF
100644 blob
@@ -652,9 +652,9 @@ test_expect_success 'NUL in commit' '
git branch bad $(cat name) &&
test_must_fail git -c fsck.nulInCommit=error fsck 2>warn.1 &&
- test_i18ngrep nulInCommit warn.1 &&
+ test_grep nulInCommit warn.1 &&
git fsck 2>warn.2 &&
- test_i18ngrep nulInCommit warn.2
+ test_grep nulInCommit warn.2
)
'
@@ -774,7 +774,7 @@ test_expect_success 'fsck --name-objects' '
tree=$(git rev-parse --verify julius:) &&
git tag -d julius &&
test_must_fail git fsck --name-objects >out &&
- test_i18ngrep "$tree (refs/tags/augustus44\\^:" out
+ test_grep "$tree (refs/tags/augustus44\\^:" out
)
'
@@ -787,7 +787,7 @@ test_expect_success 'alternate objects are correctly blamed' '
mkdir alt.git/objects/$(dirname $path) &&
>alt.git/objects/$(dirname $path)/$(basename $path) &&
test_must_fail git fsck >out 2>&1 &&
- test_i18ngrep alt.git out
+ test_grep alt.git out
'
test_expect_success 'fsck errors in packed objects' '
@@ -806,8 +806,8 @@ test_expect_success 'fsck errors in packed objects' '
remove_object $one &&
remove_object $two &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "error in commit $one.* - bad name" out &&
- test_i18ngrep "error in commit $two.* - bad name" out &&
+ test_grep "error in commit $one.* - bad name" out &&
+ test_grep "error in commit $two.* - bad name" out &&
! grep corrupt out
'
@@ -824,7 +824,7 @@ test_expect_success 'fsck fails on corrupt packfile' '
test_when_finished "rm -f .git/objects/pack/pack-$pack.*" &&
remove_object $hsh &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "checksum mismatch" out
+ test_grep "checksum mismatch" out
'
test_expect_success 'fsck finds problems in duplicate loose objects' '
@@ -861,7 +861,7 @@ test_expect_success 'fsck detects trailing loose garbage (commit)' '
chmod +w "$file" &&
echo garbage >>"$file" &&
test_must_fail git fsck 2>out &&
- test_i18ngrep "garbage.*$commit" out
+ test_grep "garbage.*$commit" out
'
test_expect_success 'fsck detects trailing loose garbage (large blob)' '
@@ -871,7 +871,7 @@ test_expect_success 'fsck detects trailing loose garbage (large blob)' '
chmod +w "$file" &&
echo garbage >>"$file" &&
test_must_fail git -c core.bigfilethreshold=5 fsck 2>out &&
- test_i18ngrep "garbage.*$blob" out
+ test_grep "garbage.*$blob" out
'
test_expect_success 'fsck detects truncated loose object' '
@@ -887,10 +887,10 @@ test_expect_success 'fsck detects truncated loose object' '
# check both regular and streaming code paths
test_must_fail git fsck 2>out &&
- test_i18ngrep corrupt.*$blob out &&
+ test_grep corrupt.*$blob out &&
test_must_fail git -c core.bigfilethreshold=128 fsck 2>out &&
- test_i18ngrep corrupt.*$blob out
+ test_grep corrupt.*$blob out
'
# for each of type, we have one version which is referenced by another object
@@ -979,7 +979,7 @@ test_expect_success 'detect corrupt index file in fsck' '
test_when_finished "mv .git/index.backup .git/index" &&
corrupt_index_checksum &&
test_must_fail git fsck --cache 2>errors &&
- test_i18ngrep "bad index file" errors
+ test_grep "bad index file" errors
'
test_expect_success 'fsck error and recovery on invalid object type' '
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 18688cae17..ef40511d89 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -107,16 +107,16 @@ test_expect_success 'correct relative file objects (6)' '
test_expect_success 'incorrect revision id' '
test_must_fail git rev-parse foobar:file.txt 2>error &&
- test_i18ngrep "invalid object name .foobar." error &&
+ test_grep "invalid object name .foobar." error &&
test_must_fail git rev-parse foobar 2>error &&
- test_i18ngrep "unknown revision or path not in the working tree." error
+ test_grep "unknown revision or path not in the working tree." error
'
test_expect_success 'incorrect file in sha1:path' '
test_must_fail git rev-parse HEAD:nothing.txt 2>error &&
- test_i18ngrep "path .nothing.txt. does not exist in .HEAD." error &&
+ test_grep "path .nothing.txt. does not exist in .HEAD." error &&
test_must_fail git rev-parse HEAD:index-only.txt 2>error &&
- test_i18ngrep "path .index-only.txt. exists on disk, but not in .HEAD." error &&
+ test_grep "path .index-only.txt. exists on disk, but not in .HEAD." error &&
(cd subdir &&
test_must_fail git rev-parse HEAD:file2.txt 2>error &&
test_did_you_mean HEAD subdir/ file2.txt exists )
@@ -124,9 +124,9 @@ test_expect_success 'incorrect file in sha1:path' '
test_expect_success 'incorrect file in :path and :N:path' '
test_must_fail git rev-parse :nothing.txt 2>error &&
- test_i18ngrep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
+ test_grep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
test_must_fail git rev-parse :1:nothing.txt 2>error &&
- test_i18ngrep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
+ test_grep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
test_must_fail git rev-parse :1:file.txt 2>error &&
test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
(cd subdir &&
@@ -137,42 +137,42 @@ test_expect_success 'incorrect file in :path and :N:path' '
test_must_fail git rev-parse :2:file2.txt 2>error &&
test_did_you_mean :0 subdir/ file2.txt "is in the index") &&
test_must_fail git rev-parse :disk-only.txt 2>error &&
- test_i18ngrep "path .disk-only.txt. exists on disk, but not in the index" error
+ test_grep "path .disk-only.txt. exists on disk, but not in the index" error
'
test_expect_success 'invalid @{n} reference' '
test_must_fail git rev-parse main@{99999} >output 2>error &&
test_must_be_empty output &&
- test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error &&
+ test_grep "log for [^ ]* only has [0-9][0-9]* entries" error &&
test_must_fail git rev-parse --verify main@{99999} >output 2>error &&
test_must_be_empty output &&
- test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error
+ test_grep "log for [^ ]* only has [0-9][0-9]* entries" error
'
test_expect_success 'relative path not found' '
(
cd subdir &&
test_must_fail git rev-parse HEAD:./nonexistent.txt 2>error &&
- test_i18ngrep subdir/nonexistent.txt error
+ test_grep subdir/nonexistent.txt error
)
'
test_expect_success 'relative path outside worktree' '
test_must_fail git rev-parse HEAD:../file.txt >output 2>error &&
test_must_be_empty output &&
- test_i18ngrep "outside repository" error
+ test_grep "outside repository" error
'
test_expect_success 'relative path when cwd is outside worktree' '
test_must_fail git --git-dir=.git --work-tree=subdir rev-parse HEAD:./file.txt >output 2>error &&
test_must_be_empty output &&
- test_i18ngrep "relative path syntax can.t be used outside working tree" error
+ test_grep "relative path syntax can.t be used outside working tree" error
'
test_expect_success '<commit>:file correctly diagnosed after a pathname' '
test_must_fail git rev-parse file.txt HEAD:file.txt 1>actual 2>error &&
- test_i18ngrep ! "exists on disk" error &&
- test_i18ngrep "no such path in the working tree" error &&
+ test_grep ! "exists on disk" error &&
+ test_grep "no such path in the working tree" error &&
cat >expect <<-\EOF &&
file.txt
HEAD:file.txt
@@ -214,13 +214,13 @@ test_expect_success 'dotdot does not peel endpoints' '
test_expect_success 'arg before dashdash must be a revision (missing)' '
test_must_fail git rev-parse foobar -- 2>stderr &&
- test_i18ngrep "bad revision" stderr
+ test_grep "bad revision" stderr
'
test_expect_success 'arg before dashdash must be a revision (file)' '
>foobar &&
test_must_fail git rev-parse foobar -- 2>stderr &&
- test_i18ngrep "bad revision" stderr
+ test_grep "bad revision" stderr
'
test_expect_success 'arg before dashdash must be a revision (ambiguous)' '
@@ -269,7 +269,7 @@ test_expect_success 'arg after dashdash not interpreted as option' '
test_expect_success 'arg after end-of-options not interpreted as option' '
test_must_fail git rev-parse --end-of-options --not-real -- 2>err &&
- test_i18ngrep bad.revision.*--not-real err
+ test_grep bad.revision.*--not-real err
'
test_expect_success 'end-of-options still allows --' '
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 98cefe3b70..70f1e0a998 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -129,7 +129,7 @@ test_expect_success 'blob and tree' '
test_expect_success 'warn ambiguity when no candidate matches type hint' '
test_must_fail git rev-parse --verify 000000000^{commit} 2>actual &&
- test_i18ngrep "short object ID 000000000 is ambiguous" actual
+ test_grep "short object ID 000000000 is ambiguous" actual
'
test_expect_success 'disambiguate tree-ish' '
@@ -470,10 +470,10 @@ test_expect_success 'cat-file --batch and --batch-check show ambiguous' '
echo "0000 ambiguous" >expect &&
echo 0000 | git cat-file --batch-check >actual 2>err &&
test_cmp expect actual &&
- test_i18ngrep hint: err &&
+ test_grep hint: err &&
echo 0000 | git cat-file --batch >actual 2>err &&
test_cmp expect actual &&
- test_i18ngrep hint: err
+ test_grep hint: err
'
test_done
diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh
index b16d69ca4a..4c0fd856b3 100755
--- a/t/t2004-checkout-cache-temp.sh
+++ b/t/t2004-checkout-cache-temp.sh
@@ -93,7 +93,7 @@ test_expect_success 'checkout all stages of unknown path' '
rm -f path* .merge_* actual &&
test_must_fail git checkout-index --stage=all --temp \
-- does-not-exist 2>stderr &&
- test_i18ngrep not.in.the.cache stderr
+ test_grep not.in.the.cache stderr
'
test_expect_success 'checkout all stages/one file to nothing' '
diff --git a/t/t2006-checkout-index-basic.sh b/t/t2006-checkout-index-basic.sh
index 5d119871d4..570ba38580 100755
--- a/t/t2006-checkout-index-basic.sh
+++ b/t/t2006-checkout-index-basic.sh
@@ -8,7 +8,7 @@ TEST_PASSES_SANITIZE_LEAK=true
test_expect_success 'checkout-index --gobbledegook' '
test_expect_code 129 git checkout-index --gobbledegook 2>err &&
- test_i18ngrep "[Uu]sage" err
+ test_grep "[Uu]sage" err
'
test_expect_success 'checkout-index -h in broken repository' '
@@ -19,18 +19,18 @@ test_expect_success 'checkout-index -h in broken repository' '
>.git/index &&
test_expect_code 129 git checkout-index -h >usage 2>&1
) &&
- test_i18ngrep "[Uu]sage" broken/usage
+ test_grep "[Uu]sage" broken/usage
'
test_expect_success 'checkout-index reports errors (cmdline)' '
test_must_fail git checkout-index -- does-not-exist 2>stderr &&
- test_i18ngrep not.in.the.cache stderr
+ test_grep not.in.the.cache stderr
'
test_expect_success 'checkout-index reports errors (stdin)' '
echo does-not-exist |
test_must_fail git checkout-index --stdin 2>stderr &&
- test_i18ngrep not.in.the.cache stderr
+ test_grep not.in.the.cache stderr
'
for mode in 'case' 'utf-8'
do
@@ -88,8 +88,8 @@ test_expect_success 'checkout-index --temp correctly reports error on missing bl
git update-index --index-info <objs &&
test_must_fail git checkout-index --temp symlink file 2>stderr &&
- test_i18ngrep "unable to read sha1 file of file ($missing_blob)" stderr &&
- test_i18ngrep "unable to read sha1 file of symlink ($missing_blob)" stderr
+ test_grep "unable to read sha1 file of file ($missing_blob)" stderr &&
+ test_grep "unable to read sha1 file of symlink ($missing_blob)" stderr
'
test_expect_success 'checkout-index --temp correctly reports error for submodules' '
@@ -98,7 +98,7 @@ test_expect_success 'checkout-index --temp correctly reports error for submodule
git submodule add ./sub &&
git commit -m sub &&
test_must_fail git checkout-index --temp sub 2>stderr &&
- test_i18ngrep "cannot create temporary submodule sub" stderr
+ test_grep "cannot create temporary submodule sub" stderr
'
test_done
diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh
index 9d4b37526a..82c3bfeac1 100755
--- a/t/t2010-checkout-ambiguous.sh
+++ b/t/t2010-checkout-ambiguous.sh
@@ -62,8 +62,8 @@ test_expect_success 'disambiguate checking out from a tree-ish' '
test_expect_success 'accurate error message with more than one ref' '
test_must_fail git checkout HEAD main -- 2>actual &&
- test_i18ngrep 2 actual &&
- test_i18ngrep "one reference expected, 2 given" actual
+ test_grep 2 actual &&
+ test_grep "one reference expected, 2 given" actual
'
test_done
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index 8581ad3437..43551cc148 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -278,12 +278,12 @@ test_expect_success 'checkout -b to a new branch preserves mergeable changes des
test_expect_success 'checkout -b rejects an invalid start point' '
test_must_fail git checkout -b branch4 file1 2>err &&
- test_i18ngrep "is not a commit" err
+ test_grep "is not a commit" err
'
test_expect_success 'checkout -b rejects an extra path argument' '
test_must_fail git checkout -b branch5 branch1 file1 2>err &&
- test_i18ngrep "Cannot update paths and switch to branch" err
+ test_grep "Cannot update paths and switch to branch" err
'
test_done
diff --git a/t/t2019-checkout-ambiguous-ref.sh b/t/t2019-checkout-ambiguous-ref.sh
index 9540588664..c67261e2b6 100755
--- a/t/t2019-checkout-ambiguous-ref.sh
+++ b/t/t2019-checkout-ambiguous-ref.sh
@@ -32,8 +32,8 @@ test_expect_success 'checkout chooses branch over tag' '
'
test_expect_success 'checkout reports switch to branch' '
- test_i18ngrep "Switched to branch" stderr &&
- test_i18ngrep ! "^HEAD is now at" stderr
+ test_grep "Switched to branch" stderr &&
+ test_grep ! "^HEAD is now at" stderr
'
test_expect_success 'checkout vague ref succeeds' '
@@ -54,8 +54,8 @@ test_expect_success VAGUENESS_SUCCESS 'checkout chooses branch over tag' '
'
test_expect_success VAGUENESS_SUCCESS 'checkout reports switch to branch' '
- test_i18ngrep "Switched to branch" stderr &&
- test_i18ngrep ! "^HEAD is now at" stderr
+ test_grep "Switched to branch" stderr &&
+ test_grep ! "^HEAD is now at" stderr
'
test_done
diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index 2eab6474f8..8202ef8c74 100755
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -17,12 +17,12 @@ check_not_detached () {
PREV_HEAD_DESC='Previous HEAD position was'
check_orphan_warning() {
- test_i18ngrep "you are leaving $2 behind" "$1" &&
- test_i18ngrep ! "$PREV_HEAD_DESC" "$1"
+ test_grep "you are leaving $2 behind" "$1" &&
+ test_grep ! "$PREV_HEAD_DESC" "$1"
}
check_no_orphan_warning() {
- test_i18ngrep ! "you are leaving .* commit.*behind" "$1" &&
- test_i18ngrep "$PREV_HEAD_DESC" "$1"
+ test_grep ! "you are leaving .* commit.*behind" "$1" &&
+ test_grep "$PREV_HEAD_DESC" "$1"
}
reset () {
diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
index 74049a9812..a97416ce65 100755
--- a/t/t2024-checkout-dwim.sh
+++ b/t/t2024-checkout-dwim.sh
@@ -93,7 +93,7 @@ test_expect_success 'when arg matches multiple remotes, do not fallback to inter
test_must_fail git checkout ambiguous_branch_and_file 2>err &&
- test_i18ngrep "matched multiple (2) remote tracking branches" err &&
+ test_grep "matched multiple (2) remote tracking branches" err &&
# file must not be altered
test_cmp expect ambiguous_branch_and_file
@@ -105,12 +105,12 @@ test_expect_success 'checkout of branch from multiple remotes fails with advice'
test_must_fail git checkout foo 2>stderr &&
test_branch main &&
status_uno_is_clean &&
- test_i18ngrep "^hint: " stderr &&
+ test_grep "^hint: " stderr &&
test_must_fail git -c advice.checkoutAmbiguousRemoteBranchName=false \
checkout foo 2>stderr &&
test_branch main &&
status_uno_is_clean &&
- test_i18ngrep ! "^hint: " stderr
+ test_grep ! "^hint: " stderr
'
test_expect_success PERL 'checkout -p with multiple remotes does not print advice' '
@@ -118,7 +118,7 @@ test_expect_success PERL 'checkout -p with multiple remotes does not print advic
test_might_fail git branch -D foo &&
git checkout -p foo 2>stderr &&
- test_i18ngrep ! "^hint: " stderr &&
+ test_grep ! "^hint: " stderr &&
status_uno_is_clean
'
diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh
index 3832c3de81..246609d54d 100755
--- a/t/t2025-checkout-no-overlay.sh
+++ b/t/t2025-checkout-no-overlay.sh
@@ -26,7 +26,7 @@ test_expect_success 'checkout --no-overlay removing last file from directory' '
test_expect_success 'checkout -p --overlay is disallowed' '
test_must_fail git checkout -p --overlay HEAD 2>actual &&
- test_i18ngrep "fatal: options .-p. and .--overlay. cannot be used together" actual
+ test_grep "fatal: options .-p. and .--overlay. cannot be used together" actual
'
test_expect_success '--no-overlay --theirs with D/F conflict deletes file' '
diff --git a/t/t2026-checkout-pathspec-file.sh b/t/t2026-checkout-pathspec-file.sh
index 9c651aefbc..acd55217a6 100755
--- a/t/t2026-checkout-pathspec-file.sh
+++ b/t/t2026-checkout-pathspec-file.sh
@@ -149,16 +149,16 @@ test_expect_success 'error conditions' '
echo fileA.t >list &&
test_must_fail git checkout --pathspec-from-file=list --detach 2>err &&
- test_i18ngrep -e "options .--pathspec-from-file. and .--detach. cannot be used together" err &&
+ test_grep -e "options .--pathspec-from-file. and .--detach. cannot be used together" err &&
test_must_fail git checkout --pathspec-from-file=list --patch 2>err &&
- test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
+ test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
test_must_fail git checkout --pathspec-from-file=list -- fileA.t 2>err &&
- test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+ test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git checkout --pathspec-file-nul 2>err &&
- test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
+ test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
'
test_done
diff --git a/t/t2027-checkout-track.sh b/t/t2027-checkout-track.sh
index a8bbc60954..98f16c7239 100755
--- a/t/t2027-checkout-track.sh
+++ b/t/t2027-checkout-track.sh
@@ -22,7 +22,7 @@ test_expect_success 'checkout --track -b creates a new tracking branch' '
test_expect_success 'checkout --track -b rejects an extra path argument' '
test_must_fail git checkout --track -b branch2 main one.t 2>err &&
- test_i18ngrep "cannot be used with updating paths" err
+ test_grep "cannot be used with updating paths" err
'
test_expect_success 'checkout --track -b overrides autoSetupMerge=inherit' '
diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh
index 2d8c70b03a..102023ed57 100755
--- a/t/t2030-unresolve-info.sh
+++ b/t/t2030-unresolve-info.sh
@@ -191,7 +191,7 @@ test_expect_success 'rerere forget (add-add conflict)' '
git commit -m "add differently" &&
test_must_fail git merge fifth &&
git rerere forget add-differently 2>actual &&
- test_i18ngrep "no remembered" actual
+ test_grep "no remembered" actual
'
test_expect_success 'resolve-undo keeps blobs from gc' '
diff --git a/t/t2072-restore-pathspec-file.sh b/t/t2072-restore-pathspec-file.sh
index c22669b39f..8198a1e578 100755
--- a/t/t2072-restore-pathspec-file.sh
+++ b/t/t2072-restore-pathspec-file.sh
@@ -152,16 +152,16 @@ test_expect_success 'error conditions' '
>empty_list &&
test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err &&
- test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
+ test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err &&
- test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+ test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err &&
- test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+ test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err &&
- test_i18ngrep -e "you must specify path(s) to restore" err
+ test_grep -e "you must specify path(s) to restore" err
'
test_expect_success 'wildcard pathspec matches file in subdirectory' '
diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh
index d943ddf47e..95c004dc5c 100755
--- a/t/t2106-update-index-assume-unchanged.sh
+++ b/t/t2106-update-index-assume-unchanged.sh
@@ -22,7 +22,7 @@ test_expect_success 'do not switch branches with dirty file' '
echo dirt >file &&
git update-index --assume-unchanged file &&
test_must_fail git checkout - 2>err &&
- test_i18ngrep overwritten err
+ test_grep overwritten err
'
test_done
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh
index 89b285fa3a..3d7ca5792e 100755
--- a/t/t2107-update-index-basic.sh
+++ b/t/t2107-update-index-basic.sh
@@ -14,7 +14,7 @@ test_expect_success 'update-index --nonsense fails' '
test_expect_success 'update-index --nonsense dumps usage' '
test_expect_code 129 git update-index --nonsense 2>err &&
- test_i18ngrep "[Uu]sage: git update-index" err
+ test_grep "[Uu]sage: git update-index" err
'
test_expect_success 'update-index -h with corrupt index' '
@@ -25,7 +25,7 @@ test_expect_success 'update-index -h with corrupt index' '
>.git/index &&
test_expect_code 129 git update-index -h >usage 2>&1
) &&
- test_i18ngrep "[Uu]sage: git update-index" broken/usage
+ test_grep "[Uu]sage: git update-index" broken/usage
'
test_expect_success '--cacheinfo complains of missing arguments' '
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index ebf58db2d1..8fa44a92a2 100755
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -173,7 +173,7 @@ test_expect_success 'rename detection finds the right names' '
git add -N third &&
git status | grep -v "^?" >actual.1 &&
- test_i18ngrep "renamed: *first -> third" actual.1 &&
+ test_grep "renamed: *first -> third" actual.1 &&
git status --porcelain | grep -v "^?" >actual.2 &&
cat >expected.2 <<-\EOF &&
@@ -213,8 +213,8 @@ test_expect_success 'double rename detection in status' '
git add -N third &&
git status | grep -v "^?" >actual.1 &&
- test_i18ngrep "renamed: *first -> second" actual.1 &&
- test_i18ngrep "renamed: *second -> third" actual.1 &&
+ test_grep "renamed: *first -> second" actual.1 &&
+ test_grep "renamed: *second -> third" actual.1 &&
git status --porcelain | grep -v "^?" >actual.2 &&
cat >expected.2 <<-\EOF &&
diff --git a/t/t2204-add-ignored.sh b/t/t2204-add-ignored.sh
index 89424abccd..b7cf1e492c 100755
--- a/t/t2204-add-ignored.sh
+++ b/t/t2204-add-ignored.sh
@@ -36,7 +36,7 @@ do
'
test_expect_success "complaints for ignored $i output" '
- test_i18ngrep -e "Use -f if" err
+ test_grep -e "Use -f if" err
'
test_expect_success "complaints for ignored $i with unignored file" '
@@ -46,7 +46,7 @@ do
test_must_be_empty out
'
test_expect_success "complaints for ignored $i with unignored file output" '
- test_i18ngrep -e "Use -f if" err
+ test_grep -e "Use -f if" err
'
done
@@ -65,7 +65,7 @@ do
test_expect_success "complaints for ignored $i in dir output" '
(
cd dir &&
- test_i18ngrep -e "Use -f if" err
+ test_grep -e "Use -f if" err
)
'
done
@@ -85,7 +85,7 @@ do
test_expect_success "complaints for ignored $i in sub output" '
(
cd sub &&
- test_i18ngrep -e "Use -f if" err
+ test_grep -e "Use -f if" err
)
'
done
diff --git a/t/t2401-worktree-prune.sh b/t/t2401-worktree-prune.sh
index 568a47ec42..71aa9bcd62 100755
--- a/t/t2401-worktree-prune.sh
+++ b/t/t2401-worktree-prune.sh
@@ -47,7 +47,7 @@ test_expect_success SANITY 'prune directories with unreadable gitdir' '
: >.git/worktrees/def/gitdir &&
chmod u-r .git/worktrees/def/gitdir &&
git worktree prune --verbose 2>actual &&
- test_i18ngrep "Removing worktrees/def: unable to read gitdir file" actual &&
+ test_grep "Removing worktrees/def: unable to read gitdir file" actual &&
! test -d .git/worktrees/def &&
! test -d .git/worktrees
'
@@ -57,7 +57,7 @@ test_expect_success 'prune directories with invalid gitdir' '
: >.git/worktrees/def/def &&
: >.git/worktrees/def/gitdir &&
git worktree prune --verbose 2>actual &&
- test_i18ngrep "Removing worktrees/def: invalid gitdir file" actual &&
+ test_grep "Removing worktrees/def: invalid gitdir file" actual &&
! test -d .git/worktrees/def &&
! test -d .git/worktrees
'
@@ -67,7 +67,7 @@ test_expect_success 'prune directories with gitdir pointing to nowhere' '
: >.git/worktrees/def/def &&
echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
git worktree prune --verbose 2>actual &&
- test_i18ngrep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
+ test_grep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
! test -d .git/worktrees/def &&
! test -d .git/worktrees
'
@@ -103,7 +103,7 @@ test_expect_success 'prune duplicate (linked/linked)' '
sed "s/w2/w1/" .git/worktrees/w2/gitdir >.git/worktrees/w2/gitdir.new &&
mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir &&
git worktree prune --verbose 2>actual &&
- test_i18ngrep "duplicate entry" actual &&
+ test_grep "duplicate entry" actual &&
test -d .git/worktrees/w1 &&
! test -d .git/worktrees/w2
'
@@ -116,7 +116,7 @@ test_expect_success 'prune duplicate (main/linked)' '
rm -fr wt &&
mv repo wt &&
git -C wt worktree prune --verbose 2>actual &&
- test_i18ngrep "duplicate entry" actual &&
+ test_grep "duplicate entry" actual &&
! test -d .git/worktrees/wt
'
diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index 9ad9be0c20..33ea9cb21b 100755
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -143,7 +143,7 @@ test_expect_success '"list" all worktrees --porcelain with prunable' '
rm -rf prunable &&
git worktree list --porcelain >out &&
sed -n "/^worktree .*\/prunable$/,/^$/p" <out >only_prunable &&
- test_i18ngrep "^prunable gitdir file points to non-existent location$" only_prunable
+ test_grep "^prunable gitdir file points to non-existent location$" only_prunable
'
test_expect_success '"list" all worktrees with prunable consistent with "prune"' '
@@ -155,8 +155,8 @@ test_expect_success '"list" all worktrees with prunable consistent with "prune"'
grep "/prunable *[0-9a-f].* prunable$" out &&
! grep "/unprunable *[0-9a-f].* unprunable$" out &&
git worktree prune --verbose 2>out &&
- test_i18ngrep "^Removing worktrees/prunable" out &&
- test_i18ngrep ! "^Removing worktrees/unprunable" out
+ test_grep "^Removing worktrees/prunable" out &&
+ test_grep ! "^Removing worktrees/unprunable" out
'
test_expect_success '"list" --verbose and --porcelain mutually exclusive' '
diff --git a/t/t2403-worktree-move.sh b/t/t2403-worktree-move.sh
index 230a55e99a..901342ea09 100755
--- a/t/t2403-worktree-move.sh
+++ b/t/t2403-worktree-move.sh
@@ -202,7 +202,7 @@ test_expect_success 'proper error when worktree not found' '
for i in noodle noodle/bork
do
test_must_fail git worktree lock $i 2>err &&
- test_i18ngrep "not a working tree" err || return 1
+ test_grep "not a working tree" err || return 1
done
'
diff --git a/t/t2406-worktree-repair.sh b/t/t2406-worktree-repair.sh
index 8970780efc..edbf502ec5 100755
--- a/t/t2406-worktree-repair.sh
+++ b/t/t2406-worktree-repair.sh
@@ -25,7 +25,7 @@ test_expect_success 'worktree path not directory' '
>notdir &&
test_must_fail git worktree repair >out 2>err &&
test_must_be_empty out &&
- test_i18ngrep "not a directory" err
+ test_grep "not a directory" err
'
test_expect_success "don't clobber .git repo" '
@@ -35,7 +35,7 @@ test_expect_success "don't clobber .git repo" '
test_create_repo repo &&
test_must_fail git worktree repair >out 2>err &&
test_must_be_empty out &&
- test_i18ngrep ".git is not a file" err
+ test_grep ".git is not a file" err
'
test_corrupt_gitfile () {
@@ -47,7 +47,7 @@ test_corrupt_gitfile () {
git -C corrupt rev-parse --absolute-git-dir >expect &&
eval "$butcher" &&
git -C "$repairdir" worktree repair 2>err &&
- test_i18ngrep "$problem" err &&
+ test_grep "$problem" err &&
git -C corrupt rev-parse --absolute-git-dir >actual &&
test_cmp expect actual
}
@@ -93,7 +93,7 @@ test_expect_success 'repair .git file from bare.git' '
test_expect_success 'invalid worktree path' '
test_must_fail git worktree repair /notvalid >out 2>err &&
test_must_be_empty out &&
- test_i18ngrep "not a valid path" err
+ test_grep "not a valid path" err
'
test_expect_success 'repo not found; .git not file' '
@@ -101,7 +101,7 @@ test_expect_success 'repo not found; .git not file' '
test_create_repo not-a-worktree &&
test_must_fail git worktree repair not-a-worktree >out 2>err &&
test_must_be_empty out &&
- test_i18ngrep ".git is not a file" err
+ test_grep ".git is not a file" err
'
test_expect_success 'repo not found; .git not referencing repo' '
@@ -111,7 +111,7 @@ test_expect_success 'repo not found; .git not referencing repo' '
mv side/.newgit side/.git &&
mkdir not-a-repo &&
test_must_fail git worktree repair side 2>err &&
- test_i18ngrep ".git file does not reference a repository" err
+ test_grep ".git file does not reference a repository" err
'
test_expect_success 'repo not found; .git file broken' '
@@ -121,7 +121,7 @@ test_expect_success 'repo not found; .git file broken' '
mv orig moved &&
test_must_fail git worktree repair moved >out 2>err &&
test_must_be_empty out &&
- test_i18ngrep ".git file broken" err
+ test_grep ".git file broken" err
'
test_expect_success 'repair broken gitdir' '
@@ -132,7 +132,7 @@ test_expect_success 'repair broken gitdir' '
mv orig moved &&
git worktree repair moved 2>err &&
test_cmp expect .git/worktrees/orig/gitdir &&
- test_i18ngrep "gitdir unreadable" err
+ test_grep "gitdir unreadable" err
'
test_expect_success 'repair incorrect gitdir' '
@@ -142,7 +142,7 @@ test_expect_success 'repair incorrect gitdir' '
mv orig moved &&
git worktree repair moved 2>err &&
test_cmp expect .git/worktrees/orig/gitdir &&
- test_i18ngrep "gitdir incorrect" err
+ test_grep "gitdir incorrect" err
'
test_expect_success 'repair gitdir (implicit) from linked worktree' '
@@ -152,7 +152,7 @@ test_expect_success 'repair gitdir (implicit) from linked worktree' '
mv orig moved &&
git -C moved worktree repair 2>err &&
test_cmp expect .git/worktrees/orig/gitdir &&
- test_i18ngrep "gitdir incorrect" err
+ test_grep "gitdir incorrect" err
'
test_expect_success 'unable to repair gitdir (implicit) from main worktree' '
@@ -177,8 +177,8 @@ test_expect_success 'repair multiple gitdir files' '
git worktree repair moved1 moved2 2>err &&
test_cmp expect1 .git/worktrees/orig1/gitdir &&
test_cmp expect2 .git/worktrees/orig2/gitdir &&
- test_i18ngrep "gitdir incorrect:.*orig1/gitdir$" err &&
- test_i18ngrep "gitdir incorrect:.*orig2/gitdir$" err
+ test_grep "gitdir incorrect:.*orig1/gitdir$" err &&
+ test_grep "gitdir incorrect:.*orig2/gitdir$" err
'
test_expect_success 'repair moved main and linked worktrees' '
diff --git a/t/t3004-ls-files-basic.sh b/t/t3004-ls-files-basic.sh
index a16e25c79b..12e41a7b40 100755
--- a/t/t3004-ls-files-basic.sh
+++ b/t/t3004-ls-files-basic.sh
@@ -21,7 +21,7 @@ test_expect_success 'ls-files with nonexistent path' '
test_expect_success 'ls-files with nonsense option' '
test_expect_code 129 git ls-files --nonsense 2>actual &&
- test_i18ngrep "[Uu]sage: git ls-files" actual
+ test_grep "[Uu]sage: git ls-files" actual
'
test_expect_success 'ls-files -h in corrupt repository' '
@@ -32,7 +32,7 @@ test_expect_success 'ls-files -h in corrupt repository' '
>.git/index &&
test_expect_code 129 git ls-files -h >usage 2>&1
) &&
- test_i18ngrep "[Uu]sage: git ls-files " broken/usage
+ test_grep "[Uu]sage: git ls-files " broken/usage
'
test_expect_success SYMLINKS 'ls-files with absolute paths to symlinks' '
diff --git a/t/t3007-ls-files-recurse-submodules.sh b/t/t3007-ls-files-recurse-submodules.sh
index 7308a3d4e2..61771eec83 100755
--- a/t/t3007-ls-files-recurse-submodules.sh
+++ b/t/t3007-ls-files-recurse-submodules.sh
@@ -296,7 +296,7 @@ test_expect_success '--recurse-submodules and relative paths' '
test_expect_success '--recurse-submodules does not support --error-unmatch' '
test_must_fail git ls-files --recurse-submodules --error-unmatch 2>actual &&
- test_i18ngrep "does not support --error-unmatch" actual
+ test_grep "does not support --error-unmatch" actual
'
test_expect_success '--recurse-submodules parses submodule repo config' '
@@ -335,7 +335,7 @@ test_expect_success '--recurse-submodules submodules ignore super project worktr
test_incompatible_with_recurse_submodules () {
test_expect_success "--recurse-submodules and $1 are incompatible" "
test_must_fail git ls-files --recurse-submodules $1 2>actual &&
- test_i18ngrep 'unsupported mode' actual
+ test_grep 'unsupported mode' actual
"
}
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index daf1666df7..649d9dcba5 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -36,7 +36,7 @@ test_expect_success 'branch -h in broken repository' '
>.git/refs/heads/main &&
test_expect_code 129 git branch -h >usage 2>&1
) &&
- test_i18ngrep "[Uu]sage" broken/usage
+ test_grep "[Uu]sage" broken/usage
'
test_expect_success 'git branch abc should create a branch' '
@@ -103,7 +103,7 @@ test_expect_success 'git branch l should work after branch l/m has been deleted'
test_expect_success 'git branch -m dumps usage' '
test_expect_code 128 git branch -m 2>err &&
- test_i18ngrep "branch name required" err
+ test_grep "branch name required" err
'
test_expect_success 'git branch -m m broken_symref should work' '
@@ -581,12 +581,12 @@ EOF
test_expect_success 'git branch -c dumps usage' '
test_expect_code 128 git branch -c 2>err &&
- test_i18ngrep "branch name required" err
+ test_grep "branch name required" err
'
test_expect_success 'git branch --copy dumps usage' '
test_expect_code 128 git branch --copy 2>err &&
- test_i18ngrep "branch name required" err
+ test_grep "branch name required" err
'
test_expect_success 'git branch -c d e should work' '
@@ -1025,7 +1025,7 @@ test_expect_success '--set-upstream-to fails on a missing dst branch' '
test_expect_success '--set-upstream-to fails on a missing src branch' '
test_must_fail git branch --set-upstream-to does-not-exist main 2>err &&
- test_i18ngrep "the requested upstream branch '"'"'does-not-exist'"'"' does not exist" err
+ test_grep "the requested upstream branch '"'"'does-not-exist'"'"' does not exist" err
'
test_expect_success '--set-upstream-to fails on a non-ref' '
@@ -1039,7 +1039,7 @@ test_expect_success '--set-upstream-to fails on locked config' '
>.git/config.lock &&
git branch locked &&
test_must_fail git branch --set-upstream-to locked 2>err &&
- test_i18ngrep "could not lock config file .git/config" err
+ test_grep "could not lock config file .git/config" err
'
test_expect_success 'use --set-upstream-to modify HEAD' '
@@ -1070,7 +1070,7 @@ test_expect_success '--unset-upstream should fail if config is locked' '
git branch --set-upstream-to locked &&
>.git/config.lock &&
test_must_fail git branch --unset-upstream 2>err &&
- test_i18ngrep "could not lock config file .git/config" err
+ test_grep "could not lock config file .git/config" err
'
test_expect_success 'test --unset-upstream on HEAD' '
@@ -1506,7 +1506,7 @@ test_expect_success '--list during rebase' '
set_fake_editor &&
git rebase -i HEAD~2 &&
git branch --list >actual &&
- test_i18ngrep "rebasing main" actual
+ test_grep "rebasing main" actual
'
test_expect_success '--list during rebase from detached HEAD' '
@@ -1518,7 +1518,7 @@ test_expect_success '--list during rebase from detached HEAD' '
set_fake_editor &&
git rebase -i HEAD~2 &&
git branch --list >actual &&
- test_i18ngrep "rebasing detached HEAD $oid" actual
+ test_grep "rebasing detached HEAD $oid" actual
'
test_expect_success 'tracking with unexpected .fetch refspec' '
diff --git a/t/t3202-show-branch.sh b/t/t3202-show-branch.sh
index b17f388f56..235c68fb02 100755
--- a/t/t3202-show-branch.sh
+++ b/t/t3202-show-branch.sh
@@ -253,7 +253,7 @@ test_expect_success 'error descriptions on orphan branch' '
test_branch_op_in_wt() {
test_orphan_error() {
test_must_fail git $* 2>actual &&
- test_i18ngrep "No commit on branch .orphan-branch. yet.$" actual
+ test_grep "No commit on branch .orphan-branch. yet.$" actual
} &&
test_orphan_error -C wt branch $1 $2 && # implicit branch
test_orphan_error -C wt branch $1 orphan-branch $2 && # explicit branch
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index b5f4d6a653..cfeb8c84b0 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -195,7 +195,7 @@ test_expect_success 'A^! and A^-<n> (unmodified)' '
test_expect_success 'A^{/..} is not mistaken for a range' '
test_must_fail git range-diff topic^.. topic^{/..} -- 2>error &&
- test_i18ngrep "not a commit range" error
+ test_grep "not a commit range" error
'
test_expect_success 'trivial reordering' '
@@ -537,7 +537,7 @@ do
main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
- test_i18ngrep "^Range-diff:$" 0000-* &&
+ test_grep "^Range-diff:$" 0000-* &&
grep "= 1: .* s/5/A" 0000-* &&
grep "= 2: .* s/4/A" 0000-* &&
grep "= 3: .* s/11/B" 0000-* &&
@@ -549,7 +549,7 @@ test_expect_success 'format-patch --range-diff as commentary' '
git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
test_when_finished "rm 0001-*" &&
test_line_count = 1 actual &&
- test_i18ngrep "^Range-diff:$" 0001-* &&
+ test_grep "^Range-diff:$" 0001-* &&
grep "> 1: .* new message" 0001-*
'
@@ -557,7 +557,7 @@ test_expect_success 'format-patch --range-diff reroll-count with a non-integer'
git format-patch --range-diff=HEAD~1 -v2.9 HEAD~1 >actual &&
test_when_finished "rm v2.9-0001-*" &&
test_line_count = 1 actual &&
- test_i18ngrep "^Range-diff:$" v2.9-0001-* &&
+ test_grep "^Range-diff:$" v2.9-0001-* &&
grep "> 1: .* new message" v2.9-0001-*
'
@@ -565,7 +565,7 @@ test_expect_success 'format-patch --range-diff reroll-count with a integer' '
git format-patch --range-diff=HEAD~1 -v2 HEAD~1 >actual &&
test_when_finished "rm v2-0001-*" &&
test_line_count = 1 actual &&
- test_i18ngrep "^Range-diff ..* v1:$" v2-0001-* &&
+ test_grep "^Range-diff ..* v1:$" v2-0001-* &&
grep "> 1: .* new message" v2-0001-*
'
@@ -573,7 +573,7 @@ test_expect_success 'format-patch --range-diff with v0' '
git format-patch --range-diff=HEAD~1 -v0 HEAD~1 >actual &&
test_when_finished "rm v0-0001-*" &&
test_line_count = 1 actual &&
- test_i18ngrep "^Range-diff:$" v0-0001-* &&
+ test_grep "^Range-diff:$" v0-0001-* &&
grep "> 1: .* new message" v0-0001-*
'
@@ -670,7 +670,7 @@ test_expect_success 'format-patch --range-diff does not compare notes by default
main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
- test_i18ngrep "^Range-diff:$" 0000-* &&
+ test_grep "^Range-diff:$" 0000-* &&
grep "= 1: .* s/5/A" 0000-* &&
grep "= 2: .* s/4/A" 0000-* &&
grep "= 3: .* s/11/B" 0000-* &&
@@ -687,7 +687,7 @@ test_expect_success 'format-patch --range-diff with --no-notes' '
main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
- test_i18ngrep "^Range-diff:$" 0000-* &&
+ test_grep "^Range-diff:$" 0000-* &&
grep "= 1: .* s/5/A" 0000-* &&
grep "= 2: .* s/4/A" 0000-* &&
grep "= 3: .* s/11/B" 0000-* &&
@@ -704,7 +704,7 @@ test_expect_success 'format-patch --range-diff with --notes' '
main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
- test_i18ngrep "^Range-diff:$" 0000-* &&
+ test_grep "^Range-diff:$" 0000-* &&
grep "= 1: .* s/5/A" 0000-* &&
grep "= 2: .* s/4/A" 0000-* &&
grep "= 3: .* s/11/B" 0000-* &&
@@ -733,7 +733,7 @@ test_expect_success 'format-patch --range-diff with format.notes config' '
main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
- test_i18ngrep "^Range-diff:$" 0000-* &&
+ test_grep "^Range-diff:$" 0000-* &&
grep "= 1: .* s/5/A" 0000-* &&
grep "= 2: .* s/4/A" 0000-* &&
grep "= 3: .* s/11/B" 0000-* &&
@@ -764,7 +764,7 @@ test_expect_success 'format-patch --range-diff with multiple notes' '
main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
- test_i18ngrep "^Range-diff:$" 0000-* &&
+ test_grep "^Range-diff:$" 0000-* &&
grep "= 1: .* s/5/A" 0000-* &&
grep "= 2: .* s/4/A" 0000-* &&
grep "= 3: .* s/11/B" 0000-* &&
diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index 7326adb70f..7f4e98db7d 100755
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -227,7 +227,7 @@ test_expect_success 'notice d/f conflict with existing directory' '
test_expect_success 'existing directory reports concrete ref' '
test_must_fail git branch foo 2>stderr &&
- test_i18ngrep refs/heads/foo/bar/baz stderr
+ test_grep refs/heads/foo/bar/baz stderr
'
test_expect_success 'notice d/f conflict with existing ref' '
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index d734000d2f..cf23c06c09 100755
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -1469,9 +1469,9 @@ test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' '
test_expect_success 'git notes copy diagnoses too many or too few arguments' '
test_must_fail git notes copy 2>error &&
- test_i18ngrep "too few arguments" error &&
+ test_grep "too few arguments" error &&
test_must_fail git notes copy one two three 2>error &&
- test_i18ngrep "too many arguments" error
+ test_grep "too many arguments" error
'
test_expect_success 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main' '
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh
index d3d72e25fe..60d6ed2dc8 100755
--- a/t/t3310-notes-merge-manual-resolve.sh
+++ b/t/t3310-notes-merge-manual-resolve.sh
@@ -216,7 +216,7 @@ test_expect_success 'merge z into m (== y) with default ("manual") resolver => C
git config core.notesRef refs/notes/m &&
test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
- test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
+ test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
test_cmp expect_conflicts output_conflicts &&
@@ -263,7 +263,7 @@ test_expect_success 'cannot do merge w/conflicts when previous merge is unfinish
test -d .git/NOTES_MERGE_WORKTREE &&
test_must_fail git notes merge z >output 2>&1 &&
# Output should indicate what is wrong
- test_i18ngrep -q "\\.git/NOTES_MERGE_\\* exists" output
+ test_grep -q "\\.git/NOTES_MERGE_\\* exists" output
'
# Setup non-conflicting merge between x and new notes ref w
@@ -417,7 +417,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol
git config core.notesRef refs/notes/m &&
test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
- test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
+ test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
test_cmp expect_conflicts output_conflicts &&
@@ -449,7 +449,7 @@ git rev-parse refs/notes/z > pre_merge_z
test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
- test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
+ test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
test_cmp expect_conflicts output_conflicts &&
@@ -528,7 +528,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol
git update-ref refs/notes/m refs/notes/y &&
test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
- test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
+ test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
test_cmp expect_conflicts output_conflicts &&
@@ -573,9 +573,9 @@ EOF
test "$(git rev-parse refs/notes/y)" = "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
test "$(git rev-parse refs/notes/m)" != "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
# Mention refs/notes/m, and its current and expected value in output
- test_i18ngrep -q "refs/notes/m" output &&
- test_i18ngrep -q "$(git rev-parse refs/notes/m)" output &&
- test_i18ngrep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output &&
+ test_grep -q "refs/notes/m" output &&
+ test_grep -q "$(git rev-parse refs/notes/m)" output &&
+ test_grep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output &&
# Verify that other notes refs has not changed (w, x, y and z)
verify_notes w &&
verify_notes x &&
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index bff0aea550..0fd33280cf 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -57,7 +57,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' '
cd worktree &&
git config core.notesRef refs/notes/y &&
test_must_fail git notes merge z 2>err &&
- test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err
+ test_grep "a notes merge into refs/notes/y is already in-progress at" err
) &&
test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF
'
@@ -67,7 +67,7 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' '
cd worktree2 &&
git config core.notesRef refs/notes/x &&
test_must_fail git notes merge z >out 2>&1 &&
- test_i18ngrep "Automatic notes merge failed" out &&
+ test_grep "Automatic notes merge failed" out &&
grep -v "A notes merge into refs/notes/x is already in-progress in" out
) &&
echo "refs/notes/x" >expect &&
diff --git a/t/t3321-notes-stripspace.sh b/t/t3321-notes-stripspace.sh
index 028d825e8f..33c1322989 100755
--- a/t/t3321-notes-stripspace.sh
+++ b/t/t3321-notes-stripspace.sh
@@ -428,7 +428,7 @@ test_expect_success 'add notes with empty messages' '
git notes add -m "${LF}" \
-m "${MULTI_LF}" \
-m "${LF}" >actual 2>&1 &&
- test_i18ngrep "Removing note for object" actual
+ test_grep "Removing note for object" actual
'
test_expect_success 'add note by specifying "-C", "--no-stripspace" is the default behavior' '
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 3ce918fdb8..621c8ef84c 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -143,8 +143,8 @@ test_expect_success 'Show verbose error when HEAD could not be detached' '
>B &&
test_when_finished "rm -f B" &&
test_must_fail git rebase topic 2>output.err >output.out &&
- test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
- test_i18ngrep B output.err
+ test_grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
+ test_grep B output.err
'
test_expect_success 'fail when upstream arg is missing and not on branch' '
@@ -421,7 +421,7 @@ test_expect_success 'refuse to switch to branch checked out elsewhere' '
git checkout main &&
git worktree add wt &&
test_must_fail git -C wt rebase main main 2>err &&
- test_i18ngrep "already checked out" err
+ test_grep "already checked out" err
'
test_expect_success MINGW,SYMLINKS_WINDOWS 'rebase when .git/logs is a symlink' '
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index e9e03ca4b5..5c67d07ba3 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -171,7 +171,7 @@ test_expect_success '--reapply-cherry-picks' '
# Regular rebase fails, because the 1-11 commit is deduplicated
test_must_fail git -C repo rebase --merge main 2> err &&
- test_i18ngrep "error: could not apply.*add 12 in another branch" err &&
+ test_grep "error: could not apply.*add 12 in another branch" err &&
git -C repo rebase --abort &&
# With --reapply-cherry-picks, it works
diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index f6e4864497..a1911c4a9d 100755
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -108,10 +108,10 @@ test_expect_success 'correct advice upon picking empty commit' '
test_when_finished "git rebase --abort" &&
test_must_fail git rebase -i --onto goodbye \
amended-goodbye^ amended-goodbye 2>err &&
- test_i18ngrep "previous cherry-pick is now empty" err &&
- test_i18ngrep "git rebase --skip" err &&
+ test_grep "previous cherry-pick is now empty" err &&
+ test_grep "git rebase --skip" err &&
test_must_fail git commit &&
- test_i18ngrep "git rebase --skip" err
+ test_grep "git rebase --skip" err
'
test_expect_success 'correct authorship when committing empty pick' '
@@ -131,10 +131,10 @@ test_expect_success 'correct advice upon rewording empty commit' '
test_must_fail env FAKE_LINES="reword 1" git rebase -i \
--onto goodbye amended-goodbye^ amended-goodbye 2>err
) &&
- test_i18ngrep "previous cherry-pick is now empty" err &&
- test_i18ngrep "git rebase --skip" err &&
+ test_grep "previous cherry-pick is now empty" err &&
+ test_grep "git rebase --skip" err &&
test_must_fail git commit &&
- test_i18ngrep "git rebase --skip" err
+ test_grep "git rebase --skip" err
'
test_expect_success 'correct advice upon editing empty commit' '
@@ -144,10 +144,10 @@ test_expect_success 'correct advice upon editing empty commit' '
test_must_fail env FAKE_LINES="edit 1" git rebase -i \
--onto goodbye amended-goodbye^ amended-goodbye 2>err
) &&
- test_i18ngrep "previous cherry-pick is now empty" err &&
- test_i18ngrep "git rebase --skip" err &&
+ test_grep "previous cherry-pick is now empty" err &&
+ test_grep "git rebase --skip" err &&
test_must_fail git commit &&
- test_i18ngrep "git rebase --skip" err
+ test_grep "git rebase --skip" err
'
test_expect_success 'correct advice upon cherry-picking an empty commit during a rebase' '
@@ -157,10 +157,10 @@ test_expect_success 'correct advice upon cherry-picking an empty commit during a
test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_amended-goodbye" \
git rebase -i goodbye^ goodbye 2>err
) &&
- test_i18ngrep "previous cherry-pick is now empty" err &&
- test_i18ngrep "git cherry-pick --skip" err &&
+ test_grep "previous cherry-pick is now empty" err &&
+ test_grep "git cherry-pick --skip" err &&
test_must_fail git commit 2>err &&
- test_i18ngrep "git cherry-pick --skip" err
+ test_grep "git cherry-pick --skip" err
'
test_expect_success 'correct advice upon multi cherry-pick picking an empty commit during a rebase' '
@@ -170,10 +170,10 @@ test_expect_success 'correct advice upon multi cherry-pick picking an empty comm
test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_goodbye_amended-goodbye" \
git rebase -i goodbye^^ goodbye 2>err
) &&
- test_i18ngrep "previous cherry-pick is now empty" err &&
- test_i18ngrep "git cherry-pick --skip" err &&
+ test_grep "previous cherry-pick is now empty" err &&
+ test_grep "git cherry-pick --skip" err &&
test_must_fail git commit 2>err &&
- test_i18ngrep "git cherry-pick --skip" err
+ test_grep "git cherry-pick --skip" err
'
test_expect_success 'fixup that empties commit fails' '
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 96a56aafbe..dbd5df5aa4 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -291,9 +291,9 @@ test_expect_success 'abort with error when new base cannot be checked out' '
git rm --cached file1 &&
git commit -m "remove file in base" &&
test_must_fail git rebase -i primary > output 2>&1 &&
- test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \
+ test_grep "The following untracked working tree files would be overwritten by checkout:" \
output &&
- test_i18ngrep "file1" output &&
+ test_grep "file1" output &&
test_path_is_missing .git/rebase-merge &&
rm file1 &&
git reset --hard HEAD^
@@ -604,7 +604,7 @@ test_expect_success 'clean error after failed "exec"' '
echo "edited again" > file7 &&
git add file7 &&
test_must_fail git rebase --continue 2>error &&
- test_i18ngrep "you have staged changes in your working tree" error
+ test_grep "you have staged changes in your working tree" error
'
test_expect_success 'rebase a detached HEAD' '
@@ -955,7 +955,7 @@ test_expect_success 'rebase --exec works without -i ' '
git reset --hard execute &&
rm -rf exec_output &&
EDITOR="echo >invoked_editor" git rebase --exec "echo a line >>exec_output" HEAD~2 2>actual &&
- test_i18ngrep "Successfully rebased and updated" actual &&
+ test_grep "Successfully rebased and updated" actual &&
test_line_count = 2 exec_output &&
test_path_is_missing invoked_editor
'
@@ -963,7 +963,7 @@ test_expect_success 'rebase --exec works without -i ' '
test_expect_success 'rebase -i --exec without <CMD>' '
git reset --hard execute &&
test_must_fail git rebase -i --exec 2>actual &&
- test_i18ngrep "requires a value" actual &&
+ test_grep "requires a value" actual &&
git checkout primary
'
@@ -1272,7 +1272,7 @@ test_expect_success 'todo count' '
test_set_editor "$(pwd)/dump-raw.sh" &&
git rebase -i HEAD~4 >actual
) &&
- test_i18ngrep "^# Rebase ..* onto ..* ([0-9]" actual
+ test_grep "^# Rebase ..* onto ..* ([0-9]" actual
'
test_expect_success 'rebase -i commits that overwrite untracked files (pick)' '
@@ -1379,7 +1379,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' '
FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual
) &&
test D = $(git cat-file commit HEAD | sed -ne \$p) &&
- test_i18ngrep \
+ test_grep \
"Successfully rebased and updated refs/heads/missing-commit" \
actual
'
@@ -1442,7 +1442,7 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = ig
git rebase --continue 2>actual
) &&
test D = $(git cat-file commit HEAD | sed -ne \$p) &&
- test_i18ngrep \
+ test_grep \
"Successfully rebased and updated refs/heads/missing-commit" \
actual
'
@@ -1477,7 +1477,7 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = wa
git rebase --continue 2>actual
) &&
test D = $(git cat-file commit HEAD | sed -ne \$p) &&
- test_i18ngrep \
+ test_grep \
"Successfully rebased and updated refs/heads/missing-commit" \
actual
'
@@ -1525,7 +1525,7 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = er
git rebase --continue 2>actual
) &&
test D = $(git cat-file commit HEAD | sed -ne \$p) &&
- test_i18ngrep \
+ test_grep \
"Successfully rebased and updated refs/heads/missing-commit" \
actual
'
@@ -1585,9 +1585,9 @@ test_expect_success 'static check of bad command' '
set_fake_editor &&
test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
git rebase -i --root 2>actual &&
- test_i18ngrep "pickled $(git rev-list --oneline -1 primary~1)" \
+ test_grep "pickled $(git rev-list --oneline -1 primary~1)" \
actual &&
- test_i18ngrep "You can fix this with .git rebase --edit-todo.." \
+ test_grep "You can fix this with .git rebase --edit-todo.." \
actual &&
FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo
) &&
@@ -1645,8 +1645,8 @@ test_expect_success 'static check of bad SHA-1' '
set_fake_editor &&
test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
git rebase -i --root 2>actual &&
- test_i18ngrep "edit XXXXXXX False commit" actual &&
- test_i18ngrep "You can fix this with .git rebase --edit-todo.." \
+ test_grep "edit XXXXXXX False commit" actual &&
+ test_grep "You can fix this with .git rebase --edit-todo.." \
actual &&
FAKE_LINES="1 2 4 5 6" git rebase --edit-todo
) &&
@@ -1673,7 +1673,7 @@ test_expect_success 'rebase -i --gpg-sign=<key-id>' '
FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
HEAD^ >out 2>err
) &&
- test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
+ test_grep "$SQ-S\"S I Gner\"$SQ" err
'
test_expect_success 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign' '
@@ -1684,7 +1684,7 @@ test_expect_success 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign' '
FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
HEAD^ >out 2>err
) &&
- test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
+ test_grep "$SQ-S\"S I Gner\"$SQ" err
'
test_expect_success 'valid author header after --root swap' '
@@ -1738,7 +1738,7 @@ test_expect_success 'correct error message for partial commit after empty pick'
) &&
echo x >file1 &&
test_must_fail git commit file1 2>err &&
- test_i18ngrep "cannot do a partial commit during a rebase." err
+ test_grep "cannot do a partial commit during a rebase." err
'
test_expect_success 'correct error message for commit --amend after empty pick' '
@@ -1751,13 +1751,13 @@ test_expect_success 'correct error message for commit --amend after empty pick'
) &&
echo x>file1 &&
test_must_fail git commit -a --amend 2>err &&
- test_i18ngrep "middle of a rebase -- cannot amend." err
+ test_grep "middle of a rebase -- cannot amend." err
'
test_expect_success 'todo has correct onto hash' '
GIT_SEQUENCE_EDITOR=cat git rebase -i no-conflict-branch~4 no-conflict-branch >actual &&
onto=$(git rev-parse --short HEAD~4) &&
- test_i18ngrep "^# Rebase ..* onto $onto" actual
+ test_grep "^# Rebase ..* onto $onto" actual
'
test_expect_success 'ORIG_HEAD is updated correctly' '
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index ceca160005..a1d7fa7f7c 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -33,24 +33,24 @@ test_expect_success 'rebase -m' '
test_expect_success 'rebase against main twice' '
git rebase --apply main >out &&
- test_i18ngrep "Current branch topic is up to date" out
+ test_grep "Current branch topic is up to date" out
'
test_expect_success 'rebase against main twice with --force' '
git rebase --force-rebase --apply main >out &&
- test_i18ngrep "Current branch topic is up to date, rebase forced" out
+ test_grep "Current branch topic is up to date, rebase forced" out
'
test_expect_success 'rebase against main twice from another branch' '
git checkout topic^ &&
git rebase --apply main topic >out &&
- test_i18ngrep "Current branch topic is up to date" out
+ test_grep "Current branch topic is up to date" out
'
test_expect_success 'rebase fast-forward to main' '
git checkout topic^ &&
git rebase --apply topic >out &&
- test_i18ngrep "Fast-forwarded HEAD to topic" out
+ test_grep "Fast-forwarded HEAD to topic" out
'
test_expect_success 'rebase --stat' '
@@ -75,14 +75,14 @@ test_expect_success 'rebase -n overrides config rebase.stat config' '
test_expect_success 'rebase --onto outputs the invalid ref' '
test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
- test_i18ngrep "invalid-ref" err
+ test_grep "invalid-ref" err
'
test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' '
test_must_fail git rebase -Cnot-a-number HEAD 2>err &&
- test_i18ngrep "numerical value" err &&
+ test_grep "numerical value" err &&
test_must_fail git rebase --whitespace=bad HEAD 2>err &&
- test_i18ngrep "Invalid whitespace option" err
+ test_grep "Invalid whitespace option" err
'
write_reflog_expect () {
@@ -251,8 +251,8 @@ test_expect_success 'rebase -i onto unrelated history' '
git -C unrelated remote add -f origin "$PWD" &&
git -C unrelated branch --set-upstream-to=origin/main &&
git -C unrelated -c core.editor=true rebase -i -v --stat >actual &&
- test_i18ngrep "Changes to " actual &&
- test_i18ngrep "5 files changed" actual
+ test_grep "Changes to " actual &&
+ test_grep "5 files changed" actual
'
test_done
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index fb7b68990c..108d5c28fa 100755
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -182,8 +182,8 @@ test_expect_success '--skip after failed fixup cleans commit message' '
: Final squash failed, but there was still a squash &&
head -n1 .git/copy.txt >first-line &&
- test_i18ngrep "# This is a combination of 3 commits" first-line &&
- test_i18ngrep "# This is the commit message #3:" .git/copy.txt
+ test_grep "# This is a combination of 3 commits" first-line &&
+ test_grep "# This is the commit message #3:" .git/copy.txt
'
test_expect_success 'setup rerere database' '
@@ -276,7 +276,7 @@ test_expect_success '--reschedule-failed-exec' '
test_must_fail git -c rebase.rescheduleFailedExec=true \
rebase -x false HEAD^ 2>err &&
grep "^exec false" .git/rebase-merge/git-rebase-todo &&
- test_i18ngrep "has been rescheduled" err
+ test_grep "has been rescheduled" err
'
test_expect_success 'rebase.rescheduleFailedExec only affects `rebase -i`' '
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
index 4bfc779bb8..0bb284d61d 100755
--- a/t/t3431-rebase-fork-point.sh
+++ b/t/t3431-rebase-fork-point.sh
@@ -84,7 +84,7 @@ test_expect_success 'git rebase --fork-point with ambigous refname' '
test_expect_success '--fork-point and --root both given' '
test_must_fail git rebase --fork-point --root 2>err &&
- test_i18ngrep "cannot be used together" err
+ test_grep "cannot be used together" err
'
test_expect_success 'rebase.forkPoint set to false' '
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index e2ef619323..3eac20c098 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -43,7 +43,7 @@ test_expect_success 'cherry-pick --nonsense' '
git diff --exit-code HEAD &&
test_must_fail git cherry-pick --nonsense 2>msg &&
git diff --exit-code HEAD "$pos" &&
- test_i18ngrep "[Uu]sage:" msg
+ test_grep "[Uu]sage:" msg
'
test_expect_success 'revert --nonsense' '
@@ -52,7 +52,7 @@ test_expect_success 'revert --nonsense' '
git diff --exit-code HEAD &&
test_must_fail git revert --nonsense 2>msg &&
git diff --exit-code HEAD "$pos" &&
- test_i18ngrep "[Uu]sage:" msg
+ test_grep "[Uu]sage:" msg
'
# the following two test cherry-pick and revert with renames
@@ -99,7 +99,7 @@ test_expect_success 'revert forbidden on dirty working tree' '
echo content >extra_file &&
git add extra_file &&
test_must_fail git revert HEAD 2>errors &&
- test_i18ngrep "your local changes would be overwritten by " errors
+ test_grep "your local changes would be overwritten by " errors
'
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index f32799e046..c88d597b12 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -177,7 +177,7 @@ test_expect_success 'partial commit of cherry-pick fails' '
git add foo &&
test_must_fail git commit foo 2>err &&
- test_i18ngrep "cannot do a partial commit during a cherry-pick." err
+ test_grep "cannot do a partial commit during a cherry-pick." err
'
test_expect_success 'commit --amend of cherry-pick fails' '
@@ -188,7 +188,7 @@ test_expect_success 'commit --amend of cherry-pick fails' '
git add foo &&
test_must_fail git commit --amend 2>err &&
- test_i18ngrep "in the middle of a cherry-pick -- cannot amend." err
+ test_grep "in the middle of a cherry-pick -- cannot amend." err
'
test_expect_success 'successful final commit clears cherry-pick state' '
@@ -498,7 +498,7 @@ test_expect_success \
test_expect_success 'failed cherry-pick does not forget -s' '
pristine_detach initial &&
test_must_fail git cherry-pick -s picked &&
- test_i18ngrep -e "Signed-off-by" .git/MERGE_MSG
+ test_grep -e "Signed-off-by" .git/MERGE_MSG
'
test_expect_success 'commit after failed cherry-pick does not add duplicated -s' '
@@ -563,7 +563,7 @@ test_expect_success 'cherry-pick preserves sparse-checkout' '
echo /unrelated >.git/info/sparse-checkout &&
git read-tree --reset -u HEAD &&
test_must_fail git cherry-pick -Xours picked>actual &&
- test_i18ngrep ! "Changes not staged for commit:" actual
+ test_grep ! "Changes not staged for commit:" actual
'
test_expect_success 'cherry-pick --continue remembers --keep-redundant-commits' '
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 3b0fa66c33..72020a51c4 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -154,7 +154,7 @@ test_expect_success 'skip "empty" commit' '
pristine_detach picked &&
test_commit dummy foo d &&
test_must_fail git cherry-pick anotherpick 2>err &&
- test_i18ngrep "git cherry-pick --skip" err &&
+ test_grep "git cherry-pick --skip" err &&
git cherry-pick --skip &&
test_cmp_rev dummy HEAD
'
@@ -314,7 +314,7 @@ test_expect_success '--abort does not unsafely change HEAD' '
git reset --hard base &&
test_must_fail git cherry-pick picked anotherpick &&
git cherry-pick --abort 2>actual &&
- test_i18ngrep "You seem to have moved HEAD" actual &&
+ test_grep "You seem to have moved HEAD" actual &&
test_cmp_rev base HEAD
'
@@ -520,7 +520,7 @@ test_expect_success '--continue asks for help after resolving patch to nil' '
test_cmp_rev unrelatedpick CHERRY_PICK_HEAD &&
git checkout HEAD -- unrelated &&
test_must_fail git cherry-pick --continue 2>msg &&
- test_i18ngrep "The previous cherry-pick is now empty" msg
+ test_grep "The previous cherry-pick is now empty" msg
'
test_expect_success 'follow advice and skip nil patch' '
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 0e8afe49ed..98259e2ada 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -276,7 +276,7 @@ test_expect_success 'Resolving by removal is not a warning-worthy event' '
blob=$(echo blob | git hash-object -w --stdin) &&
printf "100644 $blob %d\tblob\n" 1 2 3 | git update-index --index-info &&
git rm blob >msg 2>&1 &&
- test_i18ngrep ! "needs merge" msg &&
+ test_grep ! "needs merge" msg &&
test_must_fail git ls-files -s --error-unmatch blob
'
@@ -631,7 +631,7 @@ test_expect_success 'rm of a populated submodule with a .git directory migrates
test_path_is_missing submod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_file_not_empty actual &&
- test_i18ngrep Migrating output.err
+ test_grep Migrating output.err
'
cat >expect.deepmodified <<EOF
@@ -722,7 +722,7 @@ test_expect_success "rm absorbs submodule's nested .git directory" '
test_path_is_missing submod/subsubmod/.git &&
git status -s -uno --ignore-submodules=none >actual &&
test_file_not_empty actual &&
- test_i18ngrep Migrating output.err
+ test_grep Migrating output.err
'
test_expect_success 'checking out a commit after submodule removal needs manual updates' '
@@ -731,7 +731,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual
git submodule update &&
git checkout -q HEAD^ &&
git checkout -q main 2>actual &&
- test_i18ngrep "^warning: unable to rmdir '\''submod'\'':" actual &&
+ test_grep "^warning: unable to rmdir '\''submod'\'':" actual &&
git status -s submod >actual &&
echo "?? submod/" >expected &&
test_cmp expected actual &&
diff --git a/t/t3601-rm-pathspec-file.sh b/t/t3601-rm-pathspec-file.sh
index a2a0c820fe..7cef12981c 100755
--- a/t/t3601-rm-pathspec-file.sh
+++ b/t/t3601-rm-pathspec-file.sh
@@ -67,14 +67,14 @@ test_expect_success 'error conditions' '
echo fileA.t >list &&
test_must_fail git rm --pathspec-from-file=list -- fileA.t 2>err &&
- test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+ test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git rm --pathspec-file-nul 2>err &&
- test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+ test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
>empty_list &&
test_must_fail git rm --pathspec-from-file=empty_list 2>err &&
- test_i18ngrep -e "No pathspec was given. Which files should I remove?" err
+ test_grep -e "No pathspec was given. Which files should I remove?" err
'
test_done
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 7623689da2..f23d39f0d5 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -438,7 +438,7 @@ test_expect_success 'git add --chmod fails with non regular files (but updates t
test_ln_s_add foo foo3 &&
touch foo4 &&
test_must_fail git add --chmod=+x foo3 foo4 2>stderr &&
- test_i18ngrep "cannot chmod +x .foo3." stderr &&
+ test_grep "cannot chmod +x .foo3." stderr &&
test_mode_in_index 120000 foo3 &&
test_mode_in_index 100755 foo4
'
@@ -455,12 +455,12 @@ test_expect_success 'git add --chmod --dry-run reports error for non regular fil
git reset --hard &&
test_ln_s_add foo foo4 &&
test_must_fail git add --chmod=+x --dry-run foo4 2>stderr &&
- test_i18ngrep "cannot chmod +x .foo4." stderr
+ test_grep "cannot chmod +x .foo4." stderr
'
test_expect_success 'git add --chmod --dry-run reports error for unmatched pathspec' '
test_must_fail git add --chmod=+x --dry-run nonexistent 2>stderr &&
- test_i18ngrep "pathspec .nonexistent. did not match any files" stderr
+ test_grep "pathspec .nonexistent. did not match any files" stderr
'
test_expect_success 'no file status change if no pathspec is given' '
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 34aabb7f5f..0b5339ac6c 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -335,12 +335,12 @@ test_expect_success 'different prompts for mode change/deleted' '
test_expect_success 'correct message when there is nothing to do' '
git reset --hard &&
git add -p 2>err &&
- test_i18ngrep "No changes" err &&
+ test_grep "No changes" err &&
printf "\\0123" >binary &&
git add binary &&
printf "\\0abc" >binary &&
git add -p 2>err &&
- test_i18ngrep "Only binary files changed" err
+ test_grep "Only binary files changed" err
'
test_expect_success 'setup again' '
@@ -497,7 +497,7 @@ test_expect_success 'adding an empty file' '
echo y | git checkout -p added-file -- >actual &&
test_path_is_file empty &&
- test_i18ngrep "Apply addition to index and worktree" actual
+ test_grep "Apply addition to index and worktree" actual
)
'
@@ -838,7 +838,7 @@ test_expect_success 'diff.algorithm is passed to `git diff-files`' '
git add file &&
echo changed >file &&
test_must_fail git -c diff.algorithm=bogus add -p 2>err &&
- test_i18ngrep "error: option diff-algorithm accepts " err
+ test_grep "error: option diff-algorithm accepts " err
'
test_expect_success 'patch-mode via -i prompts for files' '
diff --git a/t/t3704-add-pathspec-file.sh b/t/t3704-add-pathspec-file.sh
index 4e6b5177c9..3aa59f6f63 100755
--- a/t/t3704-add-pathspec-file.sh
+++ b/t/t3704-add-pathspec-file.sh
@@ -138,23 +138,23 @@ test_expect_success 'error conditions' '
>empty_list &&
test_must_fail git add --pathspec-from-file=list --interactive 2>err &&
- test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+ test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
test_must_fail git add --pathspec-from-file=list --patch 2>err &&
- test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+ test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
test_must_fail git add --pathspec-from-file=list --edit 2>err &&
- test_i18ngrep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err &&
+ test_grep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err &&
test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err &&
- test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+ test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git add --pathspec-file-nul 2>err &&
- test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+ test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
# This case succeeds, but still prints to stderr
git add --pathspec-from-file=empty_list 2>err &&
- test_i18ngrep -e "Nothing specified, nothing added." err
+ test_grep -e "Nothing specified, nothing added." err
'
test_done
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index bfab245eb3..f27d09cfd9 100755
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -45,7 +45,7 @@ test_expect_success 'UTF-8 invalid characters refused' '
printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
>"$HOME/invalid" &&
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
- test_i18ngrep "did not conform" "$HOME"/stderr
+ test_grep "did not conform" "$HOME"/stderr
'
test_expect_success 'UTF-8 overlong sequences rejected' '
@@ -55,7 +55,7 @@ test_expect_success 'UTF-8 overlong sequences rejected' '
printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
>"$HOME/invalid" &&
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
- test_i18ngrep "did not conform" "$HOME"/stderr
+ test_grep "did not conform" "$HOME"/stderr
'
test_expect_success 'UTF-8 non-characters refused' '
@@ -64,7 +64,7 @@ test_expect_success 'UTF-8 non-characters refused' '
printf "Commit message\n\nNon-character:\364\217\277\276\n" \
>"$HOME/invalid" &&
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
- test_i18ngrep "did not conform" "$HOME"/stderr
+ test_grep "did not conform" "$HOME"/stderr
'
test_expect_success 'UTF-8 non-characters refused' '
@@ -73,7 +73,7 @@ test_expect_success 'UTF-8 non-characters refused' '
printf "Commit message\n\nNon-character:\357\267\220\n" \
>"$HOME/invalid" &&
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
- test_i18ngrep "did not conform" "$HOME"/stderr
+ test_grep "did not conform" "$HOME"/stderr
'
for H in ISO8859-1 eucJP ISO-2022-JP
diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh
index 4f16a735d9..4b37f78829 100755
--- a/t/t3901-i18n-patch.sh
+++ b/t/t3901-i18n-patch.sh
@@ -298,7 +298,7 @@ test_expect_success 'am --no-utf8 (U/L)' '
# commit-tree will warn that the commit message does not contain valid UTF-8
# as mailinfo did not convert it
- test_i18ngrep "did not conform" err &&
+ test_grep "did not conform" err &&
check_encoding 2
'
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 0b3dfeaea2..3bec71f056 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -395,7 +395,7 @@ test_expect_success 'stash --staged' '
test_expect_success 'dont assume push with non-option args' '
test_must_fail git stash -q drop 2>err &&
- test_i18ngrep -e "subcommand wasn'\''t specified; '\''push'\'' can'\''t be assumed due to unexpected token '\''drop'\''" err
+ test_grep -e "subcommand wasn'\''t specified; '\''push'\'' can'\''t be assumed due to unexpected token '\''drop'\''" err
'
test_expect_success 'stash --invalid-option' '
@@ -596,7 +596,7 @@ test_expect_success 'giving too many ref arguments does not modify files' '
for type in apply pop "branch stash-branch"
do
test_must_fail git stash $type stash@{0} stash@{1} 2>err &&
- test_i18ngrep "Too many revisions" err &&
+ test_grep "Too many revisions" err &&
test 123456789 = $(test-tool chmtime -g file2) || return 1
done
'
@@ -604,14 +604,14 @@ test_expect_success 'giving too many ref arguments does not modify files' '
test_expect_success 'drop: too many arguments errors out (does nothing)' '
git stash list >expect &&
test_must_fail git stash drop stash@{0} stash@{1} 2>err &&
- test_i18ngrep "Too many revisions" err &&
+ test_grep "Too many revisions" err &&
git stash list >actual &&
test_cmp expect actual
'
test_expect_success 'show: too many arguments errors out (does nothing)' '
test_must_fail git stash show stash@{0} stash@{1} 2>err 1>out &&
- test_i18ngrep "Too many revisions" err &&
+ test_grep "Too many revisions" err &&
test_must_be_empty out
'
@@ -654,7 +654,7 @@ test_expect_success 'stash branch - stashes on stack, stash-like argument' '
test_expect_success 'stash branch complains with no arguments' '
test_must_fail git stash branch 2>err &&
- test_i18ngrep "No branch name specified" err
+ test_grep "No branch name specified" err
'
test_expect_success 'stash show format defaults to --stat' '
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index 5390eec4e3..1289ae3e07 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -404,7 +404,7 @@ test_expect_success 'stash show --include-untracked errors on duplicate files' '
) &&
w_commit=$(git commit-tree -p HEAD -p "$i_commit" -p "$u_commit" -m "WIP on any-branch" "$tree") &&
test_must_fail git stash show --include-untracked "$w_commit" 2>err &&
- test_i18ngrep "worktree and untracked commit have duplicate entries: tracked" err
+ test_grep "worktree and untracked commit have duplicate entries: tracked" err
'
test_expect_success 'stash show --{include,only}-untracked on stashes without untracked entries' '
diff --git a/t/t3909-stash-pathspec-file.sh b/t/t3909-stash-pathspec-file.sh
index dead9f18d9..73f2dbdeb0 100755
--- a/t/t3909-stash-pathspec-file.sh
+++ b/t/t3909-stash-pathspec-file.sh
@@ -88,13 +88,13 @@ test_expect_success 'error conditions' '
echo fileA.t >list &&
test_must_fail git stash push --pathspec-from-file=list --patch 2>err &&
- test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
+ test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
test_must_fail git stash push --pathspec-from-file=list -- fileA.t 2>err &&
- test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+ test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git stash push --pathspec-file-nul 2>err &&
- test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
+ test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
'
test_done
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 3dc9047044..85be1367de 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -135,25 +135,25 @@ test_expect_success 'favour same basenames over different ones' '
mkdir subdir &&
git mv another-path subdir/path1 &&
git status >out &&
- test_i18ngrep "renamed: .*path1 -> subdir/path1" out
+ test_grep "renamed: .*path1 -> subdir/path1" out
'
test_expect_success 'test diff.renames=true for git status' '
git -c diff.renames=true status >out &&
- test_i18ngrep "renamed: .*path1 -> subdir/path1" out
+ test_grep "renamed: .*path1 -> subdir/path1" out
'
test_expect_success 'test diff.renames=false for git status' '
git -c diff.renames=false status >out &&
- test_i18ngrep ! "renamed: .*path1 -> subdir/path1" out &&
- test_i18ngrep "new file: .*subdir/path1" out &&
- test_i18ngrep "deleted: .*[^/]path1" out
+ test_grep ! "renamed: .*path1 -> subdir/path1" out &&
+ test_grep "new file: .*subdir/path1" out &&
+ test_grep "deleted: .*[^/]path1" out
'
test_expect_success 'favour same basenames even with minor differences' '
git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
git status >out &&
- test_i18ngrep "renamed: .*path1 -> subdir/path1" out
+ test_grep "renamed: .*path1 -> subdir/path1" out
'
test_expect_success 'two files with same basename and same content' '
@@ -165,7 +165,7 @@ test_expect_success 'two files with same basename and same content' '
git commit -m 2 &&
git mv dir other-dir &&
git status >out &&
- test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file" out
+ test_grep "renamed: .*dir/A/file -> other-dir/A/file" out
'
test_expect_success 'setup for many rename source candidates' '
@@ -202,9 +202,9 @@ test_expect_success 'rename pretty print with nothing in common' '
git mv a/b/c c/b/a &&
git commit -m "a/b/c -> c/b/a" &&
git diff -M --summary HEAD^ HEAD >output &&
- test_i18ngrep " a/b/c => c/b/a " output &&
+ test_grep " a/b/c => c/b/a " output &&
git diff -M --stat HEAD^ HEAD >output &&
- test_i18ngrep " a/b/c => c/b/a " output
+ test_grep " a/b/c => c/b/a " output
'
test_expect_success 'rename pretty print with common prefix' '
@@ -212,9 +212,9 @@ test_expect_success 'rename pretty print with common prefix' '
git mv c/b/a c/d/e &&
git commit -m "c/b/a -> c/d/e" &&
git diff -M --summary HEAD^ HEAD >output &&
- test_i18ngrep " c/{b/a => d/e} " output &&
+ test_grep " c/{b/a => d/e} " output &&
git diff -M --stat HEAD^ HEAD >output &&
- test_i18ngrep " c/{b/a => d/e} " output
+ test_grep " c/{b/a => d/e} " output
'
test_expect_success 'rename pretty print with common suffix' '
@@ -222,9 +222,9 @@ test_expect_success 'rename pretty print with common suffix' '
git mv c/d/e d/e &&
git commit -m "c/d/e -> d/e" &&
git diff -M --summary HEAD^ HEAD >output &&
- test_i18ngrep " {c/d => d}/e " output &&
+ test_grep " {c/d => d}/e " output &&
git diff -M --stat HEAD^ HEAD >output &&
- test_i18ngrep " {c/d => d}/e " output
+ test_grep " {c/d => d}/e " output
'
test_expect_success 'rename pretty print with common prefix and suffix' '
@@ -232,9 +232,9 @@ test_expect_success 'rename pretty print with common prefix and suffix' '
git mv d/e d/f/e &&
git commit -m "d/e -> d/f/e" &&
git diff -M --summary HEAD^ HEAD >output &&
- test_i18ngrep " d/{ => f}/e " output &&
+ test_grep " d/{ => f}/e " output &&
git diff -M --stat HEAD^ HEAD >output &&
- test_i18ngrep " d/{ => f}/e " output
+ test_grep " d/{ => f}/e " output
'
test_expect_success 'rename pretty print common prefix and suffix overlap' '
@@ -242,9 +242,9 @@ test_expect_success 'rename pretty print common prefix and suffix overlap' '
git mv d/f/e d/f/f/e &&
git commit -m "d/f/e d/f/f/e" &&
git diff -M --summary HEAD^ HEAD >output &&
- test_i18ngrep " d/f/{ => f}/e " output &&
+ test_grep " d/f/{ => f}/e " output &&
git diff -M --stat HEAD^ HEAD >output &&
- test_i18ngrep " d/f/{ => f}/e " output
+ test_grep " d/f/{ => f}/e " output
'
test_expect_success 'diff-tree -l0 defaults to a big rename limit, not zero' '
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 5de1d19075..86f3693bc0 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -613,7 +613,7 @@ test_expect_success 'diff -I<regex> --stat' '
test_expect_success 'diff -I<regex>: detect malformed regex' '
test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error &&
- test_i18ngrep "invalid regex given to -I: " error
+ test_grep "invalid regex given to -I: " error
'
# check_prefix <patch> <src> <dst>
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 3cf2b7a7fb..7abd307c5c 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -2369,25 +2369,25 @@ test_expect_success 'interdiff: cover-letter' '
--q
EOF
git format-patch --cover-letter --interdiff=boop~2 -1 boop &&
- test_i18ngrep "^Interdiff:$" 0000-cover-letter.patch &&
- test_i18ngrep ! "^Interdiff:$" 0001-fleep.patch &&
+ test_grep "^Interdiff:$" 0000-cover-letter.patch &&
+ test_grep ! "^Interdiff:$" 0001-fleep.patch &&
sed "1,/^@@ /d; /^-- $/q" 0000-cover-letter.patch >actual &&
test_cmp expect actual
'
test_expect_success 'interdiff: reroll-count' '
git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop &&
- test_i18ngrep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch
+ test_grep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch
'
test_expect_success 'interdiff: reroll-count with a non-integer' '
git format-patch --cover-letter --interdiff=boop~2 -v2.2 -1 boop &&
- test_i18ngrep "^Interdiff:$" v2.2-0000-cover-letter.patch
+ test_grep "^Interdiff:$" v2.2-0000-cover-letter.patch
'
test_expect_success 'interdiff: reroll-count with a integer' '
git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop &&
- test_i18ngrep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch
+ test_grep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch
'
test_expect_success 'interdiff: solo-patch' '
@@ -2396,7 +2396,7 @@ test_expect_success 'interdiff: solo-patch' '
EOF
git format-patch --interdiff=boop~2 -1 boop &&
- test_i18ngrep "^Interdiff:$" 0001-fleep.patch &&
+ test_grep "^Interdiff:$" 0001-fleep.patch &&
sed "1,/^ @@ /d; /^$/q" 0001-fleep.patch >actual &&
test_cmp expect actual
'
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index b298f220e0..730f025360 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -909,7 +909,7 @@ test_expect_success 'combined diff with autocrlf conversion' '
git commit -m "the other side" x &&
git config core.autocrlf true &&
test_must_fail git merge one-side >actual &&
- test_i18ngrep "Automatic merge failed" actual &&
+ test_grep "Automatic merge failed" actual &&
git diff >actual.raw &&
sed -e "1,/^@@@/d" actual.raw >actual &&
@@ -2187,27 +2187,27 @@ test_expect_success 'compare whitespace delta across moved blocks' '
test_expect_success 'bogus settings in move detection erroring out' '
test_must_fail git diff --color-moved=bogus 2>err &&
- test_i18ngrep "must be one of" err &&
- test_i18ngrep bogus err &&
+ test_grep "must be one of" err &&
+ test_grep bogus err &&
test_must_fail git -c diff.colormoved=bogus diff 2>err &&
- test_i18ngrep "must be one of" err &&
- test_i18ngrep "from command-line config" err &&
+ test_grep "must be one of" err &&
+ test_grep "from command-line config" err &&
test_must_fail git diff --color-moved-ws=bogus 2>err &&
- test_i18ngrep "possible values" err &&
- test_i18ngrep bogus err &&
+ test_grep "possible values" err &&
+ test_grep bogus err &&
test_must_fail git -c diff.colormovedws=bogus diff 2>err &&
- test_i18ngrep "possible values" err &&
- test_i18ngrep "from command-line config" err
+ test_grep "possible values" err &&
+ test_grep "from command-line config" err
'
test_expect_success 'compare whitespace delta incompatible with other space options' '
test_must_fail git diff \
--color-moved-ws=allow-indentation-change,ignore-all-space \
2>err &&
- test_i18ngrep allow-indentation-change err
+ test_grep allow-indentation-change err
'
EMPTY=''
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index c8d555771d..e026fac1f4 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -53,15 +53,15 @@ do
echo "*.java diff=$p" >.gitattributes &&
test_expect_code 1 git diff --no-index \
A.java B.java 2>msg &&
- test_i18ngrep ! fatal msg &&
- test_i18ngrep ! error msg
+ test_grep ! fatal msg &&
+ test_grep ! error msg
'
test_expect_success "builtin $p wordRegex pattern compiles" '
echo "*.java diff=$p" >.gitattributes &&
test_expect_code 1 git diff --no-index --word-diff \
A.java B.java 2>msg &&
- test_i18ngrep ! fatal msg &&
- test_i18ngrep ! error msg
+ test_grep ! fatal msg &&
+ test_grep ! error msg
'
test_expect_success "builtin $p pattern compiles on bare repo with --attr-source" '
@@ -79,8 +79,8 @@ do
git -C bare.git symbolic-ref HEAD refs/heads/master &&
test_expect_code 1 git -C bare.git --attr-source=branchA \
diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
- test_i18ngrep ! fatal msg &&
- test_i18ngrep ! error msg
+ test_grep ! fatal msg &&
+ test_grep ! error msg
'
done
@@ -88,7 +88,7 @@ test_expect_success 'last regexp must not be negated' '
echo "*.java diff=java" >.gitattributes &&
test_config diff.java.funcname "!static" &&
test_expect_code 128 git diff --no-index A.java B.java 2>msg &&
- test_i18ngrep ": Last expression must not be negated:" msg
+ test_grep ": Last expression must not be negated:" msg
'
test_expect_success 'setup hunk header tests' '
diff --git a/t/t4031-diff-rewrite-binary.sh b/t/t4031-diff-rewrite-binary.sh
index eacc6694f7..c4394a27b5 100755
--- a/t/t4031-diff-rewrite-binary.sh
+++ b/t/t4031-diff-rewrite-binary.sh
@@ -53,7 +53,7 @@ test_expect_success 'rewrite diff --numstat shows binary changes' '
test_expect_success 'diff --stat counts binary rewrite as 0 lines' '
git diff -B --stat --summary >diff &&
grep "Bin" diff &&
- test_i18ngrep "0 insertions.*0 deletions" diff &&
+ test_grep "0 insertions.*0 deletions" diff &&
grep " rewrite file" diff
'
diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh
index 70224c3da1..7b73462d53 100755
--- a/t/t4047-diff-dirstat.sh
+++ b/t/t4047-diff-dirstat.sh
@@ -943,37 +943,37 @@ test_expect_success '--dirstat=future_param,lines,0 should fail loudly' '
test_must_fail git diff --dirstat=future_param,lines,0 HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
test_debug "cat actual_error" &&
test_must_be_empty actual_diff_dirstat &&
- test_i18ngrep -q "future_param" actual_error &&
- test_i18ngrep -q "\--dirstat" actual_error
+ test_grep -q "future_param" actual_error &&
+ test_grep -q "\--dirstat" actual_error
'
test_expect_success '--dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters' '
test_must_fail git diff --dirstat=dummy1,cumulative,2dummy HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
test_debug "cat actual_error" &&
test_must_be_empty actual_diff_dirstat &&
- test_i18ngrep -q "dummy1" actual_error &&
- test_i18ngrep -q "2dummy" actual_error &&
- test_i18ngrep -q "\--dirstat" actual_error
+ test_grep -q "dummy1" actual_error &&
+ test_grep -q "2dummy" actual_error &&
+ test_grep -q "\--dirstat" actual_error
'
test_expect_success 'diff.dirstat=future_param,0,lines should warn, but still work' '
git -c diff.dirstat=future_param,0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
test_debug "cat actual_error" &&
test_cmp expect_diff_dirstat actual_diff_dirstat &&
- test_i18ngrep -q "future_param" actual_error &&
- test_i18ngrep -q "diff\\.dirstat" actual_error &&
+ test_grep -q "future_param" actual_error &&
+ test_grep -q "diff\\.dirstat" actual_error &&
git -c diff.dirstat=future_param,0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M 2>actual_error &&
test_debug "cat actual_error" &&
test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
- test_i18ngrep -q "future_param" actual_error &&
- test_i18ngrep -q "diff\\.dirstat" actual_error &&
+ test_grep -q "future_param" actual_error &&
+ test_grep -q "diff\\.dirstat" actual_error &&
git -c diff.dirstat=future_param,0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC 2>actual_error &&
test_debug "cat actual_error" &&
test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC &&
- test_i18ngrep -q "future_param" actual_error &&
- test_i18ngrep -q "diff\\.dirstat" actual_error
+ test_grep -q "future_param" actual_error &&
+ test_grep -q "diff\\.dirstat" actual_error
'
test_expect_success '--shortstat --dirstat should output only one dirstat' '
diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh
index 6781cc9078..5a5d958b96 100755
--- a/t/t4053-diff-no-index.sh
+++ b/t/t4053-diff-no-index.sh
@@ -56,7 +56,7 @@ test_expect_success 'git diff --no-index executed outside repo gives correct err
export GIT_CEILING_DIRECTORIES &&
cd non/git &&
test_must_fail git diff --no-index a 2>actual.err &&
- test_i18ngrep "usage: git diff --no-index" actual.err
+ test_grep "usage: git diff --no-index" actual.err
)
'
diff --git a/t/t4055-diff-context.sh b/t/t4055-diff-context.sh
index 73048d0a52..3ea9ae99e0 100755
--- a/t/t4055-diff-context.sh
+++ b/t/t4055-diff-context.sh
@@ -74,13 +74,13 @@ test_expect_success 'plumbing not affected' '
test_expect_success 'non-integer config parsing' '
git config diff.context no &&
test_must_fail git diff 2>output &&
- test_i18ngrep "bad numeric config value" output
+ test_grep "bad numeric config value" output
'
test_expect_success 'negative integer config parsing' '
git config diff.context -1 &&
test_must_fail git diff 2>output &&
- test_i18ngrep "bad config variable" output
+ test_grep "bad config variable" output
'
test_expect_success '-U0 is valid, so is diff.context=0' '
diff --git a/t/t4068-diff-symmetric-merge-base.sh b/t/t4068-diff-symmetric-merge-base.sh
index 2d650d8f10..3356d91cd4 100755
--- a/t/t4068-diff-symmetric-merge-base.sh
+++ b/t/t4068-diff-symmetric-merge-base.sh
@@ -68,27 +68,27 @@ test_expect_success 'diff with two merge bases' '
test_expect_success 'diff with no merge bases' '
test_must_fail git diff br2...br3 2>err &&
- test_i18ngrep "fatal: br2...br3: no merge base" err
+ test_grep "fatal: br2...br3: no merge base" err
'
test_expect_success 'diff with too many symmetric differences' '
test_must_fail git diff br1...main br2...br3 2>err &&
- test_i18ngrep "usage" err
+ test_grep "usage" err
'
test_expect_success 'diff with symmetric difference and extraneous arg' '
test_must_fail git diff main br1...main 2>err &&
- test_i18ngrep "usage" err
+ test_grep "usage" err
'
test_expect_success 'diff with two ranges' '
test_must_fail git diff main br1..main br2..br3 2>err &&
- test_i18ngrep "usage" err
+ test_grep "usage" err
'
test_expect_success 'diff with ranges and extra arg' '
test_must_fail git diff main br1..main commit-D 2>err &&
- test_i18ngrep "usage" err
+ test_grep "usage" err
'
test_expect_success 'diff --merge-base with no commits' '
@@ -97,7 +97,7 @@ test_expect_success 'diff --merge-base with no commits' '
test_expect_success 'diff --merge-base with three commits' '
test_must_fail git diff --merge-base br1 br2 main 2>err &&
- test_i18ngrep "usage" err
+ test_grep "usage" err
'
for cmd in diff-index diff
@@ -143,19 +143,19 @@ do
test_expect_success "$cmd --merge-base with non-commit" '
git checkout main &&
test_must_fail git $cmd --merge-base main^{tree} 2>err &&
- test_i18ngrep "fatal: --merge-base only works with commits" err
+ test_grep "fatal: --merge-base only works with commits" err
'
test_expect_success "$cmd --merge-base with no merge bases and one commit" '
git checkout main &&
test_must_fail git $cmd --merge-base br3 2>err &&
- test_i18ngrep "fatal: no merge base found" err
+ test_grep "fatal: no merge base found" err
'
test_expect_success "$cmd --merge-base with multiple merge bases and one commit" '
git checkout main &&
test_must_fail git $cmd --merge-base br1 2>err &&
- test_i18ngrep "fatal: multiple merge bases found" err
+ test_grep "fatal: multiple merge bases found" err
'
done
@@ -169,28 +169,28 @@ do
test_expect_success "$cmd --merge-base commit and non-commit" '
test_must_fail git $cmd --merge-base br2 main^{tree} 2>err &&
- test_i18ngrep "fatal: --merge-base only works with commits" err
+ test_grep "fatal: --merge-base only works with commits" err
'
test_expect_success "$cmd --merge-base with no merge bases and two commits" '
test_must_fail git $cmd --merge-base br2 br3 2>err &&
- test_i18ngrep "fatal: no merge base found" err
+ test_grep "fatal: no merge base found" err
'
test_expect_success "$cmd --merge-base with multiple merge bases and two commits" '
test_must_fail git $cmd --merge-base main br1 2>err &&
- test_i18ngrep "fatal: multiple merge bases found" err
+ test_grep "fatal: multiple merge bases found" err
'
done
test_expect_success 'diff-tree --merge-base with one commit' '
test_must_fail git diff-tree --merge-base main 2>err &&
- test_i18ngrep "fatal: --merge-base only works with two commits" err
+ test_grep "fatal: --merge-base only works with two commits" err
'
test_expect_success 'diff --merge-base with range' '
test_must_fail git diff --merge-base br2..br3 2>err &&
- test_i18ngrep "fatal: --merge-base does not work with ranges" err
+ test_grep "fatal: --merge-base does not work with ranges" err
'
test_done
diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
index a22a90d552..cbef0a593f 100755
--- a/t/t4115-apply-symlink.sh
+++ b/t/t4115-apply-symlink.sh
@@ -136,7 +136,7 @@ test_expect_success SYMLINKS '--reject removes .rej symlink if it exists' '
ln -s foo file.t.rej &&
test_must_fail git apply patch --reject 2>err &&
- test_i18ngrep "Rejected hunk" err &&
+ test_grep "Rejected hunk" err &&
test_path_is_missing foo &&
test_path_is_file file.t.rej
'
diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh
index 497b62868d..697e86c0ff 100755
--- a/t/t4120-apply-popt.sh
+++ b/t/t4120-apply-popt.sh
@@ -31,7 +31,7 @@ test_expect_success 'apply git diff with -p2' '
test_expect_success 'apply with too large -p' '
cp file1.saved file1 &&
test_must_fail git apply --stat -p3 patch.file 2>err &&
- test_i18ngrep "removing 3 leading" err
+ test_grep "removing 3 leading" err
'
test_expect_success 'apply (-p2) traditional diff with funny filenames' '
@@ -53,7 +53,7 @@ test_expect_success 'apply (-p2) traditional diff with funny filenames' '
test_expect_success 'apply with too large -p and fancy filename' '
cp file1.saved file1 &&
test_must_fail git apply --stat -p3 patch.escaped 2>err &&
- test_i18ngrep "removing 3 leading" err
+ test_grep "removing 3 leading" err
'
test_expect_success 'apply (-p2) diff, mode change only' '
diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh
index 9696537303..2089d84f64 100755
--- a/t/t4122-apply-symlink-inside.sh
+++ b/t/t4122-apply-symlink-inside.sh
@@ -95,19 +95,19 @@ test_expect_success SYMLINKS 'do not follow symbolic link (same input)' '
# same input creates a confusing symbolic link
test_must_fail git apply patch 2>error-wt &&
- test_i18ngrep "beyond a symbolic link" error-wt &&
+ test_grep "beyond a symbolic link" error-wt &&
test_path_is_missing arch/x86_64/dir &&
test_path_is_missing arch/i386/dir/file &&
test_must_fail git apply --index patch 2>error-ix &&
- test_i18ngrep "beyond a symbolic link" error-ix &&
+ test_grep "beyond a symbolic link" error-ix &&
test_path_is_missing arch/x86_64/dir &&
test_path_is_missing arch/i386/dir/file &&
test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
test_must_fail git ls-files --error-unmatch arch/i386/dir &&
test_must_fail git apply --cached patch 2>error-ct &&
- test_i18ngrep "beyond a symbolic link" error-ct &&
+ test_grep "beyond a symbolic link" error-ct &&
test_must_fail git ls-files --error-unmatch arch/x86_64/dir &&
test_must_fail git ls-files --error-unmatch arch/i386/dir &&
@@ -135,23 +135,23 @@ test_expect_success SYMLINKS 'do not follow symbolic link (existing)' '
git add arch/x86_64/dir &&
test_must_fail git apply add_file.patch 2>error-wt-add &&
- test_i18ngrep "beyond a symbolic link" error-wt-add &&
+ test_grep "beyond a symbolic link" error-wt-add &&
test_path_is_missing arch/i386/dir/file &&
mkdir arch/i386/dir &&
>arch/i386/dir/file &&
test_must_fail git apply del_file.patch 2>error-wt-del &&
- test_i18ngrep "beyond a symbolic link" error-wt-del &&
+ test_grep "beyond a symbolic link" error-wt-del &&
test_path_is_file arch/i386/dir/file &&
rm arch/i386/dir/file &&
test_must_fail git apply --index add_file.patch 2>error-ix-add &&
- test_i18ngrep "beyond a symbolic link" error-ix-add &&
+ test_grep "beyond a symbolic link" error-ix-add &&
test_path_is_missing arch/i386/dir/file &&
test_must_fail git ls-files --error-unmatch arch/i386/dir &&
test_must_fail git apply --cached add_file.patch 2>error-ct-file &&
- test_i18ngrep "beyond a symbolic link" error-ct-file &&
+ test_grep "beyond a symbolic link" error-ct-file &&
test_must_fail git ls-files --error-unmatch arch/i386/dir
'
diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
index a1c7686519..e7a7295f1b 100755
--- a/t/t4129-apply-samemode.sh
+++ b/t/t4129-apply-samemode.sh
@@ -66,13 +66,13 @@ test_expect_success FILEMODE 'mode update (index only)' '
test_expect_success FILEMODE 'empty mode is rejected' '
git reset --hard &&
test_must_fail git apply patch-empty-mode.txt 2>err &&
- test_i18ngrep "invalid mode" err
+ test_grep "invalid mode" err
'
test_expect_success FILEMODE 'bogus mode is rejected' '
git reset --hard &&
test_must_fail git apply patch-bogus-mode.txt 2>err &&
- test_i18ngrep "invalid mode" err
+ test_grep "invalid mode" err
'
test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree files' '
diff --git a/t/t4133-apply-filenames.sh b/t/t4133-apply-filenames.sh
index 35f1060bc8..c21ddb2946 100755
--- a/t/t4133-apply-filenames.sh
+++ b/t/t4133-apply-filenames.sh
@@ -32,9 +32,9 @@ EOF
test_expect_success 'apply diff with inconsistent filenames in headers' '
test_must_fail git apply bad1.patch 2>err &&
- test_i18ngrep "inconsistent new filename" err &&
+ test_grep "inconsistent new filename" err &&
test_must_fail git apply bad2.patch 2>err &&
- test_i18ngrep "inconsistent old filename" err
+ test_grep "inconsistent old filename" err
'
test_expect_success 'apply diff with new filename missing from headers' '
@@ -46,7 +46,7 @@ test_expect_success 'apply diff with new filename missing from headers' '
+1
EOF
test_must_fail git apply missing_new_filename.diff 2>err &&
- test_i18ngrep "lacks filename information" err
+ test_grep "lacks filename information" err
'
test_expect_success 'apply diff with old filename missing from headers' '
@@ -58,7 +58,7 @@ test_expect_success 'apply diff with old filename missing from headers' '
-1
EOF
test_must_fail git apply missing_old_filename.diff 2>err &&
- test_i18ngrep "lacks filename information" err
+ test_grep "lacks filename information" err
'
test_done
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 2935fe1b2d..3b12576269 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -779,7 +779,7 @@ test_expect_success 'am --resolved fails if index has unmerged entries' '
test_must_fail git am --resolved >err &&
test_path_is_dir .git/rebase-apply &&
test_cmp_rev second HEAD &&
- test_i18ngrep "still have unmerged paths" err
+ test_grep "still have unmerged paths" err
'
test_expect_success 'am takes patches from a Pine mailbox' '
@@ -913,7 +913,7 @@ test_expect_success 'am newline in subject' '
test_tick &&
sed -e "s/second/second \\\n foo/" patch1 >patchnl &&
git am <patchnl >output.out 2>&1 &&
- test_i18ngrep "^Applying: second \\\n foo$" output.out
+ test_grep "^Applying: second \\\n foo$" output.out
'
test_expect_success 'am -q is quiet' '
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index 5ed7e22827..edb38da701 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -46,7 +46,7 @@ do
test_expect_success "am$with3 --skip continue after failed am$with3" '
test_must_fail git am$with3 --skip >output &&
- test_i18ngrep "^Applying: 6$" output &&
+ test_grep "^Applying: 6$" output &&
test_cmp file-2-expect file-2 &&
test ! -f .git/MERGE_RR
'
diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh
index b7c3861407..4add7c7757 100755
--- a/t/t4153-am-resume-override-opts.sh
+++ b/t/t4153-am-resume-override-opts.sh
@@ -53,7 +53,7 @@ test_expect_success '--no-quiet overrides --quiet' '
# Applying side1 will be quiet.
test_must_fail git am --quiet side[123].eml >out &&
test_path_is_dir .git/rebase-apply &&
- test_i18ngrep ! "^Applying: " out &&
+ test_grep ! "^Applying: " out &&
echo side1 >file &&
git add file &&
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 7025cfdae5..fb53dddf79 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -433,13 +433,13 @@ test_expect_success 'rerere --no-no-rerere-autoupdate' '
git update-index --index-info <failedmerge &&
cp file3.conflict file3 &&
test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
- test_i18ngrep [Uu]sage err &&
+ test_grep [Uu]sage err &&
test_must_fail git update-index --refresh
'
test_expect_success 'rerere -h' '
test_must_fail git rerere -h >help &&
- test_i18ngrep [Uu]sage help
+ test_grep [Uu]sage help
'
concat_insert () {
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 8e4effebdb..d7382709fc 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -139,7 +139,7 @@ test_expect_success !MINGW 'shortlog can read --format=raw output' '
test_expect_success 'shortlog from non-git directory refuses extra arguments' '
test_must_fail env GIT_DIR=non-existing git shortlog foo 2>out &&
- test_i18ngrep "too many arguments" out
+ test_grep "too many arguments" out
'
test_expect_success 'shortlog should add newline when input line matches wraplen' '
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index af4a123cd2..708636671a 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -1884,7 +1884,7 @@ test_expect_success '--no-graph does not unset --parents' '
test_expect_success '--reverse and --graph conflict' '
test_must_fail git log --reverse --graph 2>stderr &&
- test_i18ngrep "cannot be used together" stderr
+ test_grep "cannot be used together" stderr
'
test_expect_success '--reverse --graph --no-graph works' '
@@ -1895,7 +1895,7 @@ test_expect_success '--reverse --graph --no-graph works' '
test_expect_success '--show-linear-break and --graph conflict' '
test_must_fail git log --show-linear-break --graph 2>stderr &&
- test_i18ngrep "cannot be used together" stderr
+ test_grep "cannot be used together" stderr
'
test_expect_success '--show-linear-break --graph --no-graph works' '
@@ -1906,7 +1906,7 @@ test_expect_success '--show-linear-break --graph --no-graph works' '
test_expect_success '--no-walk and --graph conflict' '
test_must_fail git log --no-walk --graph 2>stderr &&
- test_i18ngrep "cannot be used together" stderr
+ test_grep "cannot be used together" stderr
'
test_expect_success '--no-walk --graph --no-graph works' '
@@ -1917,8 +1917,8 @@ test_expect_success '--no-walk --graph --no-graph works' '
test_expect_success '--walk-reflogs and --graph conflict' '
test_must_fail git log --walk-reflogs --graph 2>stderr &&
- (test_i18ngrep "cannot combine" stderr ||
- test_i18ngrep "cannot be used together" stderr)
+ (test_grep "cannot combine" stderr ||
+ test_grep "cannot be used together" stderr)
'
test_expect_success '--walk-reflogs --graph --no-graph works' '
@@ -2252,7 +2252,7 @@ test_expect_success 'log on empty repo fails' '
git init empty &&
test_when_finished "rm -rf empty" &&
test_must_fail git -C empty log 2>stderr &&
- test_i18ngrep does.not.have.any.commits stderr
+ test_grep does.not.have.any.commits stderr
'
test_expect_success REFFILES 'log diagnoses bogus HEAD hash' '
@@ -2260,16 +2260,16 @@ test_expect_success REFFILES 'log diagnoses bogus HEAD hash' '
test_when_finished "rm -rf empty" &&
echo 1234abcd >empty/.git/refs/heads/main &&
test_must_fail git -C empty log 2>stderr &&
- test_i18ngrep broken stderr
+ test_grep broken stderr
'
test_expect_success REFFILES 'log diagnoses bogus HEAD symref' '
git init empty &&
echo "ref: refs/heads/invalid.lock" > empty/.git/HEAD &&
test_must_fail git -C empty log 2>stderr &&
- test_i18ngrep broken stderr &&
+ test_grep broken stderr &&
test_must_fail git -C empty log --default totally-bogus 2>stderr &&
- test_i18ngrep broken stderr
+ test_grep broken stderr
'
test_expect_success 'log does not default to HEAD when rev input is given' '
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 2016132f51..8a88dd7900 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -360,7 +360,7 @@ test_expect_success 'mailmap.blob might be the wrong type' '
cp default.map .mailmap &&
git -c mailmap.blob=HEAD: shortlog HEAD >actual 2>err &&
- test_i18ngrep "mailmap is not a blob" err &&
+ test_grep "mailmap is not a blob" err &&
test_cmp expect actual
'
diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index 2e8f5ad7b8..806b2809d4 100755
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -21,7 +21,7 @@ test_expect_success '"git log :/" should not be ambiguous' '
test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' '
: >a &&
test_must_fail git log :/a 2>error &&
- test_i18ngrep ambiguous error
+ test_grep ambiguous error
'
test_expect_success '"git log :/a -- " should not be ambiguous' '
@@ -65,7 +65,7 @@ test_expect_success '"git log :/in" should not be ambiguous' '
test_expect_success '"git log :" should be ambiguous' '
test_must_fail git log : 2>error &&
- test_i18ngrep ambiguous error
+ test_grep ambiguous error
'
test_expect_success 'git log -- :' '
@@ -104,7 +104,7 @@ test_expect_success '"git log :(exclude)sub --" must resolve as an object' '
test_expect_success '"git log :(unknown-magic) complains of bogus magic' '
test_must_fail git log ":(unknown-magic)" 2>error &&
- test_i18ngrep pathspec.magic error
+ test_grep pathspec.magic error
'
test_expect_success 'command line pathspec parsing for "git log"' '
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 7f6bb27f14..64e1623733 100755
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -57,10 +57,10 @@ test_expect_success setup '
test_expect_success 'usage' '
test_expect_code 129 git log -S 2>err &&
- test_i18ngrep "switch.*requires a value" err &&
+ test_grep "switch.*requires a value" err &&
test_expect_code 129 git log -G 2>err &&
- test_i18ngrep "switch.*requires a value" err &&
+ test_grep "switch.*requires a value" err &&
test_expect_code 128 git log -Gregex -Sstring 2>err &&
grep "cannot be used together" err &&
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index c6540e822f..02d76dca28 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -19,7 +19,7 @@ test_expect_success 'basic command line parsing' '
# -L requires there is no pathspec
test_must_fail git log -L1,1:b.c -- b.c 2>error &&
- test_i18ngrep "cannot be used with pathspec" error &&
+ test_grep "cannot be used with pathspec" error &&
# This would fail because --follow wants a single path, but
# we may fail due to incompatibility between -L/--follow in
@@ -50,7 +50,7 @@ canned_test_failure () {
test_bad_opts () {
test_expect_success "invalid args: $1" "
test_must_fail git log $1 2>errors &&
- test_i18ngrep '$2' errors
+ test_grep '$2' errors
"
}
diff --git a/t/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh
index 85e90acb09..e6b59123a3 100755
--- a/t/t4212-log-corrupt.sh
+++ b/t/t4212-log-corrupt.sh
@@ -17,7 +17,7 @@ test_expect_success 'setup' '
test_expect_success 'fsck notices broken commit' '
test_must_fail git fsck 2>actual &&
- test_i18ngrep invalid.author actual
+ test_grep invalid.author actual
'
test_expect_success 'git log with broken author email' '
diff --git a/t/t4256-am-format-flowed.sh b/t/t4256-am-format-flowed.sh
index 1015273bc8..92d8c8b651 100755
--- a/t/t4256-am-format-flowed.sh
+++ b/t/t4256-am-format-flowed.sh
@@ -13,7 +13,7 @@ test_expect_success 'setup' '
test_expect_success 'am with format=flowed' '
git am <"$TEST_DIRECTORY/t4256/1/patch" 2>stderr &&
- test_i18ngrep "warning: Patch sent with format=flowed" stderr &&
+ test_grep "warning: Patch sent with format=flowed" stderr &&
test_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c
'
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 745089479c..d402ec18b7 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -541,7 +541,7 @@ test_expect_success 'make sure index-pack detects the SHA1 collision' '
(
cd corrupt &&
test_must_fail git index-pack -o ../bad.idx ../test-3.pack 2>msg &&
- test_i18ngrep "SHA1 COLLISION FOUND" msg
+ test_grep "SHA1 COLLISION FOUND" msg
)
'
@@ -549,7 +549,7 @@ test_expect_success 'make sure index-pack detects the SHA1 collision (large blob
(
cd corrupt &&
test_must_fail git -c core.bigfilethreshold=1 index-pack -o ../bad.idx ../test-3.pack 2>msg &&
- test_i18ngrep "SHA1 COLLISION FOUND" msg
+ test_grep "SHA1 COLLISION FOUND" msg
)
'
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index f89809be53..d88e6f1691 100755
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -282,8 +282,8 @@ test_expect_success 'index-pack --fsck-objects also warns upon missing tagger in
test_expect_success 'index-pack -v --stdin produces progress for both phases' '
pack=$(git pack-objects --all pack </dev/null) &&
GIT_PROGRESS_DELAY=0 git index-pack -v --stdin <pack-$pack.pack 2>err &&
- test_i18ngrep "Receiving objects" err &&
- test_i18ngrep "Resolving deltas" err
+ test_grep "Receiving objects" err &&
+ test_grep "Resolving deltas" err
'
test_expect_success 'too-large packs report the breach' '
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index b4df545e5a..1f1f664871 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -318,10 +318,10 @@ test_expect_success 'prune: handle HEAD reflog in multiple worktrees' '
test_expect_success 'prune: handle expire option correctly' '
test_must_fail git prune --expire 2>error &&
- test_i18ngrep "requires a value" error &&
+ test_grep "requires a value" error &&
test_must_fail git prune --expire=nyah 2>error &&
- test_i18ngrep "malformed expiration" error &&
+ test_grep "malformed expiration" error &&
git prune --no-expire
'
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 78c1c6c923..d7fd71360e 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -271,7 +271,7 @@ test_bitmap_cases () {
mv -f $bitmap.tmp $bitmap &&
git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
test_cmp expect actual &&
- test_i18ngrep corrupt.ewah.bitmap stderr
+ test_grep corrupt.ewah.bitmap stderr
'
test_expect_success 'truncated bitmap fails gracefully (cache)' '
@@ -284,7 +284,7 @@ test_bitmap_cases () {
mv -f $bitmap.tmp $bitmap &&
git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
test_cmp expect actual &&
- test_i18ngrep corrupted.bitmap.index stderr
+ test_grep corrupted.bitmap.index stderr
'
# Create a state of history with these properties:
@@ -471,7 +471,7 @@ sane_unset GIT_TEST_PACK_USE_BITMAP_BOUNDARY_TRAVERSAL
test_expect_success 'incremental repack fails when bitmaps are requested' '
test_commit more-1 &&
test_must_fail git repack -d 2>err &&
- test_i18ngrep "Incremental repacks are incompatible with bitmap" err
+ test_grep "Incremental repacks are incompatible with bitmap" err
'
test_expect_success 'incremental repack can disable bitmaps' '
@@ -524,7 +524,7 @@ test_expect_success 'truncated bitmap fails gracefully (lookup table)' '
mv -f $bitmap.tmp $bitmap &&
git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
test_cmp expect actual &&
- test_i18ngrep corrupted.bitmap.index stderr
+ test_grep corrupted.bitmap.index stderr
'
test_done
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 4df76173a8..10718142b0 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -47,7 +47,7 @@ test_expect_success 'exit with correct error on bad input to --stdin-packs' '
echo doesnotexist >in &&
test_expect_code 1 git -C full commit-graph write --stdin-packs \
<in 2>stderr &&
- test_i18ngrep "error adding pack" stderr
+ test_grep "error adding pack" stderr
'
test_expect_success 'create commits and repack' '
@@ -67,11 +67,11 @@ test_expect_success 'exit with correct error on bad input to --stdin-commits' '
# invalid, non-hex OID
echo HEAD | test_expect_code 1 git -C full commit-graph write \
--stdin-commits 2>stderr &&
- test_i18ngrep "unexpected non-hex object ID: HEAD" stderr &&
+ test_grep "unexpected non-hex object ID: HEAD" stderr &&
# non-existent OID
echo $ZERO_OID | test_expect_code 1 git -C full commit-graph write \
--stdin-commits 2>stderr &&
- test_i18ngrep "invalid object" stderr &&
+ test_grep "invalid object" stderr &&
# valid commit and tree OID
git -C full rev-parse HEAD HEAD^{tree} >in &&
git -C full commit-graph write --stdin-commits <in &&
@@ -143,7 +143,7 @@ test_expect_success 'commit-graph write --stdin-commits force progress on for st
git -C full rev-parse commits/5 >in &&
GIT_PROGRESS_DELAY=0 git -C full commit-graph write --stdin-commits \
--progress <in 2>err &&
- test_i18ngrep "Collecting commits from input" err
+ test_grep "Collecting commits from input" err
'
test_expect_success 'commit-graph write --stdin-commits with the --no-progress option' '
@@ -383,13 +383,13 @@ test_expect_success 'warn on improper hash version' '
cd sha1 &&
mv ../cg-sha256 .git/objects/info/commit-graph &&
git log -1 2>err &&
- test_i18ngrep "commit-graph hash version 2 does not match version 1" err
+ test_grep "commit-graph hash version 2 does not match version 1" err
) &&
(
cd sha256 &&
mv ../cg-sha1 .git/objects/info/commit-graph &&
git log -1 2>err &&
- test_i18ngrep "commit-graph hash version 1 does not match version 2" err
+ test_grep "commit-graph hash version 1 does not match version 2" err
)
'
@@ -473,7 +473,7 @@ corrupt_graph_verify() {
grepstr=$1
test_must_fail git -C full commit-graph verify 2>test_err &&
grep -v "^+" test_err >err &&
- test_i18ngrep "$grepstr" err &&
+ test_grep "$grepstr" err &&
if test "$2" != "no-copy"
then
cp full/$objdir/info/commit-graph commit-graph-pre-write-test
@@ -714,7 +714,7 @@ test_expect_success 'corrupt commit-graph write (broken parent)' '
git commit-tree -p "$broken" -m "good commit" "$empty" >good &&
test_must_fail git commit-graph write --stdin-commits \
<good 2>test_err &&
- test_i18ngrep "unable to parse commit" test_err
+ test_grep "unable to parse commit" test_err
)
'
@@ -735,7 +735,7 @@ test_expect_success 'corrupt commit-graph write (missing tree)' '
git commit-tree -p "$broken" -m "good" "$tree" >good &&
test_must_fail git commit-graph write --stdin-commits \
<good 2>test_err &&
- test_i18ngrep "unable to parse commit" test_err
+ test_grep "unable to parse commit" test_err
)
'
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 1bcc02004d..4b01d78ccb 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -279,13 +279,13 @@ test_expect_success 'warn on improper hash version' '
cd sha1 &&
mv ../mpi-sha256 .git/objects/pack/multi-pack-index &&
git log -1 2>err &&
- test_i18ngrep "multi-pack-index hash version 2 does not match version 1" err
+ test_grep "multi-pack-index hash version 2 does not match version 1" err
) &&
(
cd sha256 &&
mv ../mpi-sha1 .git/objects/pack/multi-pack-index &&
git log -1 2>err &&
- test_i18ngrep "multi-pack-index hash version 1 does not match version 2" err
+ test_grep "multi-pack-index hash version 1 does not match version 2" err
)
'
@@ -386,7 +386,7 @@ corrupt_midx_and_verify() {
printf "$DATA" | dd of="$FILE" bs=1 seek="$POS" conv=notrunc &&
test_must_fail $COMMAND 2>test_err &&
grep -v "^+" test_err >err &&
- test_i18ngrep "$GREPSTR" err
+ test_grep "$GREPSTR" err
}
test_expect_success 'verify bad signature' '
@@ -501,7 +501,7 @@ test_expect_success 'corrupt MIDX is not reused' '
corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \
"incorrect object offset" &&
git multi-pack-index write 2>err &&
- test_i18ngrep checksum.mismatch err &&
+ test_grep checksum.mismatch err &&
git multi-pack-index verify
'
@@ -1031,7 +1031,7 @@ test_expect_success 'load reverse index when missing .idx, .pack' '
test_expect_success 'usage shown without sub-command' '
test_expect_code 129 git multi-pack-index 2>err &&
- ! test_i18ngrep "unrecognized subcommand" err
+ ! test_grep "unrecognized subcommand" err
'
test_expect_success 'complains when run outside of a repository' '
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh
index 36c4141e67..a48c00ef50 100755
--- a/t/t5324-split-commit-graph.sh
+++ b/t/t5324-split-commit-graph.sh
@@ -281,7 +281,7 @@ test_expect_success 'verify hashes along chain, even in shallow' '
corrupt_file "$base_file" $(test_oid shallow) "\01" &&
test_must_fail git commit-graph verify --shallow 2>test_err &&
grep -v "^+" test_err >err &&
- test_i18ngrep "incorrect checksum" err
+ test_grep "incorrect checksum" err
)
'
@@ -295,7 +295,7 @@ test_expect_success 'verify --shallow does not check base contents' '
git commit-graph verify --shallow &&
test_must_fail git commit-graph verify 2>test_err &&
grep -v "^+" test_err >err &&
- test_i18ngrep "incorrect checksum" err
+ test_grep "incorrect checksum" err
)
'
@@ -308,7 +308,7 @@ test_expect_success 'warn on base graph chunk incorrect' '
corrupt_file "$base_file" $(test_oid base) "\01" &&
git commit-graph verify --shallow 2>test_err &&
grep -v "^+" test_err >err &&
- test_i18ngrep "commit-graph chain does not match" err
+ test_grep "commit-graph chain does not match" err
)
'
@@ -319,11 +319,11 @@ test_expect_success 'verify after commit-graph-chain corruption' '
corrupt_file "$graphdir/commit-graph-chain" 60 "G" &&
git commit-graph verify 2>test_err &&
grep -v "^+" test_err >err &&
- test_i18ngrep "invalid commit-graph chain" err &&
+ test_grep "invalid commit-graph chain" err &&
corrupt_file "$graphdir/commit-graph-chain" 60 "A" &&
git commit-graph verify 2>test_err &&
grep -v "^+" test_err >err &&
- test_i18ngrep "unable to find all commit-graph files" err
+ test_grep "unable to find all commit-graph files" err
)
'
@@ -341,7 +341,7 @@ test_expect_success 'verify across alternates' '
corrupt_file "$tip_file" 100 "\01" &&
test_must_fail git commit-graph verify --shallow 2>test_err &&
grep -v "^+" test_err >err &&
- test_i18ngrep "commit-graph has incorrect fanout value" err
+ test_grep "commit-graph has incorrect fanout value" err
)
'
@@ -353,7 +353,7 @@ test_expect_success 'add octopus merge' '
git commit-graph verify --progress 2>err &&
test_line_count = 1 err &&
grep "Verifying commits in commit graph: 100% (18/18)" err &&
- test_i18ngrep ! warning err &&
+ test_grep ! warning err &&
test_line_count = 3 $graphdir/commit-graph-chain
'
@@ -455,7 +455,7 @@ test_expect_success 'prevent regression for duplicate commits across layers' '
git init dup &&
git -C dup commit --allow-empty -m one &&
git -C dup -c core.commitGraph=false commit-graph write --split=no-merge --reachable 2>err &&
- test_i18ngrep "attempting to write a commit-graph" err &&
+ test_grep "attempting to write a commit-graph" err &&
git -C dup commit-graph write --split=no-merge --reachable &&
git -C dup commit --allow-empty -m two &&
git -C dup commit-graph write --split=no-merge --reachable &&
diff --git a/t/t5331-pack-objects-stdin.sh b/t/t5331-pack-objects-stdin.sh
index acab31667a..2dcf1eecee 100755
--- a/t/t5331-pack-objects-stdin.sh
+++ b/t/t5331-pack-objects-stdin.sh
@@ -65,7 +65,7 @@ test_expect_success '--stdin-packs is incompatible with --filter' '
cd stdin-packs &&
test_must_fail git pack-objects --stdin-packs --stdout \
--filter=blob:none </dev/null 2>err &&
- test_i18ngrep "cannot use --filter with --stdin-packs" err
+ test_grep "cannot use --filter with --stdin-packs" err
)
'
@@ -74,7 +74,7 @@ test_expect_success '--stdin-packs is incompatible with --revs' '
cd stdin-packs &&
test_must_fail git pack-objects --stdin-packs --revs out \
</dev/null 2>err &&
- test_i18ngrep "cannot use internal rev list with --stdin-packs" err
+ test_grep "cannot use internal rev list with --stdin-packs" err
)
'
diff --git a/t/t5411/test-0026-push-options.sh b/t/t5411/test-0026-push-options.sh
index 6dfc7b1c0d..510fff38da 100644
--- a/t/t5411/test-0026-push-options.sh
+++ b/t/t5411/test-0026-push-options.sh
@@ -18,7 +18,7 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL)" '
HEAD:refs/for/main/topic \
>out-$test_count 2>&1 &&
make_user_friendly_and_stable_output <out-$test_count >actual &&
- test_i18ngrep "fatal: the receiving end does not support push options" \
+ test_grep "fatal: the receiving end does not support push options" \
actual &&
test_cmp_refs -C "$upstream" <<-EOF
diff --git a/t/t5411/test-0027-push-options--porcelain.sh b/t/t5411/test-0027-push-options--porcelain.sh
index 768880b40f..9435457de0 100644
--- a/t/t5411/test-0027-push-options--porcelain.sh
+++ b/t/t5411/test-0027-push-options--porcelain.sh
@@ -19,7 +19,7 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain
HEAD:refs/for/main/topic \
>out-$test_count 2>&1 &&
make_user_friendly_and_stable_output <out-$test_count >actual &&
- test_i18ngrep "fatal: the receiving end does not support push options" \
+ test_grep "fatal: the receiving end does not support push options" \
actual &&
test_cmp_refs -C "$upstream" <<-EOF
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index d18f2823d8..573e62341f 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -403,7 +403,7 @@ test_expect_success 'in_vain not triggered before first ACK' '
test_commit -C myserver bar &&
git -C myclient fetch --progress origin 2>log &&
- test_i18ngrep "remote: Total 3 " log
+ test_grep "remote: Total 3 " log
'
test_expect_success 'in_vain resetted upon ACK' '
@@ -435,7 +435,7 @@ test_expect_success 'in_vain resetted upon ACK' '
# the client reports that first_anotherbranch_commit is common.
GIT_TRACE2_EVENT="$(pwd)/trace2" git -C myclient fetch --progress origin main 2>log &&
grep \"key\":\"total_rounds\",\"value\":\"6\" trace2 &&
- test_i18ngrep "Total 3 " log
+ test_grep "Total 3 " log
'
test_expect_success 'fetch in shallow repo unreachable shallow objects' '
@@ -459,7 +459,7 @@ test_expect_success 'fetch creating new shallow root' '
git fetch --depth=1 --progress 2>actual &&
# This should fetch only the empty commit, no tree or
# blob objects
- test_i18ngrep "remote: Total 1" actual
+ test_grep "remote: Total 1" actual
)
'
@@ -694,7 +694,7 @@ test_expect_success 'fetch-pack cannot fetch a raw sha1 that is not advertised a
# unadvertised objects, so restrict this test to v0.
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C client fetch-pack ../server \
$(git -C server rev-parse refs/heads/main^) 2>err &&
- test_i18ngrep "Server does not allow request for unadvertised object" err
+ test_grep "Server does not allow request for unadvertised object" err
'
check_prot_path () {
@@ -1010,7 +1010,7 @@ test_expect_success 'filtering by size has no effect if support for it is not ad
git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
grep "$blob" oids &&
- test_i18ngrep "filtering not recognized by server" err
+ test_grep "filtering not recognized by server" err
'
fetch_filter_blob_limit_zero () {
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 0b8ab4afdb..138e6778a4 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -144,7 +144,7 @@ test_expect_success 'setup bogus commit' '
test_expect_success 'fsck with no skipList input' '
test_must_fail git fsck 2>err &&
- test_i18ngrep "missingEmail" err
+ test_grep "missingEmail" err
'
test_expect_success 'setup sorted and unsorted skipLists' '
@@ -169,9 +169,9 @@ test_expect_success 'fsck with unsorted skipList' '
test_expect_success 'fsck with invalid or bogus skipList input' '
git -c fsck.skipList=/dev/null -c fsck.missingEmail=ignore fsck &&
test_must_fail git -c fsck.skipList=does-not-exist -c fsck.missingEmail=ignore fsck 2>err &&
- test_i18ngrep "could not open.*: does-not-exist" err &&
+ test_grep "could not open.*: does-not-exist" err &&
test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
- test_i18ngrep "invalid object name: \[core\]" err
+ test_grep "invalid object name: \[core\]" err
'
test_expect_success 'fsck with other accepted skipList input (comments & empty lines)' '
@@ -180,14 +180,14 @@ test_expect_success 'fsck with other accepted skipList input (comments & empty l
$(test_oid 001)
EOF
test_must_fail git -c fsck.skipList=SKIP.with-comment fsck 2>err-with-comment &&
- test_i18ngrep "missingEmail" err-with-comment &&
+ test_grep "missingEmail" err-with-comment &&
cat >SKIP.with-empty-line <<-EOF &&
$(test_oid 001)
$(test_oid 002)
EOF
test_must_fail git -c fsck.skipList=SKIP.with-empty-line fsck 2>err-with-empty-line &&
- test_i18ngrep "missingEmail" err-with-empty-line
+ test_grep "missingEmail" err-with-empty-line
'
test_expect_success 'fsck no garbage output from comments & empty lines errors' '
@@ -198,7 +198,7 @@ test_expect_success 'fsck no garbage output from comments & empty lines errors'
test_expect_success 'fsck with invalid abbreviated skipList input' '
echo $commit | test_copy_bytes 20 >SKIP.abbreviated &&
test_must_fail git -c fsck.skipList=SKIP.abbreviated fsck 2>err-abbreviated &&
- test_i18ngrep "^fatal: invalid object name: " err-abbreviated
+ test_grep "^fatal: invalid object name: " err-abbreviated
'
test_expect_success 'fsck with exhaustive accepted skipList input (various types of comments etc.)' '
@@ -231,10 +231,10 @@ test_expect_success 'push with receive.fsck.skipList' '
test_must_fail git push --porcelain dst bogus &&
git --git-dir=dst/.git config receive.fsck.skipList does-not-exist &&
test_must_fail git push --porcelain dst bogus 2>err &&
- test_i18ngrep "could not open.*: does-not-exist" err &&
+ test_grep "could not open.*: does-not-exist" err &&
git --git-dir=dst/.git config receive.fsck.skipList config &&
test_must_fail git push --porcelain dst bogus 2>err &&
- test_i18ngrep "invalid object name: \[core\]" err &&
+ test_grep "invalid object name: \[core\]" err &&
git --git-dir=dst/.git config receive.fsck.skipList SKIP &&
git push --porcelain dst bogus
@@ -260,10 +260,10 @@ test_expect_success 'fetch with fetch.fsck.skipList' '
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
git --git-dir=dst/.git config fetch.fsck.skipList does-not-exist &&
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
- test_i18ngrep "could not open.*: does-not-exist" err &&
+ test_grep "could not open.*: does-not-exist" err &&
git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/config &&
test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
- test_i18ngrep "invalid object name: \[core\]" err &&
+ test_grep "invalid object name: \[core\]" err &&
git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/SKIP &&
git --git-dir=dst/.git fetch "file://$(pwd)" $refspec
@@ -271,7 +271,7 @@ test_expect_success 'fetch with fetch.fsck.skipList' '
test_expect_success 'fsck.<unknownmsg-id> dies' '
test_must_fail git -c fsck.whatEver=ignore fsck 2>err &&
- test_i18ngrep "Unhandled message id: whatever" err
+ test_grep "Unhandled message id: whatever" err
'
test_expect_success 'push with receive.fsck.missingEmail=warn' '
@@ -293,7 +293,7 @@ test_expect_success 'push with receive.fsck.missingEmail=warn' '
receive.fsck.missingEmail warn &&
git push --porcelain dst bogus >act 2>&1 &&
grep "missingEmail" act &&
- test_i18ngrep "skipping unknown msg id.*whatever" act &&
+ test_grep "skipping unknown msg id.*whatever" act &&
git --git-dir=dst/.git branch -D bogus &&
git --git-dir=dst/.git config --add \
receive.fsck.missingEmail ignore &&
@@ -321,7 +321,7 @@ test_expect_success 'fetch with fetch.fsck.missingEmail=warn' '
fetch.fsck.missingEmail warn &&
git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
grep "missingEmail" act &&
- test_i18ngrep "Skipping unknown msg id.*whatever" act &&
+ test_grep "Skipping unknown msg id.*whatever" act &&
rm -rf dst &&
git init dst &&
git --git-dir=dst/.git config fetch.fsckobjects true &&
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 43b7bcd715..7789ff12c4 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -1075,7 +1075,7 @@ test_expect_success 'remote prune to cause a dangling symref' '
cd eight &&
git remote prune origin
) >err 2>&1 &&
- test_i18ngrep "has become dangling" err &&
+ test_grep "has become dangling" err &&
: And the dangling symref will not cause other annoying errors &&
(
@@ -1087,7 +1087,7 @@ test_expect_success 'remote prune to cause a dangling symref' '
cd eight &&
test_must_fail git branch nomore origin
) 2>err &&
- test_i18ngrep "dangling symref" err
+ test_grep "dangling symref" err
'
test_expect_success 'show empty remote' '
@@ -1419,7 +1419,7 @@ test_expect_success 'extra args: setup' '
test_extra_arg () {
test_expect_success "extra args: $*" "
test_must_fail git remote $* bogus_extra_arg 2>actual &&
- test_i18ngrep '^usage:' actual
+ test_grep '^usage:' actual
"
}
@@ -1453,12 +1453,12 @@ test_expect_success 'unqualified <dst> refspec DWIM and advice' '
oid=$(git rev-parse some-tag^{$type})
fi &&
test_must_fail git push origin $oid:dst 2>err &&
- test_i18ngrep "error: The destination you" err &&
- test_i18ngrep "hint: Did you mean" err &&
+ test_grep "error: The destination you" err &&
+ test_grep "hint: Did you mean" err &&
test_must_fail git -c advice.pushUnqualifiedRefName=false \
push origin $oid:dst 2>err &&
- test_i18ngrep "error: The destination you" err &&
- test_i18ngrep ! "hint: Did you mean" err ||
+ test_grep "error: The destination you" err &&
+ test_grep ! "hint: Did you mean" err ||
exit 1
done
)
@@ -1479,16 +1479,16 @@ test_expect_success 'refs/remotes/* <src> refspec and unqualified <dst> DWIM and
git fetch --no-tags two &&
test_must_fail git push origin refs/remotes/two/another:dst 2>err &&
- test_i18ngrep "error: The destination you" err &&
+ test_grep "error: The destination you" err &&
test_must_fail git push origin refs/remotes/tags-from-two/my-tag:dst-tag 2>err &&
- test_i18ngrep "error: The destination you" err &&
+ test_grep "error: The destination you" err &&
test_must_fail git push origin refs/remotes/trees-from-two/my-head-tree:dst-tree 2>err &&
- test_i18ngrep "error: The destination you" err &&
+ test_grep "error: The destination you" err &&
test_must_fail git push origin refs/remotes/blobs-from-two/my-file-blob:dst-blob 2>err &&
- test_i18ngrep "error: The destination you" err
+ test_grep "error: The destination you" err
)
'
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 4f289063ce..c940521bcc 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -415,9 +415,9 @@ test_expect_success 'fetch uses remote ref names to describe new refs' '
(
cd descriptive &&
git fetch o 2>actual &&
- test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
- test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
- test_i18ngrep "new ref.* -> crazy$" actual
+ test_grep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
+ test_grep "new tag.* -> descriptive-tag$" actual &&
+ test_grep "new ref.* -> crazy$" actual
) &&
git checkout main
'
@@ -1113,7 +1113,7 @@ test_expect_success 'fetching with auto-gc does not lock up' '
git config gc.autoPackLimit 1 &&
git config gc.autoDetach false &&
GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 &&
- test_i18ngrep "Auto packing the repository" fetch.out &&
+ test_grep "Auto packing the repository" fetch.out &&
! grep "Should I try again" fetch.out
)
'
diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index 151c76eb09..5dbe107ce8 100755
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -320,7 +320,7 @@ test_expect_success 'ls-remote works outside repository' '
test_expect_success 'ls-remote --sort fails gracefully outside repository' '
# Use a sort key that requires access to the referenced objects.
nongit test_must_fail git ls-remote --sort=authordate "$TRASH_DIRECTORY" 2>err &&
- test_i18ngrep "^fatal: not a git repository, but the field '\''authordate'\'' requires access to object data" err
+ test_grep "^fatal: not a git repository, but the field '\''authordate'\'' requires access to object data" err
'
test_expect_success 'ls-remote patterns work with all protocol versions' '
diff --git a/t/t5514-fetch-multiple.sh b/t/t5514-fetch-multiple.sh
index 98f034aa77..a95841dc36 100755
--- a/t/t5514-fetch-multiple.sh
+++ b/t/t5514-fetch-multiple.sh
@@ -200,8 +200,8 @@ test_expect_success 'parallel' '
test_must_fail env GIT_TRACE="$PWD/trace" \
git fetch --jobs=2 --multiple one two 2>err &&
grep "preparing to run up to 2 tasks" trace &&
- test_i18ngrep "could not fetch .one.*128" err &&
- test_i18ngrep "could not fetch .two.*128" err
+ test_grep "could not fetch .one.*128" err &&
+ test_grep "could not fetch .two.*128" err
'
test_expect_success 'git fetch --multiple --jobs=0 picks a default' '
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 87163d7745..2e7c0e1648 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -227,7 +227,7 @@ test_expect_success 'push with negotiation proceeds anyway even if negotiation f
GIT_TEST_PROTOCOL_VERSION=0 GIT_TRACE2_EVENT="$(pwd)/event" \
git -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
grep_wrote 5 event && # 2 commits, 2 trees, 1 blob
- test_i18ngrep "push negotiation failed" err
+ test_grep "push negotiation failed" err
'
test_expect_success 'push with negotiation does not attempt to fetch submodules' '
@@ -1267,7 +1267,7 @@ test_expect_success 'fetch exact SHA1' '
# fetching the hidden object should fail by default
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
- test_i18ngrep "Server does not allow request for unadvertised object" err &&
+ test_grep "Server does not allow request for unadvertised object" err &&
test_must_fail git rev-parse --verify refs/heads/copy &&
# the server side can allow it to succeed
@@ -1369,7 +1369,7 @@ do
git fetch ../testrepo/.git $SHA1_3 2>err &&
# ideally we would insist this be on a "remote error:"
# line, but it is racy; see the commit message
- test_i18ngrep "not our ref.*$SHA1_3\$" err
+ test_grep "not our ref.*$SHA1_3\$" err
)
'
done
@@ -1407,7 +1407,7 @@ test_expect_success 'peeled advertisements are not considered ref tips' '
oid=$(git -C testrepo rev-parse mytag^{commit}) &&
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
git fetch testrepo $oid 2>err &&
- test_i18ngrep "Server does not allow request for unadvertised object" err
+ test_grep "Server does not allow request for unadvertised object" err
'
test_expect_success 'pushing a specific ref applies remote.$name.push as refmap' '
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 0b72112fb1..47534f1062 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -31,7 +31,7 @@ test_pull_autostash_fail () {
echo dirty >new_file &&
git add new_file &&
test_must_fail git pull "$@" . copy 2>err &&
- test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err
+ test_grep -E "uncommitted changes.|overwritten by merge:" err
}
test_expect_success setup '
@@ -151,7 +151,7 @@ test_expect_success 'fail if wildcard spec does not match any refs' '
echo file >expect &&
test_cmp expect file &&
test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err &&
- test_i18ngrep "no candidates for merging" err &&
+ test_grep "no candidates for merging" err &&
test_cmp expect file
'
@@ -164,7 +164,7 @@ test_expect_success 'fail if no branches specified with non-default remote' '
test_cmp expect file &&
test_config branch.test.remote origin &&
test_must_fail git pull test_remote 2>err &&
- test_i18ngrep "specify a branch on the command line" err &&
+ test_grep "specify a branch on the command line" err &&
test_cmp expect file
'
@@ -176,7 +176,7 @@ test_expect_success 'fail if not on a branch' '
echo file >expect &&
test_cmp expect file &&
test_must_fail git pull 2>err &&
- test_i18ngrep "not currently on a branch" err &&
+ test_grep "not currently on a branch" err &&
test_cmp expect file
'
@@ -189,7 +189,7 @@ test_expect_success 'fail if no configuration for current branch' '
echo file >expect &&
test_cmp expect file &&
test_must_fail git pull 2>err &&
- test_i18ngrep "no tracking information" err &&
+ test_grep "no tracking information" err &&
test_cmp expect file
'
@@ -202,7 +202,7 @@ test_expect_success 'pull --all: fail if no configuration for current branch' '
echo file >expect &&
test_cmp expect file &&
test_must_fail git pull --all 2>err &&
- test_i18ngrep "There is no tracking information" err &&
+ test_grep "There is no tracking information" err &&
test_cmp expect file
'
@@ -214,7 +214,7 @@ test_expect_success 'fail if upstream branch does not exist' '
echo file >expect &&
test_cmp expect file &&
test_must_fail git pull 2>err &&
- test_i18ngrep "no such ref was fetched" err &&
+ test_grep "no such ref was fetched" err &&
test_cmp expect file
'
@@ -248,13 +248,13 @@ test_expect_success 'fail if the index has unresolved entries' '
test_file_not_empty unmerged &&
cp file expected &&
test_must_fail git pull . second 2>err &&
- test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
+ test_grep "Pulling is not possible because you have unmerged files." err &&
test_cmp expected file &&
git add file &&
git ls-files -u >unmerged &&
test_must_be_empty unmerged &&
test_must_fail git pull . second 2>err &&
- test_i18ngrep "You have not concluded your merge" err &&
+ test_grep "You have not concluded your merge" err &&
test_cmp expected file
'
@@ -264,7 +264,7 @@ test_expect_success 'fast-forwards working tree if branch head is updated' '
echo file >expect &&
test_cmp expect file &&
git pull . second:third 2>err &&
- test_i18ngrep "fetch updated the current branch head" err &&
+ test_grep "fetch updated the current branch head" err &&
echo modified >expect &&
test_cmp expect file &&
test_cmp_rev third second
@@ -277,7 +277,7 @@ test_expect_success 'fast-forward fails with conflicting work tree' '
test_cmp expect file &&
echo conflict >file &&
test_must_fail git pull . second:third 2>err &&
- test_i18ngrep "Cannot fast-forward your working tree" err &&
+ test_grep "Cannot fast-forward your working tree" err &&
echo conflict >expect &&
test_cmp expect file &&
test_cmp_rev third second
@@ -375,7 +375,7 @@ test_expect_success '--rebase with conflicts shows advice' '
test_tick &&
git commit -m "Create conflict" seq.txt &&
test_must_fail git pull --rebase . seq 2>err >out &&
- test_i18ngrep "Resolve all conflicts manually" err
+ test_grep "Resolve all conflicts manually" err
'
test_expect_success 'failed --rebase shows advice' '
@@ -389,14 +389,14 @@ test_expect_success 'failed --rebase shows advice' '
git checkout -f -b fails-to-rebase HEAD^ &&
test_commit v2-without-cr file "2" file2-lf &&
test_must_fail git pull --rebase . diverging 2>err >out &&
- test_i18ngrep "Resolve all conflicts manually" err
+ test_grep "Resolve all conflicts manually" err
'
test_expect_success '--rebase fails with multiple branches' '
git reset --hard before-rebase &&
test_must_fail git pull --rebase . copy main 2>err &&
test_cmp_rev HEAD before-rebase &&
- test_i18ngrep "Cannot rebase onto multiple branches" err &&
+ test_grep "Cannot rebase onto multiple branches" err &&
echo modified >expect &&
git show HEAD:file >actual &&
test_cmp expect actual
@@ -520,7 +520,7 @@ test_expect_success 'pull --rebase warns on --verify-signatures' '
echo new >expect &&
git show HEAD:file2 >actual &&
test_cmp expect actual &&
- test_i18ngrep "ignoring --verify-signatures for rebase" err
+ test_grep "ignoring --verify-signatures for rebase" err
'
test_expect_success 'pull --rebase does not warn on --no-verify-signatures' '
@@ -530,7 +530,7 @@ test_expect_success 'pull --rebase does not warn on --no-verify-signatures' '
echo new >expect &&
git show HEAD:file2 >actual &&
test_cmp expect actual &&
- test_i18ngrep ! "verify-signatures" err
+ test_grep ! "verify-signatures" err
'
# add a feature branch, keep-merge, that is merged into main, so the
@@ -740,7 +740,7 @@ test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
test_cmp expect actual &&
git show :staged-file >actual &&
test_cmp expect actual &&
- test_i18ngrep "unborn branch with changes added to the index" err
+ test_grep "unborn branch with changes added to the index" err
)
'
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 264de29c35..d1f0810e42 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -93,7 +93,7 @@ test_expect_success 'git pull --no-write-fetch-head fails' '
(cd clonedwfh && git init &&
test_expect_code 129 git pull --no-write-fetch-head "../parent" >out 2>err &&
test_must_be_empty out &&
- test_i18ngrep "no-write-fetch-head" err)
+ test_grep "no-write-fetch-head" err)
'
test_expect_success 'git pull --force' '
diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
index 1b8d609879..1f859ade16 100755
--- a/t/t5523-push-upstream.sh
+++ b/t/t5523-push-upstream.sh
@@ -87,7 +87,7 @@ test_expect_success TTY 'progress messages go to tty' '
ensure_fresh_upstream &&
test_terminal git push -u upstream main >out 2>err &&
- test_i18ngrep "Writing objects" err
+ test_grep "Writing objects" err
'
test_expect_success 'progress messages do not go to non-tty' '
@@ -95,7 +95,7 @@ test_expect_success 'progress messages do not go to non-tty' '
# skip progress messages, since stderr is non-tty
git push -u upstream main >out 2>err &&
- test_i18ngrep ! "Writing objects" err
+ test_grep ! "Writing objects" err
'
test_expect_success 'progress messages go to non-tty (forced)' '
@@ -103,22 +103,22 @@ test_expect_success 'progress messages go to non-tty (forced)' '
# force progress messages to stderr, even though it is non-tty
git push -u --progress upstream main >out 2>err &&
- test_i18ngrep "Writing objects" err
+ test_grep "Writing objects" err
'
test_expect_success TTY 'push -q suppresses progress' '
ensure_fresh_upstream &&
test_terminal git push -u -q upstream main >out 2>err &&
- test_i18ngrep ! "Writing objects" err
+ test_grep ! "Writing objects" err
'
test_expect_success TTY 'push --no-progress suppresses progress' '
ensure_fresh_upstream &&
test_terminal git push -u --no-progress upstream main >out 2>err &&
- test_i18ngrep ! "Unpacking objects" err &&
- test_i18ngrep ! "Writing objects" err
+ test_grep ! "Unpacking objects" err &&
+ test_grep ! "Writing objects" err
'
test_expect_success TTY 'quiet push' '
diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh
index 284e20fefd..14f7eced9a 100755
--- a/t/t5528-push-default.sh
+++ b/t/t5528-push-default.sh
@@ -179,7 +179,7 @@ test_expect_success 'push from/to new branch succeeds with simple if push.autoSe
test_expect_success '"matching" fails if none match' '
git init --bare empty &&
test_must_fail git push empty : 2>actual &&
- test_i18ngrep "Perhaps you should specify a branch" actual
+ test_grep "Perhaps you should specify a branch" actual
'
test_expect_success 'push ambiguously named branch with upstream, matching and simple' '
diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh
index 7c1460eaa9..558eedf25a 100755
--- a/t/t5530-upload-pack-error.sh
+++ b/t/t5530-upload-pack-error.sh
@@ -35,8 +35,8 @@ test_expect_success 'upload-pack fails due to error in pack-objects packing' '
printf "%04xwant %s\n00000009done\n0000" \
$(($hexsz + 10)) $head >input &&
test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
- test_i18ngrep "unable to read" output.err &&
- test_i18ngrep "pack-objects died" output.err
+ test_grep "unable to read" output.err &&
+ test_grep "pack-objects died" output.err
'
test_expect_success 'corrupt repo differently' '
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index 302e4cbdba..f3fff55744 100755
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -311,7 +311,7 @@ test_expect_success 'submodule entry pointing at a tag is error' '
git -C work commit -m "bad commit" &&
test_when_finished "git -C work reset --hard HEAD^" &&
test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git main 2>err &&
- test_i18ngrep "is a tag, not a commit" err
+ test_grep "is a tag, not a commit" err
'
test_expect_success 'push fails if recurse submodules option passed as yes' '
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 7c0a148e73..b4bc24691c 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -68,13 +68,13 @@ test_expect_success 'talking with a receiver without push certificate support' '
test_expect_success 'push --signed fails with a receiver without push certificate support' '
prepare_dst &&
test_must_fail git push --signed dst noop ff +noff 2>err &&
- test_i18ngrep "the receiving end does not support" err
+ test_grep "the receiving end does not support" err
'
test_expect_success 'push --signed=1 is accepted' '
prepare_dst &&
test_must_fail git push --signed=1 dst noop ff +noff 2>err &&
- test_i18ngrep "the receiving end does not support" err
+ test_grep "the receiving end does not support" err
'
test_expect_success GPG 'no certificate for a signed push with no update' '
@@ -378,7 +378,7 @@ test_expect_success GPG 'failed atomic push does not execute GPG' '
--signed --atomic --porcelain \
dst noop ff noff >out 2>err &&
- test_i18ngrep ! "gpg failed to sign" err &&
+ test_grep ! "gpg failed to sign" err &&
cat >expect <<-EOF &&
To dst
= refs/heads/noop:refs/heads/noop [up to date]
diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh
index 91f28c2f78..23bf696170 100755
--- a/t/t5536-fetch-conflicts.sh
+++ b/t/t5536-fetch-conflicts.sh
@@ -40,7 +40,7 @@ test_expect_success 'fetch conflict: config vs. config' '
"+refs/heads/branch2:refs/remotes/origin/branch1" && (
cd ccc &&
test_must_fail git fetch origin 2>error &&
- test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
+ test_grep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
)
'
@@ -67,7 +67,7 @@ test_expect_success 'fetch conflict: arg vs. arg' '
test_must_fail git fetch origin \
refs/heads/*:refs/remotes/origin/* \
refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
- test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
+ test_grep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
)
'
@@ -78,8 +78,8 @@ test_expect_success 'fetch conflict: criss-cross args' '
git fetch origin \
refs/heads/branch1:refs/remotes/origin/branch2 \
refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
- test_i18ngrep "warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2" error &&
- test_i18ngrep "warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1" error
+ test_grep "warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2" error &&
+ test_grep "warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1" error
)
'
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index d0211cd8be..df758e187d 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -153,7 +153,7 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
'
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
- test_i18ngrep "Updates were rejected because" \
+ test_grep "Updates were rejected because" \
output
'
@@ -297,7 +297,7 @@ test_expect_success TTY 'push shows progress when stderr is a tty' '
cd "$ROOT_PATH"/test_repo_clone &&
test_commit noisy &&
test_terminal git push >output 2>&1 &&
- test_i18ngrep "^Writing objects" output
+ test_grep "^Writing objects" output
'
test_expect_success TTY 'push --quiet silences status and progress' '
@@ -311,16 +311,16 @@ test_expect_success TTY 'push --no-progress silences progress but not status' '
cd "$ROOT_PATH"/test_repo_clone &&
test_commit no-progress &&
test_terminal git push --no-progress >output 2>&1 &&
- test_i18ngrep "^To http" output &&
- test_i18ngrep ! "^Writing objects" output
+ test_grep "^To http" output &&
+ test_grep ! "^Writing objects" output
'
test_expect_success 'push --progress shows progress to non-tty' '
cd "$ROOT_PATH"/test_repo_clone &&
test_commit progress &&
git push --progress >output 2>&1 &&
- test_i18ngrep "^To http" output &&
- test_i18ngrep "^Writing objects" output
+ test_grep "^To http" output &&
+ test_grep "^Writing objects" output
'
test_expect_success 'http push gives sane defaults to reflog' '
@@ -489,10 +489,10 @@ test_expect_success 'colorize errors/hints' '
-c color.push=always \
push origin origin/main^:main 2>act &&
test_decode_color <act >decoded &&
- test_i18ngrep "<RED>.*rejected.*<RESET>" decoded &&
- test_i18ngrep "<RED>error: failed to push some refs" decoded &&
- test_i18ngrep "<YELLOW>hint: " decoded &&
- test_i18ngrep ! "^hint: " decoded
+ test_grep "<RED>.*rejected.*<RESET>" decoded &&
+ test_grep "<RED>error: failed to push some refs" decoded &&
+ test_grep "<YELLOW>hint: " decoded &&
+ test_grep ! "^hint: " decoded
'
test_expect_success 'report error server does not provide ref status' '
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
index a158e7d2c0..fb13549da7 100755
--- a/t/t5545-push-options.sh
+++ b/t/t5545-push-options.sh
@@ -252,7 +252,7 @@ test_expect_success 'push option denied properly by http server' '
mk_http_pair false &&
test_commit -C test_http_clone one &&
test_must_fail git -C test_http_clone push --push-option=asdf origin main 2>actual &&
- test_i18ngrep "the receiving end does not support push options" actual &&
+ test_grep "the receiving end does not support push options" actual &&
git -C test_http_clone push origin main
'
diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
index 8f182a3cbf..e444b30bf6 100755
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -376,7 +376,7 @@ test_expect_success 'git client send an empty Accept-Language' '
test_expect_success 'remote-http complains cleanly about malformed urls' '
test_must_fail git remote-http http::/example.com/repo.git 2>stderr &&
- test_i18ngrep "url has no scheme" stderr
+ test_grep "url has no scheme" stderr
'
# NEEDSWORK: Writing commands to git-remote-curl can race against the latter
@@ -385,7 +385,7 @@ test_expect_success 'remote-http complains cleanly about malformed urls' '
test_expect_success 'remote-http complains cleanly about empty scheme' '
test_must_fail ok=sigpipe git ls-remote \
http::${HTTPD_URL#http}/dumb/repo.git 2>stderr &&
- test_i18ngrep "url has no scheme" stderr
+ test_grep "url has no scheme" stderr
'
test_expect_success 'redirects can be forbidden/allowed' '
@@ -397,7 +397,7 @@ test_expect_success 'redirects can be forbidden/allowed' '
test_expect_success 'redirects are reported to stderr' '
# just look for a snippet of the redirected-to URL
- test_i18ngrep /dumb/ stderr
+ test_grep /dumb/ stderr
'
test_expect_success 'non-initial redirects can be forbidden' '
@@ -466,7 +466,7 @@ test_expect_success 'can redirect through non-"info/refs?service=git-upload-pack
test_expect_success 'print HTTP error when any intermediate redirect throws error' '
test_must_fail git clone "$HTTPD_URL/redir-to/502" 2> stderr &&
- test_i18ngrep "unable to access.*/redir-to/502" stderr
+ test_grep "unable to access.*/redir-to/502" stderr
'
test_expect_success 'fetching via http alternates works' '
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 21b7767cbd..8a41adf1e1 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -275,7 +275,7 @@ test_expect_success 'GIT_SMART_HTTP can disable smart http' '
test_expect_success 'invalid Content-Type rejected' '
test_must_fail git clone $HTTPD_URL/broken_smart/repo.git 2>actual &&
- test_i18ngrep "not valid:" actual
+ test_grep "not valid:" actual
'
test_expect_success 'create namespaced refs' '
@@ -558,7 +558,7 @@ test_expect_success 'GIT_TRACE_CURL_NO_DATA prevents data from being traced' '
test_expect_success 'server-side error detected' '
test_must_fail git clone $HTTPD_URL/error_smart/repo.git 2>actual &&
- test_i18ngrep "server-side error" actual
+ test_grep "server-side error" actual
'
test_expect_success 'http auth remembers successful credentials' '
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index 1131503b76..f9a9bf9503 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -10,9 +10,9 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
start_git_daemon
check_verbose_connect () {
- test_i18ngrep -F "Looking up 127.0.0.1 ..." stderr &&
- test_i18ngrep -F "Connecting to 127.0.0.1 (port " stderr &&
- test_i18ngrep -F "done." stderr
+ test_grep -F "Looking up 127.0.0.1 ..." stderr &&
+ test_grep -F "Connecting to 127.0.0.1 (port " stderr &&
+ test_grep -F "done." stderr
}
test_expect_success 'setup repository' '
@@ -108,7 +108,7 @@ test_expect_success 'fetch notices corrupt idx' '
test_expect_success 'client refuses to ask for repo with newline' '
test_must_fail git clone "$GIT_DAEMON_URL/repo$LF.git" dst 2>stderr &&
- test_i18ngrep newline.is.forbidden stderr
+ test_grep newline.is.forbidden stderr
'
test_remote_error()
@@ -148,7 +148,7 @@ test_remote_error()
fi
test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" "$@" 2>output &&
- test_i18ngrep "fatal: remote error: $msg: /$repo" output &&
+ test_grep "fatal: remote error: $msg: /$repo" output &&
ret=$?
chmod +x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git"
(exit $ret)
diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh
index 4e917bf87d..51744521f7 100755
--- a/t/t5572-pull-submodule.sh
+++ b/t/t5572-pull-submodule.sh
@@ -177,7 +177,7 @@ test_expect_success 'pull --rebase --recurse-submodules fails if both sides reco
# submodule itself, but the merge strategy in submodules
# does not support rebase:
test_must_fail git -C super pull --rebase --recurse-submodules 2>err &&
- test_i18ngrep "locally recorded submodule modifications" err
+ test_grep "locally recorded submodule modifications" err
'
test_expect_success 'pull --rebase --recurse-submodules (no submodule changes, no fork-point)' '
diff --git a/t/t5573-pull-verify-signatures.sh b/t/t5573-pull-verify-signatures.sh
index 1221ac0597..ab05f38a99 100755
--- a/t/t5573-pull-verify-signatures.sh
+++ b/t/t5573-pull-verify-signatures.sh
@@ -47,46 +47,46 @@ test_expect_success GPG 'create repositories with signed commits' '
test_expect_success GPG 'pull unsigned commit with --verify-signatures' '
test_when_finished "git reset --hard && git checkout initial" &&
test_must_fail git pull --ff-only --verify-signatures unsigned 2>pullerror &&
- test_i18ngrep "does not have a GPG signature" pullerror
+ test_grep "does not have a GPG signature" pullerror
'
test_expect_success GPG 'pull commit with bad signature with --verify-signatures' '
test_when_finished "git reset --hard && git checkout initial" &&
test_must_fail git pull --ff-only --verify-signatures bad 2>pullerror &&
- test_i18ngrep "has a bad GPG signature" pullerror
+ test_grep "has a bad GPG signature" pullerror
'
test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures' '
test_when_finished "git reset --hard && git checkout initial" &&
test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror &&
- test_i18ngrep "has an untrusted GPG signature" pullerror
+ test_grep "has an untrusted GPG signature" pullerror
'
test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=ultimate' '
test_when_finished "git reset --hard && git checkout initial" &&
test_config gpg.minTrustLevel ultimate &&
test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror &&
- test_i18ngrep "has an untrusted GPG signature" pullerror
+ test_grep "has an untrusted GPG signature" pullerror
'
test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=marginal' '
test_when_finished "git reset --hard && git checkout initial" &&
test_config gpg.minTrustLevel marginal &&
test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror &&
- test_i18ngrep "has an untrusted GPG signature" pullerror
+ test_grep "has an untrusted GPG signature" pullerror
'
test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=undefined' '
test_when_finished "git reset --hard && git checkout initial" &&
test_config gpg.minTrustLevel undefined &&
git pull --ff-only --verify-signatures untrusted >pulloutput &&
- test_i18ngrep "has a good GPG signature" pulloutput
+ test_grep "has a good GPG signature" pulloutput
'
test_expect_success GPG 'pull signed commit with --verify-signatures' '
test_when_finished "git reset --hard && git checkout initial" &&
git pull --verify-signatures signed >pulloutput &&
- test_i18ngrep "has a good GPG signature" pulloutput
+ test_grep "has a good GPG signature" pulloutput
'
test_expect_success GPG 'pull commit with bad signature without verification' '
@@ -106,7 +106,7 @@ test_expect_success GPG 'pull unsigned commit into unborn branch' '
git init empty-repo &&
test_must_fail \
git -C empty-repo pull --verify-signatures .. 2>pullerror &&
- test_i18ngrep "does not have a GPG signature" pullerror
+ test_grep "does not have a GPG signature" pullerror
'
test_expect_success GPG 'pull commit into unborn branch with bad signature and --verify-signatures' '
@@ -114,7 +114,7 @@ test_expect_success GPG 'pull commit into unborn branch with bad signature and -
git init empty-repo &&
test_must_fail \
git -C empty-repo pull --ff-only --verify-signatures ../bad 2>pullerror &&
- test_i18ngrep "has a bad GPG signature" pullerror
+ test_grep "has a bad GPG signature" pullerror
'
test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures' '
@@ -122,7 +122,7 @@ test_expect_success GPG 'pull commit into unborn branch with untrusted signature
git init empty-repo &&
test_must_fail \
git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror &&
- test_i18ngrep "has an untrusted GPG signature" pullerror
+ test_grep "has an untrusted GPG signature" pullerror
'
test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=ultimate' '
@@ -131,7 +131,7 @@ test_expect_success GPG 'pull commit into unborn branch with untrusted signature
test_config_global gpg.minTrustLevel ultimate &&
test_must_fail \
git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror &&
- test_i18ngrep "has an untrusted GPG signature" pullerror
+ test_grep "has an untrusted GPG signature" pullerror
'
test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=marginal' '
@@ -140,7 +140,7 @@ test_expect_success GPG 'pull commit into unborn branch with untrusted signature
test_config_global gpg.minTrustLevel marginal &&
test_must_fail \
git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror &&
- test_i18ngrep "has an untrusted GPG signature" pullerror
+ test_grep "has an untrusted GPG signature" pullerror
'
test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=undefined' '
@@ -148,7 +148,7 @@ test_expect_success GPG 'pull commit into unborn branch with untrusted signature
git init empty-repo &&
test_config_global gpg.minTrustLevel undefined &&
git -C empty-repo pull --ff-only --verify-signatures ../untrusted >pulloutput &&
- test_i18ngrep "has a good GPG signature" pulloutput
+ test_grep "has a good GPG signature" pulloutput
'
test_done
diff --git a/t/t5574-fetch-output.sh b/t/t5574-fetch-output.sh
index 90e6dcb9a7..a9b06b2251 100755
--- a/t/t5574-fetch-output.sh
+++ b/t/t5574-fetch-output.sh
@@ -281,12 +281,12 @@ test_expect_success '--no-show-forced-updates' '
(
cd forced-update-clone &&
git fetch --show-forced-updates origin 2>output &&
- test_i18ngrep "(forced update)" output
+ test_grep "(forced update)" output
) &&
(
cd no-forced-update-clone &&
git fetch --no-show-forced-updates origin 2>output &&
- test_i18ngrep ! "(forced update)" output
+ test_grep ! "(forced update)" output
)
'
diff --git a/t/t5580-unc-paths.sh b/t/t5580-unc-paths.sh
index cd7604fff9..d7537a162b 100755
--- a/t/t5580-unc-paths.sh
+++ b/t/t5580-unc-paths.sh
@@ -75,7 +75,7 @@ test_expect_success push '
test_expect_success MINGW 'remote nick cannot contain backslashes' '
BACKSLASHED="$(winpwd | tr / \\\\)" &&
git ls-remote "$BACKSLASHED" 2>err &&
- test_i18ngrep ! "unable to access" err
+ test_grep ! "unable to access" err
'
test_expect_success 'unc alternates' '
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index b7d5551262..47eae641f0 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -630,7 +630,7 @@ test_expect_success 'clone on case-insensitive fs' '
test_expect_success CASE_INSENSITIVE_FS 'colliding file detection' '
grep X icasefs/warning &&
grep x icasefs/warning &&
- test_i18ngrep "the following paths have collided" icasefs/warning
+ test_grep "the following paths have collided" icasefs/warning
'
test_expect_success 'clone with GIT_DEFAULT_HASH' '
@@ -696,7 +696,7 @@ test_expect_success 'partial clone: warn if server does not support object filte
git clone --filter=blob:limit=0 "file://$(pwd)/server" client 2> err &&
- test_i18ngrep "filtering not recognized by server" err
+ test_grep "filtering not recognized by server" err
'
test_expect_success 'batch missing blob request during checkout' '
@@ -767,7 +767,7 @@ test_expect_success 'reject cloning shallow repository using HTTP' '
test_when_finished "rm -rf repo" &&
git clone --bare --no-local --depth=1 src "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
test_must_fail git -c protocol.version=2 clone --reject-shallow $HTTPD_URL/smart/repo.git repo 2>err &&
- test_i18ngrep -e "source repository is shallow, reject to clone." err &&
+ test_grep -e "source repository is shallow, reject to clone." err &&
git clone --no-reject-shallow $HTTPD_URL/smart/repo.git repo
'
diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh
index 9845fc04d5..9b32db8478 100755
--- a/t/t5604-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
@@ -317,7 +317,7 @@ test_expect_success SYMLINKS 'clone repo with symlinked or unknown files at obje
for option in --local --no-hardlinks --dissociate
do
test_must_fail git clone $option T T$option 2>err || return 1 &&
- test_i18ngrep "symlink.*exists" err || return 1
+ test_grep "symlink.*exists" err || return 1
done &&
# But `--shared` clones should still work, even when specifying
diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh
index 5890319b97..fc4bbd9daf 100755
--- a/t/t5606-clone-options.sh
+++ b/t/t5606-clone-options.sh
@@ -39,7 +39,7 @@ test_expect_success 'clone -o' '
test_expect_success 'rejects invalid -o/--origin' '
test_must_fail git clone -o "bad...name" parent clone-bad-name 2>err &&
- test_i18ngrep "'\''bad...name'\'' is not a valid remote name" err
+ test_grep "'\''bad...name'\'' is not a valid remote name" err
'
@@ -56,7 +56,7 @@ test_expect_success 'disallows --bare with --separate-git-dir' '
test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err &&
test_debug "cat err" &&
- test_i18ngrep -e "options .--bare. and .--separate-git-dir. cannot be used together" err
+ test_grep -e "options .--bare. and .--separate-git-dir. cannot be used together" err
'
@@ -71,7 +71,7 @@ test_expect_success 'disallows --bundle-uri with shallow options' '
test_expect_success 'reject cloning shallow repository' '
test_when_finished "rm -rf repo" &&
test_must_fail git clone --reject-shallow shallow-repo out 2>err &&
- test_i18ngrep -e "source repository is shallow, reject to clone." err &&
+ test_grep -e "source repository is shallow, reject to clone." err &&
git clone --no-reject-shallow shallow-repo repo
'
@@ -79,7 +79,7 @@ test_expect_success 'reject cloning shallow repository' '
test_expect_success 'reject cloning non-local shallow repository' '
test_when_finished "rm -rf repo" &&
test_must_fail git clone --reject-shallow --no-local shallow-repo out 2>err &&
- test_i18ngrep -e "source repository is shallow, reject to clone." err &&
+ test_grep -e "source repository is shallow, reject to clone." err &&
git clone --no-reject-shallow --no-local shallow-repo repo
'
@@ -149,7 +149,7 @@ test_expect_success 'redirected clone does not show progress' '
git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&
! grep % err &&
- test_i18ngrep ! "Checking connectivity" err
+ test_grep ! "Checking connectivity" err
'
diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index 51705aa86a..0d1e92d996 100755
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -24,7 +24,7 @@ test_expect_success 'setup' '
test_expect_success '"verify" needs a worktree' '
git bundle create tip.bundle -1 main &&
nongit test_must_fail git bundle verify ../tip.bundle 2>err &&
- test_i18ngrep "need a repository" err
+ test_grep "need a repository" err
'
test_expect_success 'annotated tags can be excluded by rev-list options' '
@@ -166,7 +166,7 @@ test_expect_success 'git bundle v3 rejects unknown capabilities' '
@unknown=silly
EOF
test_must_fail git bundle verify new 2>output &&
- test_i18ngrep "unknown capability .unknown=silly." output
+ test_grep "unknown capability .unknown=silly." output
'
test_done
diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh
index 727caff443..298d4befab 100755
--- a/t/t5611-clone-config.sh
+++ b/t/t5611-clone-config.sh
@@ -103,7 +103,7 @@ test_expect_success 'set up shallow repository' '
test_expect_success 'clone.rejectshallow=true should reject cloning shallow repo' '
test_when_finished "rm -rf out" &&
test_must_fail git -c clone.rejectshallow=true clone --no-local shallow-repo out 2>err &&
- test_i18ngrep -e "source repository is shallow, reject to clone." err &&
+ test_grep -e "source repository is shallow, reject to clone." err &&
git -c clone.rejectshallow=false clone --no-local shallow-repo out
'
@@ -111,7 +111,7 @@ test_expect_success 'clone.rejectshallow=true should reject cloning shallow repo
test_expect_success 'option --[no-]reject-shallow override clone.rejectshallow config' '
test_when_finished "rm -rf out" &&
test_must_fail git -c clone.rejectshallow=false clone --reject-shallow --no-local shallow-repo out 2>err &&
- test_i18ngrep -e "source repository is shallow, reject to clone." err &&
+ test_grep -e "source repository is shallow, reject to clone." err &&
git -c clone.rejectshallow=true clone --no-reject-shallow --no-local shallow-repo out
'
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 8759fc2853..2da7291e37 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -353,14 +353,14 @@ test_expect_success 'upload-pack complains of bogus filter config' '
test_must_fail git \
-c uploadpackfilter.tree.maxdepth \
upload-pack . >/dev/null 2>err &&
- test_i18ngrep "unable to parse.*tree.maxdepth" err
+ test_grep "unable to parse.*tree.maxdepth" err
'
test_expect_success 'upload-pack fails banned object filters' '
test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
"file://$(pwd)/srv.bare" pc3 2>err &&
- test_i18ngrep "filter '\''blob:none'\'' not supported" err
+ test_grep "filter '\''blob:none'\'' not supported" err
'
test_expect_success 'upload-pack fails banned combine object filters' '
@@ -370,14 +370,14 @@ test_expect_success 'upload-pack fails banned combine object filters' '
test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
--filter=blob:none "file://$(pwd)/srv.bare" pc3 2>err &&
- test_i18ngrep "filter '\''blob:none'\'' not supported" err
+ test_grep "filter '\''blob:none'\'' not supported" err
'
test_expect_success 'upload-pack fails banned object filters with fallback' '
test_config -C srv.bare uploadpackfilter.allow false &&
test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
"file://$(pwd)/srv.bare" pc3 2>err &&
- test_i18ngrep "filter '\''blob:none'\'' not supported" err
+ test_grep "filter '\''blob:none'\'' not supported" err
'
test_expect_success 'upload-pack limits tree depth filters' '
@@ -386,7 +386,7 @@ test_expect_success 'upload-pack limits tree depth filters' '
test_config -C srv.bare uploadpackfilter.tree.maxDepth 0 &&
test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
"file://$(pwd)/srv.bare" pc3 2>err &&
- test_i18ngrep "tree filter allows max depth 0, but got 1" err &&
+ test_grep "tree filter allows max depth 0, but got 1" err &&
git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" pc4 &&
@@ -394,7 +394,7 @@ test_expect_success 'upload-pack limits tree depth filters' '
git clone --no-checkout --filter=tree:5 "file://$(pwd)/srv.bare" pc5 &&
test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:6 \
"file://$(pwd)/srv.bare" pc6 2>err &&
- test_i18ngrep "tree filter allows max depth 5, but got 6" err
+ test_grep "tree filter allows max depth 5, but got 6" err
'
test_expect_success 'partial clone fetches blobs pointed to by refs even if normally filtered out' '
@@ -459,11 +459,11 @@ test_expect_success 'partial clone with unresolvable sparse filter fails cleanly
test_must_fail git clone --no-local --bare \
--filter=sparse:oid=main:no-such-name \
sparse-src dst.git 2>err &&
- test_i18ngrep "unable to access sparse blob in .main:no-such-name" err &&
+ test_grep "unable to access sparse blob in .main:no-such-name" err &&
test_must_fail git clone --no-local --bare \
--filter=sparse:oid=main \
sparse-src dst.git 2>err &&
- test_i18ngrep "unable to parse sparse filter data in" err
+ test_grep "unable to parse sparse filter data in" err
'
setup_triangle () {
@@ -493,8 +493,8 @@ setup_triangle () {
TREE_HASH=$(git -C server rev-parse HEAD~1^{tree}) &&
git -C promisor-remote fetch --keep "file://$(pwd)/server" "$TREE_HASH" &&
git -C promisor-remote count-objects -v >object-count &&
- test_i18ngrep "count: 0" object-count &&
- test_i18ngrep "in-pack: 2" object-count &&
+ test_grep "count: 0" object-count &&
+ test_grep "in-pack: 2" object-count &&
# Set it as the promisor remote of client. Thus, whenever
# the client lazy fetches, the lazy fetch will succeed only if it is
@@ -748,7 +748,7 @@ test_expect_success 'upon cloning, check that all refs point to objects' '
test_must_fail git -c protocol.version=2 clone \
--filter=blob:none $HTTPD_URL/one_time_perl/server repo 2>err &&
- test_i18ngrep "did not send all necessary objects" err &&
+ test_grep "did not send all necessary objects" err &&
# Ensure that the one-time-perl script was used.
! test -e "$HTTPD_ROOT_PATH/one-time-perl"
diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh
index f21e5e9d33..3591bc2417 100755
--- a/t/t5701-git-serve.sh
+++ b/t/t5701-git-serve.sh
@@ -52,7 +52,7 @@ test_expect_success 'request invalid capability' '
0000
EOF
test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
- test_i18ngrep "unknown capability" err
+ test_grep "unknown capability" err
'
test_expect_success 'request with no command' '
@@ -62,7 +62,7 @@ test_expect_success 'request with no command' '
0000
EOF
test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
- test_i18ngrep "no command requested" err
+ test_grep "no command requested" err
'
test_expect_success 'request invalid command' '
@@ -73,7 +73,7 @@ test_expect_success 'request invalid command' '
0000
EOF
test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
- test_i18ngrep "invalid command" err
+ test_grep "invalid command" err
'
test_expect_success 'request capability as command' '
@@ -115,7 +115,7 @@ test_expect_success 'wrong object-format' '
0000
EOF
test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
- test_i18ngrep "mismatched object format" err
+ test_grep "mismatched object format" err
'
# Test the basics of ls-refs
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 6af5c2062f..3c0c6047d5 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -189,8 +189,8 @@ test_expect_success 'warn if using server-option with ls-remote with legacy prot
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
ls-remote -o hello -o world "file://$(pwd)/file_parent" main 2>err &&
- test_i18ngrep "see protocol.version in" err &&
- test_i18ngrep "server options require protocol version 2 or later" err
+ test_grep "see protocol.version in" err &&
+ test_grep "server options require protocol version 2 or later" err
'
test_expect_success 'clone with file:// using protocol v2' '
@@ -377,8 +377,8 @@ test_expect_success 'warn if using server-option with fetch with legacy protocol
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C temp_child -c protocol.version=0 \
fetch -o hello -o world "file://$(pwd)/file_parent" main 2>err &&
- test_i18ngrep "see protocol.version in" err &&
- test_i18ngrep "server options require protocol version 2 or later" err
+ test_grep "see protocol.version in" err &&
+ test_grep "server options require protocol version 2 or later" err
'
test_expect_success 'server-options are sent when cloning' '
@@ -399,8 +399,8 @@ test_expect_success 'warn if using server-option with clone with legacy protocol
clone --server-option=hello --server-option=world \
"file://$(pwd)/file_parent" myclone 2>err &&
- test_i18ngrep "see protocol.version in" err &&
- test_i18ngrep "server options require protocol version 2 or later" err
+ test_grep "see protocol.version in" err &&
+ test_grep "server options require protocol version 2 or later" err
'
test_expect_success 'upload-pack respects config using protocol v2' '
@@ -495,7 +495,7 @@ test_expect_success 'partial clone warns if filter is not advertised' '
git -C server config uploadpack.allowfilter 0 &&
git -c protocol.version=2 \
clone --filter=blob:none "file://$(pwd)/server" client 2>err &&
- test_i18ngrep "filtering not recognized by server, ignoring" err
+ test_grep "filtering not recognized by server, ignoring" err
'
test_expect_success 'even with handcrafted request, filter does not work if not advertised' '
@@ -736,7 +736,7 @@ test_expect_success 'file:// --negotiate-only with protocol v0' '
--negotiate-only \
--negotiation-tip=$(git -C client rev-parse HEAD) \
origin 2>err &&
- test_i18ngrep "negotiate-only requires protocol v2" err
+ test_grep "negotiate-only requires protocol v2" err
'
test_expect_success 'push with custom path does not request v2' '
@@ -809,7 +809,7 @@ test_expect_success 'clone repository with http:// using protocol v2 with incomp
# Server responded using protocol v2
grep "git< version 2" log &&
# Client reported appropriate failure
- test_i18ngrep "bytes of length header were received" err
+ test_grep "bytes of length header were received" err
'
test_expect_success 'clone repository with http:// using protocol v2 with incomplete pktline body' '
@@ -826,7 +826,7 @@ test_expect_success 'clone repository with http:// using protocol v2 with incomp
# Server responded using protocol v2
grep "git< version 2" log &&
# Client reported appropriate failure
- test_i18ngrep "bytes of body are still expected" err
+ test_grep "bytes of body are still expected" err
'
test_expect_success 'clone with http:// using protocol v2 and invalid parameters' '
@@ -973,7 +973,7 @@ test_expect_success 'when server sends "ready", expect DELIM' '
test_must_fail git -C http_child -c protocol.version=2 \
fetch "$HTTPD_URL/one_time_perl/http_parent" 2> err &&
- test_i18ngrep "expected packfile to be sent after .ready." err
+ test_grep "expected packfile to be sent after .ready." err
'
test_expect_success 'when server does not send "ready", expect FLUSH' '
@@ -1001,7 +1001,7 @@ test_expect_success 'when server does not send "ready", expect FLUSH' '
fetch "$HTTPD_URL/one_time_perl/http_parent" 2> err &&
grep "fetch< .*acknowledgments" log &&
! grep "fetch< .*ready" log &&
- test_i18ngrep "expected no other sections to be sent after no .ready." err
+ test_grep "expected no other sections to be sent after no .ready." err
'
configure_exclusion () {
@@ -1111,7 +1111,7 @@ test_expect_success 'fetching with valid packfile URI but invalid hash fails' '
git -c protocol.version=2 \
-c fetch.uriprotocols=http,https \
clone "$HTTPD_URL/smart/http_parent" http_child 2>err &&
- test_i18ngrep "pack downloaded from.*does not match expected hash" err
+ test_grep "pack downloaded from.*does not match expected hash" err
'
test_expect_success 'packfile-uri with transfer.fsckobjects' '
@@ -1165,7 +1165,7 @@ test_expect_success 'packfile-uri with transfer.fsckobjects fails on bad object'
test_must_fail git -c protocol.version=2 -c transfer.fsckobjects=1 \
-c fetch.uriprotocols=http,https \
clone "$HTTPD_URL/smart/http_parent" http_child 2>error &&
- test_i18ngrep "invalid author/committer line - missing email" error
+ test_grep "invalid author/committer line - missing email" error
'
test_expect_success 'packfile-uri with transfer.fsckobjects succeeds when .gitmodules is separate from tree' '
@@ -1213,7 +1213,7 @@ test_expect_success 'packfile-uri with transfer.fsckobjects fails when .gitmodul
test_must_fail git -c protocol.version=2 -c transfer.fsckobjects=1 \
-c fetch.uriprotocols=http,https \
clone "$HTTPD_URL/smart/http_parent" http_child 2>err &&
- test_i18ngrep "disallowed submodule name" err
+ test_grep "disallowed submodule name" err
'
test_expect_success 'packfile-uri path redacted in trace' '
@@ -1296,7 +1296,7 @@ test_expect_success 'http:// --negotiate-only without wait-for-done support' '
--negotiate-only \
--negotiation-tip=$(git -C client rev-parse HEAD) \
origin 2>err &&
- test_i18ngrep "server does not support wait-for-done" err
+ test_grep "server does not support wait-for-done" err
'
test_expect_success 'http:// --negotiate-only with protocol v0' '
@@ -1310,7 +1310,7 @@ test_expect_success 'http:// --negotiate-only with protocol v0' '
--negotiate-only \
--negotiation-tip=$(git -C client rev-parse HEAD) \
origin 2>err &&
- test_i18ngrep "negotiate-only requires protocol v2" err
+ test_grep "negotiate-only requires protocol v2" err
'
# DO NOT add non-httpd-specific tests here, because the last part of this
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index df74f80061..191097171b 100755
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -484,7 +484,7 @@ test_expect_success 'server is initially ahead - no ref in want' '
cp -r "$LOCAL_PRISTINE" local &&
inconsistency main $(test_oid numeric) &&
test_must_fail git -C local fetch 2>err &&
- test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
+ test_grep "fatal: remote error: upload-pack: not our ref" err
'
test_expect_success 'server is initially ahead - ref in want' '
@@ -530,7 +530,7 @@ test_expect_success 'server loses a ref - ref in want' '
echo "s/main/rain/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
test_must_fail git -C local fetch 2>err &&
- test_i18ngrep "fatal: remote error: unknown ref refs/heads/rain" err
+ test_grep "fatal: remote error: unknown ref refs/heads/rain" err
'
# DO NOT add non-httpd-specific tests here, because the last part of this
diff --git a/t/t5704-protocol-violations.sh b/t/t5704-protocol-violations.sh
index ae1a00afb0..11be64fc03 100755
--- a/t/t5704-protocol-violations.sh
+++ b/t/t5704-protocol-violations.sh
@@ -18,7 +18,7 @@ test_expect_success 'extra delim packet in v2 ls-refs args' '
} >input &&
test_must_fail env GIT_PROTOCOL=version=2 \
git upload-pack . <input 2>err &&
- test_i18ngrep "expected flush after ls-refs arguments" err
+ test_grep "expected flush after ls-refs arguments" err
'
test_expect_success 'extra delim packet in v2 fetch args' '
@@ -31,7 +31,7 @@ test_expect_success 'extra delim packet in v2 fetch args' '
} >input &&
test_must_fail env GIT_PROTOCOL=version=2 \
git upload-pack . <input 2>err &&
- test_i18ngrep "expected flush after fetch arguments" err
+ test_grep "expected flush after fetch arguments" err
'
test_expect_success 'bogus symref in v0 capabilities' '
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index d386076dbd..4e0a77f985 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -137,7 +137,7 @@ test_expect_success 'forced push' '
test_expect_success 'cloning without refspec' '
GIT_REMOTE_TESTGIT_NOREFSPEC=1 \
git clone "testgit::${PWD}/server" local2 2>error &&
- test_i18ngrep "this remote helper should implement refspec capability" error &&
+ test_grep "this remote helper should implement refspec capability" error &&
compare_refs local2 HEAD server HEAD
'
@@ -145,7 +145,7 @@ test_expect_success 'pulling without refspecs' '
(cd local2 &&
git reset --hard &&
GIT_REMOTE_TESTGIT_NOREFSPEC=1 git pull 2>../error) &&
- test_i18ngrep "this remote helper should implement refspec capability" error &&
+ test_grep "this remote helper should implement refspec capability" error &&
compare_refs local2 HEAD server HEAD
'
@@ -157,7 +157,7 @@ test_expect_success 'pushing without refspecs' '
GIT_REMOTE_TESTGIT_NOREFSPEC=1 &&
export GIT_REMOTE_TESTGIT_NOREFSPEC &&
test_must_fail git push 2>../error) &&
- test_i18ngrep "remote-helper doesn.t support push; refspec needed" error
+ test_grep "remote-helper doesn.t support push; refspec needed" error
'
test_expect_success 'pulling without marks' '
@@ -256,7 +256,7 @@ clean_mark () {
test_expect_success 'proper failure checks for fetching' '
(cd local &&
test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git fetch 2>error &&
- test_i18ngrep -q "error while running fast-import" error
+ test_grep -q "error while running fast-import" error
)
'
diff --git a/t/t5812-proto-disable-http.sh b/t/t5812-proto-disable-http.sh
index d8da5f58d1..769c717e88 100755
--- a/t/t5812-proto-disable-http.sh
+++ b/t/t5812-proto-disable-http.sh
@@ -20,7 +20,7 @@ test_expect_success 'http(s) transport respects GIT_ALLOW_PROTOCOL' '
test_must_fail env GIT_ALLOW_PROTOCOL=http:https \
GIT_SMART_HTTP=0 \
git clone "$HTTPD_URL/ftp-redir/repo.git" 2>stderr &&
- test_i18ngrep -E "(ftp.*disabled|your curl version is too old)" stderr
+ test_grep -E "(ftp.*disabled|your curl version is too old)" stderr
'
test_expect_success 'curl limits redirects' '
diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh
index 16635ecc33..73a2465aa0 100755
--- a/t/t6001-rev-list-graft.sh
+++ b/t/t6001-rev-list-graft.sh
@@ -118,10 +118,10 @@ done
test_expect_success 'show advice that grafts are deprecated' '
git show HEAD 2>err &&
- test_i18ngrep "git replace" err &&
+ test_grep "git replace" err &&
test_config advice.graftFileDeprecated false &&
git show HEAD 2>err &&
- test_i18ngrep ! "git replace" err
+ test_grep ! "git replace" err
'
test_done
diff --git a/t/t6021-rev-list-exclude-hidden.sh b/t/t6021-rev-list-exclude-hidden.sh
index 1a9d37e638..cdf7aa9427 100755
--- a/t/t6021-rev-list-exclude-hidden.sh
+++ b/t/t6021-rev-list-exclude-hidden.sh
@@ -151,12 +151,12 @@ do
do
test_expect_success "$section: fails with --$pseudoopt" '
test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
- test_i18ngrep "error: --exclude-hidden cannot be used together with --$pseudoopt" err
+ test_grep "error: --exclude-hidden cannot be used together with --$pseudoopt" err
'
test_expect_success "$section: fails with --$pseudoopt=pattern" '
test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
- test_i18ngrep "error: --exclude-hidden cannot be used together with --$pseudoopt" err
+ test_grep "error: --exclude-hidden cannot be used together with --$pseudoopt" err
'
done
done
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index fb01bd6abc..2a5b7d8379 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -220,7 +220,7 @@ test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if
cp .git/BISECT_START saved &&
test_must_fail git bisect start $HASH4 foo -- &&
git branch > branch.output &&
- test_i18ngrep "* (no branch, bisect started on other)" branch.output > /dev/null &&
+ test_grep "* (no branch, bisect started on other)" branch.output > /dev/null &&
test_cmp saved .git/BISECT_START
'
test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' '
@@ -588,7 +588,7 @@ test_expect_success 'bisect starting with a detached HEAD' '
test_expect_success 'bisect errors out if bad and good are mistaken' '
git bisect reset &&
test_must_fail git bisect start $HASH2 $HASH4 2> rev_list_error &&
- test_i18ngrep "mistook good and bad" rev_list_error &&
+ test_grep "mistook good and bad" rev_list_error &&
git bisect reset
'
@@ -630,7 +630,7 @@ test_expect_success 'side branch creation' '
test_expect_success 'good merge base when good and bad are siblings' '
git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
- test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
+ test_grep "merge base must be tested" my_bisect_log.txt &&
grep $HASH4 my_bisect_log.txt &&
git bisect good > my_bisect_log.txt &&
! grep "merge base must be tested" my_bisect_log.txt &&
@@ -639,7 +639,7 @@ test_expect_success 'good merge base when good and bad are siblings' '
'
test_expect_success 'skipped merge base when good and bad are siblings' '
git bisect start "$SIDE_HASH7" "$HASH7" > my_bisect_log.txt &&
- test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
+ test_grep "merge base must be tested" my_bisect_log.txt &&
grep $HASH4 my_bisect_log.txt &&
git bisect skip > my_bisect_log.txt 2>&1 &&
grep "warning" my_bisect_log.txt &&
@@ -649,11 +649,11 @@ test_expect_success 'skipped merge base when good and bad are siblings' '
test_expect_success 'bad merge base when good and bad are siblings' '
git bisect start "$HASH7" HEAD > my_bisect_log.txt &&
- test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
+ test_grep "merge base must be tested" my_bisect_log.txt &&
grep $HASH4 my_bisect_log.txt &&
test_must_fail git bisect bad > my_bisect_log.txt 2>&1 &&
- test_i18ngrep "merge base $HASH4 is bad" my_bisect_log.txt &&
- test_i18ngrep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt &&
+ test_grep "merge base $HASH4 is bad" my_bisect_log.txt &&
+ test_grep "fixed between $HASH4 and \[$SIDE_HASH7\]" my_bisect_log.txt &&
git bisect reset
'
@@ -704,9 +704,9 @@ test_expect_success '"git bisect run --first-parent" simple case' '
test_expect_success 'good merge bases when good and bad are siblings' '
git bisect start "$B_HASH" "$A_HASH" > my_bisect_log.txt &&
- test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
+ test_grep "merge base must be tested" my_bisect_log.txt &&
git bisect good > my_bisect_log2.txt &&
- test_i18ngrep "merge base must be tested" my_bisect_log2.txt &&
+ test_grep "merge base must be tested" my_bisect_log2.txt &&
{
{
grep "$SIDE_HASH5" my_bisect_log.txt &&
@@ -721,14 +721,14 @@ test_expect_success 'good merge bases when good and bad are siblings' '
test_expect_success 'optimized merge base checks' '
git bisect start "$HASH7" "$SIDE_HASH7" > my_bisect_log.txt &&
- test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
+ test_grep "merge base must be tested" my_bisect_log.txt &&
grep "$HASH4" my_bisect_log.txt &&
git bisect good > my_bisect_log2.txt &&
test -f ".git/BISECT_ANCESTORS_OK" &&
test "$HASH6" = $(git rev-parse --verify HEAD) &&
git bisect bad &&
git bisect good "$A_HASH" > my_bisect_log4.txt &&
- test_i18ngrep "merge base must be tested" my_bisect_log4.txt &&
+ test_grep "merge base must be tested" my_bisect_log4.txt &&
test_path_is_missing ".git/BISECT_ANCESTORS_OK"
'
@@ -806,7 +806,7 @@ test_expect_success 'skipping away from skipped commit' '
test_expect_success 'erroring out when using bad path arguments' '
test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
- test_i18ngrep "bad path arguments" error.txt
+ test_grep "bad path arguments" error.txt
'
test_expect_success 'test bisection on bare repo - --no-checkout specified' '
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 7ddbd96e58..acc281c116 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -83,13 +83,13 @@ test_expect_success 'checkout (diverged from upstream)' '
(
cd test && git checkout b1
) >actual &&
- test_i18ngrep "have 1 and 1 different" actual
+ test_grep "have 1 and 1 different" actual
'
test_expect_success 'checkout with local tracked branch' '
git checkout main &&
git checkout follower >actual &&
- test_i18ngrep "is ahead of" actual
+ test_grep "is ahead of" actual
'
test_expect_success 'checkout (upstream is gone)' '
@@ -97,14 +97,14 @@ test_expect_success 'checkout (upstream is gone)' '
cd test &&
git checkout b5
) >actual &&
- test_i18ngrep "is based on .*, but the upstream is gone." actual
+ test_grep "is based on .*, but the upstream is gone." actual
'
test_expect_success 'checkout (up-to-date with upstream)' '
(
cd test && git checkout b6
) >actual &&
- test_i18ngrep "Your branch is up to date with .origin/main" actual
+ test_grep "Your branch is up to date with .origin/main" actual
'
test_expect_success 'status (diverged from upstream)' '
@@ -114,7 +114,7 @@ test_expect_success 'status (diverged from upstream)' '
# reports nothing to commit
test_must_fail git commit --dry-run
) >actual &&
- test_i18ngrep "have 1 and 1 different" actual
+ test_grep "have 1 and 1 different" actual
'
test_expect_success 'status (upstream is gone)' '
@@ -124,7 +124,7 @@ test_expect_success 'status (upstream is gone)' '
# reports nothing to commit
test_must_fail git commit --dry-run
) >actual &&
- test_i18ngrep "is based on .*, but the upstream is gone." actual
+ test_grep "is based on .*, but the upstream is gone." actual
'
test_expect_success 'status (up-to-date with upstream)' '
@@ -134,7 +134,7 @@ test_expect_success 'status (up-to-date with upstream)' '
# reports nothing to commit
test_must_fail git commit --dry-run
) >actual &&
- test_i18ngrep "Your branch is up to date with .origin/main" actual
+ test_grep "Your branch is up to date with .origin/main" actual
'
cat >expect <<\EOF
@@ -253,7 +253,7 @@ test_expect_success 'fail to track lightweight tags' '
git checkout main &&
git tag light &&
test_must_fail git branch --track lighttrack light >actual &&
- test_i18ngrep ! "set up to track" actual &&
+ test_grep ! "set up to track" actual &&
test_must_fail git checkout lighttrack
'
@@ -261,7 +261,7 @@ test_expect_success 'fail to track annotated tags' '
git checkout main &&
git tag -m heavy heavy &&
test_must_fail git branch --track heavytrack heavy >actual &&
- test_i18ngrep ! "set up to track" actual &&
+ test_grep ! "set up to track" actual &&
test_must_fail git checkout heavytrack
'
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index c9925edf20..c6e9b33e44 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -44,7 +44,7 @@ commit_peeling_shows_parents ()
_parent_number=$(( $_parent_number + 1 ))
done &&
test_must_fail git rev-parse --verify $_commit^$_parent_number 2>err &&
- test_i18ngrep "Needed a single revision" err
+ test_grep "Needed a single revision" err
}
commit_has_parents ()
@@ -137,8 +137,8 @@ test_expect_success 'tag replaced commit' '
test_expect_success '"git fsck" works' '
git fsck main >fsck_main.out &&
- test_i18ngrep "dangling commit $R" fsck_main.out &&
- test_i18ngrep "dangling tag $(git show-ref -s refs/tags/mytag)" fsck_main.out &&
+ test_grep "dangling commit $R" fsck_main.out &&
+ test_grep "dangling tag $(git show-ref -s refs/tags/mytag)" fsck_main.out &&
test -z "$(git fsck)"
'
@@ -490,9 +490,9 @@ test_expect_success '--convert-graft-file' '
$(git rev-parse HEAD^^ HEAD^ HEAD^^ HEAD^2) \
>.git/info/grafts &&
git status 2>stderr &&
- test_i18ngrep "hint:.*grafts is deprecated" stderr &&
+ test_grep "hint:.*grafts is deprecated" stderr &&
git replace --convert-graft-file 2>stderr &&
- test_i18ngrep ! "hint:.*grafts is deprecated" stderr &&
+ test_grep ! "hint:.*grafts is deprecated" stderr &&
test_path_is_missing .git/info/grafts &&
: verify that the history is now "grafted" &&
@@ -503,8 +503,8 @@ test_expect_success '--convert-graft-file' '
test_when_finished "rm -f .git/info/grafts" &&
echo $EMPTY_BLOB $EMPTY_TREE >.git/info/grafts &&
test_must_fail git replace --convert-graft-file 2>err &&
- test_i18ngrep "$EMPTY_BLOB $EMPTY_TREE" err &&
- test_i18ngrep "$EMPTY_BLOB $EMPTY_TREE" .git/info/grafts
+ test_grep "$EMPTY_BLOB $EMPTY_TREE" err &&
+ test_grep "$EMPTY_BLOB $EMPTY_TREE" .git/info/grafts
'
test_done
diff --git a/t/t6102-rev-list-unexpected-objects.sh b/t/t6102-rev-list-unexpected-objects.sh
index 9350b5fd2c..5d28507efc 100755
--- a/t/t6102-rev-list-unexpected-objects.sh
+++ b/t/t6102-rev-list-unexpected-objects.sh
@@ -28,7 +28,7 @@ test_expect_success 'TODO (should fail!): traverse unexpected non-blob entry (lo
test_expect_success 'traverse unexpected non-blob entry (seen)' '
test_must_fail git rev-list --objects $tree $broken_tree >output 2>&1 &&
- test_i18ngrep "is not a blob" output
+ test_grep "is not a blob" output
'
test_expect_success 'setup unexpected non-tree entry' '
@@ -42,7 +42,7 @@ test_expect_success 'traverse unexpected non-tree entry (lone)' '
test_expect_success 'traverse unexpected non-tree entry (seen)' '
test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1 &&
- test_i18ngrep "is not a tree" output
+ test_grep "is not a tree" output
'
test_expect_success 'setup unexpected non-commit parent' '
@@ -54,13 +54,13 @@ test_expect_success 'setup unexpected non-commit parent' '
test_expect_success 'traverse unexpected non-commit parent (lone)' '
test_must_fail git rev-list --objects $broken_commit >output 2>&1 &&
- test_i18ngrep "not a commit" output
+ test_grep "not a commit" output
'
test_expect_success 'traverse unexpected non-commit parent (seen)' '
test_must_fail git rev-list --objects $blob $broken_commit \
>output 2>&1 &&
- test_i18ngrep "not a commit" output
+ test_grep "not a commit" output
'
test_expect_success 'setup unexpected non-tree root' '
@@ -76,7 +76,7 @@ test_expect_success 'traverse unexpected non-tree root (lone)' '
test_expect_success 'traverse unexpected non-tree root (seen)' '
test_must_fail git rev-list --objects $blob $broken_commit \
>output 2>&1 &&
- test_i18ngrep "not a tree" output
+ test_grep "not a tree" output
'
test_expect_success 'setup unexpected non-commit tag' '
@@ -93,7 +93,7 @@ test_expect_success 'traverse unexpected non-commit tag (lone)' '
test_expect_success 'traverse unexpected non-commit tag (seen)' '
test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
- test_i18ngrep "not a commit" output
+ test_grep "not a commit" output
'
test_expect_success 'setup unexpected non-tree tag' '
@@ -110,7 +110,7 @@ test_expect_success 'traverse unexpected non-tree tag (lone)' '
test_expect_success 'traverse unexpected non-tree tag (seen)' '
test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
- test_i18ngrep "not a tree" output
+ test_grep "not a tree" output
'
test_expect_success 'setup unexpected non-blob tag' '
@@ -127,7 +127,7 @@ test_expect_success 'traverse unexpected non-blob tag (lone)' '
test_expect_success 'traverse unexpected non-blob tag (seen)' '
test_must_fail git rev-list --objects $commit $tag >output 2>&1 &&
- test_i18ngrep "not a blob" output
+ test_grep "not a blob" output
'
test_done
diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
index 8d9d6604f0..52822b9461 100755
--- a/t/t6112-rev-list-filters-objects.sh
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -457,7 +457,7 @@ expect_invalid_filter_spec () {
test_must_fail git -C r3 rev-list --objects --filter="$spec" HEAD \
>actual 2>actual_stderr &&
test_must_be_empty actual &&
- test_i18ngrep "$err" actual_stderr
+ test_grep "$err" actual_stderr
}
test_expect_success 'combine:... while URL-encoding things that should not be' '
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 0a5c487540..e78315d23d 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -392,7 +392,7 @@ test_expect_success 'describe directly tagged blob' '
test_expect_success 'describe tag object' '
git tag test-blob-1 -a -m msg unique-file:file &&
test_must_fail git describe test-blob-1 2>actual &&
- test_i18ngrep "fatal: test-blob-1 is neither a commit nor blob" actual
+ test_grep "fatal: test-blob-1 is neither a commit nor blob" actual
'
test_expect_success ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '
diff --git a/t/t6134-pathspec-in-submodule.sh b/t/t6134-pathspec-in-submodule.sh
index 3214d9db97..16ce4cfcc6 100755
--- a/t/t6134-pathspec-in-submodule.sh
+++ b/t/t6134-pathspec-in-submodule.sh
@@ -27,7 +27,7 @@ test_expect_success 'error message for path inside submodule' '
test_expect_success 'error message for path inside submodule from within submodule' '
test_must_fail git -C sub add . 2>actual &&
- test_i18ngrep "in unpopulated submodule" actual
+ test_grep "in unpopulated submodule" actual
'
test_done
diff --git a/t/t6135-pathspec-with-attrs.sh b/t/t6135-pathspec-with-attrs.sh
index f70c395e75..a9c1e4e0ec 100755
--- a/t/t6135-pathspec-with-attrs.sh
+++ b/t/t6135-pathspec-with-attrs.sh
@@ -236,7 +236,7 @@ test_expect_success 'check label excluding other labels' '
test_expect_success 'fail on multiple attr specifiers in one pathspec item' '
test_must_fail git ls-files . ":(attr:labelB,attr:labelC)" 2>actual &&
- test_i18ngrep "Only one" actual
+ test_grep "Only one" actual
'
test_expect_success 'fail if attr magic is used places not implemented' '
@@ -246,7 +246,7 @@ test_expect_success 'fail if attr magic is used places not implemented' '
# though, but git-add is convenient as it has its own internal pathspec
# parsing.
test_must_fail git add ":(attr:labelB)" 2>actual &&
- test_i18ngrep "magic not supported" actual
+ test_grep "magic not supported" actual
'
test_expect_success 'abort on giving invalid label on the command line' '
@@ -269,12 +269,12 @@ test_expect_success 'check attribute list' '
test_expect_success 'backslash cannot be the last character' '
test_must_fail git ls-files ":(attr:label=foo\\ labelA=bar)" 2>actual &&
- test_i18ngrep "not allowed as last character in attr value" actual
+ test_grep "not allowed as last character in attr value" actual
'
test_expect_success 'backslash cannot be used as a value' '
test_must_fail git ls-files ":(attr:label=f\\\oo)" 2>actual &&
- test_i18ngrep "for value matching" actual
+ test_grep "for value matching" actual
'
test_expect_success 'reading from .gitattributes in a subdirectory (1)' '
diff --git a/t/t6136-pathspec-in-bare.sh b/t/t6136-pathspec-in-bare.sh
index ae8b5379e2..2db37a6596 100755
--- a/t/t6136-pathspec-in-bare.sh
+++ b/t/t6136-pathspec-in-bare.sh
@@ -15,11 +15,11 @@ test_expect_success 'log and ls-files in a bare repository' '
cd bare &&
test_must_fail git log -- .. >out 2>err &&
test_must_be_empty out &&
- test_i18ngrep "outside repository" err &&
+ test_grep "outside repository" err &&
test_must_fail git ls-files -- .. >out 2>err &&
test_must_be_empty out &&
- test_i18ngrep "outside repository" err
+ test_grep "outside repository" err
)
'
@@ -28,11 +28,11 @@ test_expect_success 'log and ls-files in .git directory' '
cd .git &&
test_must_fail git log -- .. >out 2>err &&
test_must_be_empty out &&
- test_i18ngrep "outside repository" err &&
+ test_grep "outside repository" err &&
test_must_fail git ls-files -- .. >out 2>err &&
test_must_be_empty out &&
- test_i18ngrep "outside repository" err
+ test_grep "outside repository" err
)
'
diff --git a/t/t6402-merge-rename.sh b/t/t6402-merge-rename.sh
index 772238e582..2738b50c2a 100755
--- a/t/t6402-merge-rename.sh
+++ b/t/t6402-merge-rename.sh
@@ -311,13 +311,13 @@ test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' '
git checkout -q renamed-file-has-no-conflicts^0 &&
test_must_fail git merge --strategy=recursive dir-in-way >output &&
- test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
- test_i18ngrep "Auto-merging dir" output &&
+ test_grep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
+ test_grep "Auto-merging dir" output &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test_i18ngrep "moving it to dir~HEAD instead" output
+ test_grep "moving it to dir~HEAD instead" output
else
- test_i18ngrep "Adding as dir~HEAD instead" output
+ test_grep "Adding as dir~HEAD instead" output
fi &&
test_stdout_line_count = 3 git ls-files -u &&
@@ -338,13 +338,13 @@ test_expect_success 'Same as previous, but merged other way' '
test_must_fail git merge --strategy=recursive renamed-file-has-no-conflicts >output 2>errors &&
! grep "error: refusing to lose untracked file at" errors &&
- test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
- test_i18ngrep "Auto-merging dir" output &&
+ test_grep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
+ test_grep "Auto-merging dir" output &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test_i18ngrep "moving it to dir~renamed-file-has-no-conflicts instead" output
+ test_grep "moving it to dir~renamed-file-has-no-conflicts instead" output
else
- test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output
+ test_grep "Adding as dir~renamed-file-has-no-conflicts instead" output
fi &&
test_stdout_line_count = 3 git ls-files -u &&
diff --git a/t/t6422-merge-rename-corner-cases.sh b/t/t6422-merge-rename-corner-cases.sh
index 076b6a74d5..80d7b5eaba 100755
--- a/t/t6422-merge-rename-corner-cases.sh
+++ b/t/t6422-merge-rename-corner-cases.sh
@@ -476,7 +476,7 @@ test_expect_success 'handle rename-with-content-merge vs. add' '
git checkout A^0 &&
test_must_fail git merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (.*/add)" out &&
+ test_grep "CONFLICT (.*/add)" out &&
git ls-files -s >out &&
test_line_count = 2 out &&
@@ -522,7 +522,7 @@ test_expect_success 'handle rename-with-content-merge vs. add, merge other way'
git checkout B^0 &&
test_must_fail git merge -s recursive A^0 >out &&
- test_i18ngrep "CONFLICT (.*/add)" out &&
+ test_grep "CONFLICT (.*/add)" out &&
git ls-files -s >out &&
test_line_count = 2 out &&
@@ -602,7 +602,7 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '
git checkout B^0 &&
test_must_fail git merge -s recursive C^0 >out &&
- test_i18ngrep "CONFLICT (\(.*\)/\1)" out &&
+ test_grep "CONFLICT (\(.*\)/\1)" out &&
git ls-files -s >out &&
test_line_count = 2 out &&
@@ -914,8 +914,8 @@ test_expect_merge_algorithm failure success 'rad-check: rename/add/delete confli
# be flexible in the type of console output message(s) reported
# for this particular case; we will be more stringent about the
# contents of the index and working directory.
- test_i18ngrep "CONFLICT (.*/add)" out &&
- test_i18ngrep "CONFLICT (rename.*/delete)" out &&
+ test_grep "CONFLICT (.*/add)" out &&
+ test_grep "CONFLICT (rename.*/delete)" out &&
test_must_be_empty err &&
git ls-files -s >file_count &&
@@ -988,8 +988,8 @@ test_expect_merge_algorithm failure success 'rrdd-check: rename/rename(2to1)/del
# be flexible in the type of console output message(s) reported
# for this particular case; we will be more stringent about the
# contents of the index and working directory.
- test_i18ngrep "CONFLICT (\(.*\)/\1)" out &&
- test_i18ngrep "CONFLICT (rename.*delete)" out &&
+ test_grep "CONFLICT (\(.*\)/\1)" out &&
+ test_grep "CONFLICT (rename.*delete)" out &&
test_must_be_empty err &&
git ls-files -s >file_count &&
@@ -1068,7 +1068,7 @@ test_expect_merge_algorithm failure success 'mod6-check: chains of rename/rename
test_must_fail git merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "CONFLICT (rename/rename)" out &&
+ test_grep "CONFLICT (rename/rename)" out &&
test_must_be_empty err &&
git ls-files -s >file_count &&
diff --git a/t/t6423-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh
index 944de75b80..88d1cf2cde 100755
--- a/t/t6423-merge-rename-directories.sh
+++ b/t/t6423-merge-rename-directories.sh
@@ -276,7 +276,7 @@ test_expect_success '1d: Directory renames cause a rename/rename(2to1) conflict'
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (\(.*\)/\1)" out &&
+ test_grep "CONFLICT (\(.*\)/\1)" out &&
git ls-files -s >out &&
test_line_count = 8 out &&
@@ -515,7 +515,7 @@ test_expect_success '2a: Directory split into two on one side, with equal number
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT.*directory rename split" out &&
+ test_grep "CONFLICT.*directory rename split" out &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -591,7 +591,7 @@ test_expect_success '2b: Directory split into two on one side, with equal number
git rev-parse >expect \
O:z/b O:z/c B:x/d &&
test_cmp expect actual &&
- test_i18ngrep ! "CONFLICT.*directory rename split" out
+ test_grep ! "CONFLICT.*directory rename split" out
)
'
@@ -726,8 +726,8 @@ test_expect_success '3b: Avoid implicit rename if involved as source on current
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep CONFLICT.*rename/rename.*z/d.*x/d.*w/d out &&
- test_i18ngrep ! CONFLICT.*rename/rename.*y/d out &&
+ test_grep CONFLICT.*rename/rename.*z/d.*x/d.*w/d out &&
+ test_grep ! CONFLICT.*rename/rename.*y/d out &&
git ls-files -s >out &&
test_line_count = 5 out &&
@@ -938,7 +938,7 @@ test_expect_success '5a: Merge directories, other side adds files to original an
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT.*implicit dir rename" out &&
+ test_grep "CONFLICT.*implicit dir rename" out &&
git ls-files -s >out &&
test_line_count = 6 out &&
@@ -1013,7 +1013,7 @@ test_expect_success '5b: Rename/delete in order to get add/add/add conflict' '
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (add/add).* y/d" out &&
+ test_grep "CONFLICT (add/add).* y/d" out &&
git ls-files -s >out &&
test_line_count = 5 out &&
@@ -1094,8 +1094,8 @@ test_expect_success '5c: Transitive rename would cause rename/rename/rename/add/
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (rename/rename).*x/d.*w/d.*z/d" out &&
- test_i18ngrep "CONFLICT (add/add).* y/d" out &&
+ test_grep "CONFLICT (rename/rename).*x/d.*w/d.*z/d" out &&
+ test_grep "CONFLICT (add/add).* y/d" out &&
git ls-files -s >out &&
test_line_count = 9 out &&
@@ -1179,7 +1179,7 @@ test_expect_success '5d: Directory/file/file conflict due to directory rename' '
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (file/directory).*y/d" out &&
+ test_grep "CONFLICT (file/directory).*y/d" out &&
git ls-files -s >out &&
test_line_count = 6 out &&
@@ -1278,7 +1278,7 @@ test_expect_success '6a: Tricky rename/delete' '
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (rename/delete).*z/c.*y/c" out &&
+ test_grep "CONFLICT (rename/delete).*z/c.*y/c" out &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
@@ -1740,8 +1740,8 @@ test_expect_success '7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-o
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (rename/rename).*z/b.*y/b.*w/b" out &&
- test_i18ngrep "CONFLICT (rename/rename).*z/c.*y/c.*x/c" out &&
+ test_grep "CONFLICT (rename/rename).*z/b.*y/b.*w/b" out &&
+ test_grep "CONFLICT (rename/rename).*z/c.*y/c.*x/c" out &&
git ls-files -s >out &&
test_line_count = 7 out &&
@@ -1813,7 +1813,7 @@ test_expect_success '7b: rename/rename(2to1), but only due to transitive rename'
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (\(.*\)/\1)" out &&
+ test_grep "CONFLICT (\(.*\)/\1)" out &&
git ls-files -s >out &&
test_line_count = 4 out &&
@@ -1900,7 +1900,7 @@ test_expect_success '7c: rename/rename(1to...2or3); transitive rename may add co
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (rename/rename).*x/d.*w/d.*y/d" out &&
+ test_grep "CONFLICT (rename/rename).*x/d.*w/d.*y/d" out &&
git ls-files -s >out &&
test_line_count = 5 out &&
@@ -1965,7 +1965,7 @@ test_expect_success '7d: transitive rename involved in rename/delete; how is it
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+ test_grep "CONFLICT (rename/delete).*x/d.*y/d" out &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
@@ -2071,7 +2071,7 @@ test_expect_success '7e: transitive rename in rename/delete AND dirs in the way'
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+ test_grep "CONFLICT (rename/delete).*x/d.*y/d" out &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
@@ -2330,7 +2330,7 @@ test_expect_success '8c: modify/delete or rename+modify/delete' '
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "CONFLICT (modify/delete).* z/d" out &&
+ test_grep "CONFLICT (modify/delete).* z/d" out &&
git ls-files -s >out &&
test_line_count = 5 out &&
@@ -2491,8 +2491,8 @@ test_expect_success '8e: Both sides rename, one side adds to original directory'
git checkout A^0 &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep CONFLICT.*rename/rename.*z/c.*y/c.*w/c out &&
- test_i18ngrep CONFLICT.*rename/rename.*z/b.*y/b.*w/b out &&
+ test_grep CONFLICT.*rename/rename.*z/c.*y/c.*w/c out &&
+ test_grep CONFLICT.*rename/rename.*z/b.*y/b.*w/b out &&
git ls-files -s >out &&
test_line_count = 7 out &&
@@ -2741,7 +2741,7 @@ test_expect_success '9c: Doubly transitive rename?' '
git checkout A^0 &&
git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "WARNING: Avoiding applying x -> z rename to x/f" out &&
+ test_grep "WARNING: Avoiding applying x -> z rename to x/f" out &&
git ls-files -s >out &&
test_line_count = 6 out &&
@@ -2830,10 +2830,10 @@ test_expect_success '9d: N-way transitive rename?' '
git checkout A^0 &&
git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
- test_i18ngrep "WARNING: Avoiding applying z -> y rename to z/t" out &&
- test_i18ngrep "WARNING: Avoiding applying y -> x rename to y/a" out &&
- test_i18ngrep "WARNING: Avoiding applying x -> w rename to x/b" out &&
- test_i18ngrep "WARNING: Avoiding applying w -> v rename to w/c" out &&
+ test_grep "WARNING: Avoiding applying z -> y rename to z/t" out &&
+ test_grep "WARNING: Avoiding applying y -> x rename to y/a" out &&
+ test_grep "WARNING: Avoiding applying x -> w rename to x/b" out &&
+ test_grep "WARNING: Avoiding applying w -> v rename to w/c" out &&
git ls-files -s >out &&
test_line_count = 7 out &&
@@ -3215,7 +3215,7 @@ test_expect_success '10a: Overwrite untracked with normal rename/delete' '
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_path_is_missing .git/MERGE_HEAD &&
- test_i18ngrep "The following untracked working tree files would be overwritten by merge" err &&
+ test_grep "The following untracked working tree files would be overwritten by merge" err &&
git ls-files -s >out &&
test_line_count = 1 out &&
@@ -3287,7 +3287,7 @@ test_expect_success '10b: Overwrite untracked with dir rename + delete' '
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
test_path_is_missing .git/MERGE_HEAD &&
- test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
+ test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
git ls-files -s >out &&
test_line_count = 1 out &&
@@ -3296,8 +3296,8 @@ test_expect_success '10b: Overwrite untracked with dir rename + delete' '
git ls-files -o >out &&
test_line_count = 5 out
else
- test_i18ngrep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
- test_i18ngrep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
+ test_grep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
+ test_grep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -3377,7 +3377,7 @@ test_expect_success '10c1: Overwrite untracked with dir rename/rename(1to2)' '
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
test_path_is_missing .git/MERGE_HEAD &&
- test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
+ test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
git ls-files -s >out &&
test_line_count = 4 out &&
@@ -3386,8 +3386,8 @@ test_expect_success '10c1: Overwrite untracked with dir rename/rename(1to2)' '
git ls-files -o >out &&
test_line_count = 3 out
else
- test_i18ngrep "CONFLICT (rename/rename)" out &&
- test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
+ test_grep "CONFLICT (rename/rename)" out &&
+ test_grep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
git ls-files -s >out &&
test_line_count = 6 out &&
@@ -3428,7 +3428,7 @@ test_expect_success '10c2: Overwrite untracked with dir rename/rename(1to2), oth
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
test_path_is_missing .git/MERGE_HEAD &&
- test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
+ test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
git ls-files -s >out &&
test_line_count = 4 out &&
@@ -3437,8 +3437,8 @@ test_expect_success '10c2: Overwrite untracked with dir rename/rename(1to2), oth
git ls-files -o >out &&
test_line_count = 3 out
else
- test_i18ngrep "CONFLICT (rename/rename)" out &&
- test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~HEAD instead" out &&
+ test_grep "CONFLICT (rename/rename)" out &&
+ test_grep "Refusing to lose untracked file at y/c; adding as y/c~HEAD instead" out &&
git ls-files -s >out &&
test_line_count = 6 out &&
@@ -3517,7 +3517,7 @@ test_expect_success '10d: Delete untracked with dir rename/rename(2to1)' '
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
test_path_is_missing .git/MERGE_HEAD &&
- test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
+ test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
git ls-files -s >out &&
test_line_count = 6 out &&
@@ -3526,8 +3526,8 @@ test_expect_success '10d: Delete untracked with dir rename/rename(2to1)' '
git ls-files -o >out &&
test_line_count = 3 out
else
- test_i18ngrep "CONFLICT (rename/rename)" out &&
- test_i18ngrep "Refusing to lose untracked file at y/wham" out &&
+ test_grep "CONFLICT (rename/rename)" out &&
+ test_grep "Refusing to lose untracked file at y/wham" out &&
git ls-files -s >out &&
test_line_count = 6 out &&
@@ -3606,7 +3606,7 @@ test_expect_merge_algorithm failure success '10e: Does git complain about untrac
echo random >z/c &&
git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep ! "following untracked working tree files would be overwritten by merge" err &&
+ test_grep ! "following untracked working tree files would be overwritten by merge" err &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -3690,9 +3690,9 @@ test_expect_success '11a: Avoid losing dirty contents with simple rename' '
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
test_path_is_missing .git/MERGE_HEAD &&
- test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ test_grep "error: Your local changes to the following files would be overwritten by merge" err
else
- test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+ test_grep "Refusing to lose dirty file at z/c" out &&
git ls-files -s >out &&
test_line_count = 2 out &&
@@ -3770,10 +3770,10 @@ test_expect_success '11b: Avoid losing dirty file involved in directory rename'
then
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
test_path_is_missing .git/MERGE_HEAD &&
- test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ test_grep "error: Your local changes to the following files would be overwritten by merge" err
else
git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+ test_grep "Refusing to lose dirty file at z/c" out &&
git ls-files -s >out &&
test_line_count = 3 out &&
@@ -3853,9 +3853,9 @@ test_expect_success '11c: Avoid losing not-uptodate with rename + D/F conflict'
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
test_path_is_missing .git/MERGE_HEAD &&
- test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ test_grep "error: Your local changes to the following files would be overwritten by merge" err
else
- test_i18ngrep "following files would be overwritten by merge" err
+ test_grep "following files would be overwritten by merge" err
fi &&
grep -q stuff y/c &&
@@ -3927,9 +3927,9 @@ test_expect_success '11d: Avoid losing not-uptodate with rename + D/F conflict'
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
test_path_is_missing .git/MERGE_HEAD &&
- test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ test_grep "error: Your local changes to the following files would be overwritten by merge" err
else
- test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+ test_grep "Refusing to lose dirty file at z/c" out &&
git ls-files -s >out &&
test_line_count = 4 out &&
@@ -4013,10 +4013,10 @@ test_expect_success '11e: Avoid deleting not-uptodate with dir rename/rename(1to
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
test_path_is_missing .git/MERGE_HEAD &&
- test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ test_grep "error: Your local changes to the following files would be overwritten by merge" err
else
- test_i18ngrep "CONFLICT (rename/rename)" out &&
- test_i18ngrep "Refusing to lose dirty file at y/c" out &&
+ test_grep "CONFLICT (rename/rename)" out &&
+ test_grep "Refusing to lose dirty file at y/c" out &&
git ls-files -s >out &&
test_line_count = 7 out &&
@@ -4102,10 +4102,10 @@ test_expect_success '11f: Avoid deleting not-uptodate with dir rename/rename(2to
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
test_path_is_missing .git/MERGE_HEAD &&
- test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ test_grep "error: Your local changes to the following files would be overwritten by merge" err
else
- test_i18ngrep "CONFLICT (rename/rename)" out &&
- test_i18ngrep "Refusing to lose dirty file at y/wham" out &&
+ test_grep "CONFLICT (rename/rename)" out &&
+ test_grep "Refusing to lose dirty file at y/wham" out &&
git ls-files -s >out &&
test_line_count = 4 out &&
@@ -5417,8 +5417,8 @@ test_expect_success '13a(conflict): messages for newly added files' '
test_must_fail git merge -s recursive B^0 >out 2>err &&
- test_i18ngrep CONFLICT..file.location.*z/e/f.added.in.B^0.*y/e/f out &&
- test_i18ngrep CONFLICT..file.location.*z/d.added.in.B^0.*y/d out &&
+ test_grep CONFLICT..file.location.*z/e/f.added.in.B^0.*y/e/f out &&
+ test_grep CONFLICT..file.location.*z/d.added.in.B^0.*y/d out &&
git ls-files >paths &&
! grep z/ paths &&
@@ -5441,8 +5441,8 @@ test_expect_success '13a(info): messages for newly added files' '
git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep Path.updated:.*z/e/f.added.in.B^0.*y/e/f out &&
- test_i18ngrep Path.updated:.*z/d.added.in.B^0.*y/d out &&
+ test_grep Path.updated:.*z/e/f.added.in.B^0.*y/e/f out &&
+ test_grep Path.updated:.*z/d.added.in.B^0.*y/d out &&
git ls-files >paths &&
! grep z/ paths &&
@@ -5507,8 +5507,8 @@ test_expect_success '13b(conflict): messages for transitive rename with conflict
test_must_fail git merge -s recursive B^0 >out 2>err &&
- test_i18ngrep CONFLICT.*content.*Merge.conflict.in.y/d out &&
- test_i18ngrep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
+ test_grep CONFLICT.*content.*Merge.conflict.in.y/d out &&
+ test_grep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
git ls-files >paths &&
! grep z/ paths &&
@@ -5529,8 +5529,8 @@ test_expect_success '13b(info): messages for transitive rename with conflicted c
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep CONFLICT.*content.*Merge.conflict.in.y/d out &&
- test_i18ngrep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
+ test_grep CONFLICT.*content.*Merge.conflict.in.y/d out &&
+ test_grep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
git ls-files >paths &&
! grep z/ paths &&
@@ -5593,7 +5593,7 @@ test_expect_success '13c(conflict): messages for rename/rename(1to1) via transit
test_must_fail git merge -s recursive B^0 >out 2>err &&
- test_i18ngrep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
+ test_grep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
git ls-files >paths &&
! grep z/ paths &&
@@ -5614,7 +5614,7 @@ test_expect_success '13c(info): messages for rename/rename(1to1) via transitive
git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
+ test_grep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
git ls-files >paths &&
! grep z/ paths &&
@@ -5682,8 +5682,8 @@ test_expect_success '13d(conflict): messages for rename/rename(1to1) via dual tr
test_must_fail git merge -s recursive B^0 >out 2>err &&
- test_i18ngrep CONFLICT..file.location.*a/y.renamed.to.b/y.*moved.to.d/y out &&
- test_i18ngrep CONFLICT..file.location.*a/y.renamed.to.c/y.*moved.to.d/y out &&
+ test_grep CONFLICT..file.location.*a/y.renamed.to.b/y.*moved.to.d/y out &&
+ test_grep CONFLICT..file.location.*a/y.renamed.to.c/y.*moved.to.d/y out &&
git ls-files >paths &&
! grep b/ paths &&
@@ -5706,8 +5706,8 @@ test_expect_success '13d(info): messages for rename/rename(1to1) via dual transi
git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep Path.updated.*a/y.renamed.to.b/y.*moving.it.to.d/y out &&
- test_i18ngrep Path.updated.*a/y.renamed.to.c/y.*moving.it.to.d/y out &&
+ test_grep Path.updated.*a/y.renamed.to.b/y.*moving.it.to.d/y out &&
+ test_grep Path.updated.*a/y.renamed.to.c/y.*moving.it.to.d/y out &&
git ls-files >paths &&
! grep b/ paths &&
@@ -5821,9 +5821,9 @@ test_expect_success '13e: directory rename detection in recursive case' '
git -c merge.directoryRenames=conflict merge -s recursive C^0 >out 2>err &&
- test_i18ngrep ! CONFLICT out &&
- test_i18ngrep ! BUG: err &&
- test_i18ngrep ! core.dumped err &&
+ test_grep ! CONFLICT out &&
+ test_grep ! BUG: err &&
+ test_grep ! core.dumped err &&
test_must_be_empty err &&
git ls-files >paths &&
diff --git a/t/t6424-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index a61f20c22f..7677c5f08d 100755
--- a/t/t6424-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
@@ -178,7 +178,7 @@ test_expect_success 'merge-recursive, when index==head but head!=HEAD' '
test_when_finished "git clean -fd" && # Do not leave untracked around
# Merge B & F, with B as "head"
git merge-recursive A -- B F > out &&
- test_i18ngrep "Already up to date" out
+ test_grep "Already up to date" out
'
test_expect_success 'recursive, when file has staged changes not matching HEAD nor what a merge would give' '
@@ -194,7 +194,7 @@ test_expect_success 'recursive, when file has staged changes not matching HEAD n
test_must_fail git merge -s recursive E^0 2>err &&
git rev-parse --verify :subdir/a >actual &&
test_cmp expect actual &&
- test_i18ngrep "changes to the following files would be overwritten" err
+ test_grep "changes to the following files would be overwritten" err
'
test_expect_success 'recursive, when file has staged changes matching what a merge would give' '
@@ -210,7 +210,7 @@ test_expect_success 'recursive, when file has staged changes matching what a mer
test_must_fail git merge -s recursive E^0 2>err &&
git rev-parse --verify :subdir/a >actual &&
test_cmp expect actual &&
- test_i18ngrep "changes to the following files would be overwritten" err
+ test_grep "changes to the following files would be overwritten" err
'
test_expect_success 'octopus, unrelated file touched' '
diff --git a/t/t6425-merge-rename-delete.sh b/t/t6425-merge-rename-delete.sh
index 93cd2869b1..b95b064311 100755
--- a/t/t6425-merge-rename-delete.sh
+++ b/t/t6425-merge-rename-delete.sh
@@ -21,8 +21,8 @@ test_expect_success 'rename/delete' '
git commit -m "delete" &&
test_must_fail git merge --strategy=recursive rename >output &&
- test_i18ngrep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
- test_i18ngrep "CONFLICT (rename/delete): A.*deleted in HEAD." output
+ test_grep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
+ test_grep "CONFLICT (rename/delete): A.*deleted in HEAD." output
'
test_done
diff --git a/t/t6426-merge-skip-unneeded-updates.sh b/t/t6426-merge-skip-unneeded-updates.sh
index fd21c1a486..b059475ed0 100755
--- a/t/t6426-merge-skip-unneeded-updates.sh
+++ b/t/t6426-merge-skip-unneeded-updates.sh
@@ -375,7 +375,7 @@ test_expect_success '2c: Modify b & add c VS rename b->c' '
export GIT_MERGE_VERBOSITY &&
test_must_fail git merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "CONFLICT (.*/add):" out &&
+ test_grep "CONFLICT (.*/add):" out &&
test_must_be_empty err &&
git ls-files -s >index_files &&
diff --git a/t/t6430-merge-recursive.sh b/t/t6430-merge-recursive.sh
index 07067bb347..ca15e6dd6d 100755
--- a/t/t6430-merge-recursive.sh
+++ b/t/t6430-merge-recursive.sh
@@ -308,13 +308,13 @@ test_expect_success 'fail if the index has unresolved entries' '
test_must_fail git merge "$c5" &&
test_must_fail git merge "$c5" 2> out &&
- test_i18ngrep "not possible because you have unmerged files" out &&
+ test_grep "not possible because you have unmerged files" out &&
git add -u &&
test_must_fail git merge "$c5" 2> out &&
- test_i18ngrep "You have not concluded your merge" out &&
+ test_grep "You have not concluded your merge" out &&
rm -f .git/MERGE_HEAD &&
test_must_fail git merge "$c5" 2> out &&
- test_i18ngrep "Your local changes to the following files would be overwritten by merge:" out
+ test_grep "Your local changes to the following files would be overwritten by merge:" out
'
test_expect_success 'merge-recursive remove conflict' '
@@ -713,7 +713,7 @@ test_expect_success 'merge-recursive remembers the names of all base trees' '
test_must_fail git -c merge.verbosity=5 merge-recursive $(cat trees) -- $c1 $c3 >out &&
# ...but make sure it fails in the expected way
- test_i18ngrep CONFLICT.*rename/rename out &&
+ test_grep CONFLICT.*rename/rename out &&
# merge-recursive prints in reverse order, but we do not care
sort <trees >expect &&
diff --git a/t/t6433-merge-toplevel.sh b/t/t6433-merge-toplevel.sh
index b16031465f..0f611c4003 100755
--- a/t/t6433-merge-toplevel.sh
+++ b/t/t6433-merge-toplevel.sh
@@ -151,7 +151,7 @@ test_expect_success 'refuse two-project merge by default, quit before --autostas
echo change >>one.t &&
git diff >expect &&
test_must_fail git merge --autostash five 2>err &&
- test_i18ngrep ! "stash" err &&
+ test_grep ! "stash" err &&
git diff >actual &&
test_cmp expect actual
'
@@ -169,7 +169,7 @@ test_expect_success 'two-project merge with --allow-unrelated-histories with --a
echo change >>one.t &&
git diff one.t >expect &&
git merge --allow-unrelated-histories --autostash five 2>err &&
- test_i18ngrep "Applied autostash." err &&
+ test_grep "Applied autostash." err &&
git diff one.t >actual &&
test_cmp expect actual
'
diff --git a/t/t6436-merge-overwrite.sh b/t/t6436-merge-overwrite.sh
index c0b7bd7c3f..4f4376421e 100755
--- a/t/t6436-merge-overwrite.sh
+++ b/t/t6436-merge-overwrite.sh
@@ -104,12 +104,12 @@ test_expect_success 'will not overwrite unstaged changes in renamed file' '
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
test_must_fail git merge c1a >out 2>err &&
- test_i18ngrep "would be overwritten by merge" err &&
+ test_grep "would be overwritten by merge" err &&
test_cmp important other.c &&
test_path_is_missing .git/MERGE_HEAD
else
test_must_fail git merge c1a >out &&
- test_i18ngrep "Refusing to lose dirty file at other.c" out &&
+ test_grep "Refusing to lose dirty file at other.c" out &&
test_path_is_file other.c~HEAD &&
test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
test_cmp important other.c
diff --git a/t/t6437-submodule-merge.sh b/t/t6437-submodule-merge.sh
index c9a86f2e94..f1440697d1 100755
--- a/t/t6437-submodule-merge.sh
+++ b/t/t6437-submodule-merge.sh
@@ -479,7 +479,7 @@ test_expect_merge_algorithm failure success !FAIL_PREREQS 'directory/submodule c
# We do not want files within the submodule to prevent the
# merge from starting; we should not be writing to such paths
# anyway.
- test_i18ngrep ! "refusing to lose untracked file at" err
+ test_grep ! "refusing to lose untracked file at" err
)
'
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index 69509d0c11..4a188cefb0 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -41,7 +41,7 @@ test_expect_success 'gc does not leave behind pid file' '
test_expect_success 'gc --gobbledegook' '
test_expect_code 129 git gc --nonsense 2>err &&
- test_i18ngrep "[Uu]sage: git gc" err
+ test_grep "[Uu]sage: git gc" err
'
test_expect_success 'gc -h with invalid configuration' '
@@ -52,7 +52,7 @@ test_expect_success 'gc -h with invalid configuration' '
echo "[gc] pruneexpire = CORRUPT" >>.git/config &&
test_expect_code 129 git gc -h >usage 2>&1
) &&
- test_i18ngrep "[Uu]sage" broken/usage
+ test_grep "[Uu]sage" broken/usage
'
test_expect_success 'gc is not aborted due to a stale symref' '
@@ -155,7 +155,7 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre
test_commit "$(test_oid obj4)" &&
git gc --auto 2>err &&
- test_i18ngrep ! "^warning:" err &&
+ test_grep ! "^warning:" err &&
ls .git/objects/pack/pack-*.pack | sort >post_packs &&
comm -1 -3 existing_packs post_packs >new &&
comm -2 -3 existing_packs post_packs >del &&
@@ -166,15 +166,15 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre
test_expect_success 'gc --no-quiet' '
GIT_PROGRESS_DELAY=0 git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
test_must_be_empty stdout &&
- test_i18ngrep "Computing commit graph generation numbers" stderr
+ test_grep "Computing commit graph generation numbers" stderr
'
test_expect_success TTY 'with TTY: gc --no-quiet' '
test_terminal env GIT_PROGRESS_DELAY=0 \
git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
test_must_be_empty stdout &&
- test_i18ngrep "Enumerating objects" stderr &&
- test_i18ngrep "Computing commit graph generation numbers" stderr
+ test_grep "Enumerating objects" stderr &&
+ test_grep "Computing commit graph generation numbers" stderr
'
test_expect_success 'gc --quiet' '
@@ -321,7 +321,7 @@ test_expect_success 'background auto gc does not run if gc.log is present and re
test_config gc.autodetach true &&
echo fleem >.git/gc.log &&
git gc --auto 2>err &&
- test_i18ngrep "^warning:" err &&
+ test_grep "^warning:" err &&
test_config gc.logexpiry 5.days &&
test-tool chmtime =-345600 .git/gc.log &&
git gc --auto &&
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index f136ea76f7..879a6dce60 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -296,7 +296,7 @@ test_expect_success 'git mv error on conflicted file' '
EOF
test_must_fail git mv conflict newname 2>actual &&
- test_i18ngrep "conflicted" actual
+ test_grep "conflicted" actual
'
test_expect_success 'git mv should overwrite symlink to a file' '
@@ -482,7 +482,7 @@ test_expect_success 'checking out a commit before submodule moved needs manual u
git mv sub sub2 &&
git commit -m "moved sub to sub2" &&
git checkout -q HEAD^ 2>actual &&
- test_i18ngrep "^warning: unable to rmdir '\''sub2'\'':" actual &&
+ test_grep "^warning: unable to rmdir '\''sub2'\'':" actual &&
git status -s sub2 >actual &&
echo "?? sub2/" >expected &&
test_cmp expected actual &&
diff --git a/t/t7105-reset-patch.sh b/t/t7105-reset-patch.sh
index 9b46da7aaa..05079c7246 100755
--- a/t/t7105-reset-patch.sh
+++ b/t/t7105-reset-patch.sh
@@ -30,21 +30,21 @@ test_expect_success PERL 'git reset -p' '
test_write_lines n y | git reset -p >output &&
verify_state dir/foo work head &&
verify_saved_state bar &&
- test_i18ngrep "Unstage" output
+ test_grep "Unstage" output
'
test_expect_success PERL 'git reset -p HEAD^' '
test_write_lines n y | git reset -p HEAD^ >output &&
verify_state dir/foo work parent &&
verify_saved_state bar &&
- test_i18ngrep "Apply" output
+ test_grep "Apply" output
'
test_expect_success PERL 'git reset -p HEAD^^{tree}' '
test_write_lines n y | git reset -p HEAD^^{tree} >output &&
verify_state dir/foo work parent &&
verify_saved_state bar &&
- test_i18ngrep "Apply" output
+ test_grep "Apply" output
'
test_expect_success PERL 'git reset -p HEAD^:dir/foo (blob fails)' '
diff --git a/t/t7106-reset-unborn-branch.sh b/t/t7106-reset-unborn-branch.sh
index a0b67a0b84..d20e5709f9 100755
--- a/t/t7106-reset-unborn-branch.sh
+++ b/t/t7106-reset-unborn-branch.sh
@@ -42,7 +42,7 @@ test_expect_success PERL 'reset -p' '
git ls-files >actual &&
test_must_be_empty actual &&
- test_i18ngrep "Unstage" output
+ test_grep "Unstage" output
'
test_expect_success 'reset --soft is a no-op' '
diff --git a/t/t7107-reset-pathspec-file.sh b/t/t7107-reset-pathspec-file.sh
index af5ea406db..020db201d5 100755
--- a/t/t7107-reset-pathspec-file.sh
+++ b/t/t7107-reset-pathspec-file.sh
@@ -161,19 +161,19 @@ test_expect_success 'error conditions' '
git rm fileA.t &&
test_must_fail git reset --pathspec-from-file=list --patch 2>err &&
- test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
+ test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err &&
- test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+ test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git reset --pathspec-file-nul 2>err &&
- test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+ test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
test_must_fail git reset --soft --pathspec-from-file=list 2>err &&
- test_i18ngrep -e "fatal: Cannot do soft reset with paths" err &&
+ test_grep -e "fatal: Cannot do soft reset with paths" err &&
test_must_fail git reset --hard --pathspec-from-file=list 2>err &&
- test_i18ngrep -e "fatal: Cannot do hard reset with paths" err
+ test_grep -e "fatal: Cannot do hard reset with paths" err
'
test_done
diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
index 772480a345..7ee180f81d 100755
--- a/t/t7110-reset-merge.sh
+++ b/t/t7110-reset-merge.sh
@@ -238,7 +238,7 @@ test_expect_success '"reset --keep HEAD^" fails with pending merge' '
git reset --hard third &&
test_must_fail git merge branch1 &&
test_must_fail git reset --keep HEAD^ 2>err.log &&
- test_i18ngrep "middle of a merge" err.log
+ test_grep "middle of a merge" err.log
'
# The next test will test the following:
@@ -264,7 +264,7 @@ test_expect_success '"reset --keep HEAD" fails with pending merge' '
git reset --hard third &&
test_must_fail git merge branch1 &&
test_must_fail git reset --keep HEAD 2>err.log &&
- test_i18ngrep "middle of a merge" err.log
+ test_grep "middle of a merge" err.log
'
test_expect_success '--merge is ok with added/deleted merge' '
@@ -290,7 +290,7 @@ test_expect_success '--keep fails with added/deleted merge' '
git diff --exit-code file3 &&
git diff --exit-code branch3 file3 &&
test_must_fail git reset --keep HEAD 2>err.log &&
- test_i18ngrep "middle of a merge" err.log
+ test_grep "middle of a merge" err.log
'
test_done
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 35b9e6ed6b..c2550f3028 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -217,7 +217,7 @@ test_expect_success 'switch to another branch while carrying a deletion' '
git rm two &&
test_must_fail git checkout simple 2>errs &&
- test_i18ngrep overwritten errs &&
+ test_grep overwritten errs &&
test_must_fail git read-tree --quiet -m -u HEAD simple 2>errs &&
test_must_be_empty errs
@@ -229,7 +229,7 @@ test_expect_success 'checkout to detach HEAD (with advice declined)' '
git checkout -f renamer &&
git clean -f &&
git checkout renamer^ 2>messages &&
- test_i18ngrep "HEAD is now at $rev" messages &&
+ test_grep "HEAD is now at $rev" messages &&
test_line_count = 1 messages &&
H=$(git rev-parse --verify HEAD) &&
M=$(git show-ref -s --verify refs/heads/main) &&
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 0ef7b78457..1a310a45fd 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -735,7 +735,7 @@ test_expect_success MINGW 'handle clean & core.longpaths = false nicely' '
test_must_fail git clean -xdf 2>.git/err &&
# grepping for a strerror string is unportable but it is OK here with
# MINGW prereq
- test_i18ngrep "too long" .git/err
+ test_grep "too long" .git/err
'
test_expect_success 'clean untracked paths by pathspec' '
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index d9fbabb2b9..00c1f1aab1 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -60,7 +60,7 @@ test_expect_success 'submodule init aborts on missing .gitmodules file' '
git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
# missing the .gitmodules file here
test_must_fail git submodule init 2>actual &&
- test_i18ngrep "No url found for submodule path" actual
+ test_grep "No url found for submodule path" actual
'
test_expect_success 'submodule update aborts on missing .gitmodules file' '
@@ -68,7 +68,7 @@ test_expect_success 'submodule update aborts on missing .gitmodules file' '
git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub &&
# missing the .gitmodules file here
git submodule update sub 2>actual &&
- test_i18ngrep "Submodule path .sub. not initialized" actual
+ test_grep "Submodule path .sub. not initialized" actual
'
test_expect_success 'submodule update aborts on missing gitmodules url' '
@@ -100,7 +100,7 @@ test_expect_success 'status should ignore inner git repo when not added' '
) &&
test_must_fail git submodule status inner 2>output.err &&
rm -fr inner &&
- test_i18ngrep "^error: .*did not match any file(s) known to git" output.err
+ test_grep "^error: .*did not match any file(s) known to git" output.err
'
test_expect_success 'setup - repository in init subdirectory' '
@@ -196,7 +196,7 @@ test_expect_success 'redirected submodule add does not show progress' '
git -C addtest submodule add "file://$submodurl/parent" submod-redirected \
2>err &&
! grep % err &&
- test_i18ngrep ! "Checking connectivity" err
+ test_grep ! "Checking connectivity" err
'
test_expect_success 'redirected submodule add --progress does show progress' '
@@ -263,7 +263,7 @@ test_expect_success 'submodule add relays add --dry-run stderr' '
cd addtest &&
: >.git/index.lock &&
! git submodule add "$submodurl" sub-while-locked 2>output.err &&
- test_i18ngrep "^fatal: .*index\.lock" output.err &&
+ test_grep "^fatal: .*index\.lock" output.err &&
test_path_is_missing sub-while-locked
)
'
@@ -405,7 +405,7 @@ test_expect_success 'submodule add in subdirectory with relative path should fai
cd addtest/sub &&
test_must_fail git submodule add ../../ submod3 2>../../output.err
) &&
- test_i18ngrep toplevel output.err
+ test_grep toplevel output.err
'
test_expect_success 'setup - add an example entry to .gitmodules' '
@@ -486,7 +486,7 @@ test_expect_success 'status should still be "missing" after initializing' '
test_failure_with_unknown_submodule () {
test_must_fail git submodule $1 no-such-submodule 2>output.err &&
- test_i18ngrep "^error: .*no-such-submodule" output.err
+ test_grep "^error: .*no-such-submodule" output.err
}
test_expect_success 'init should fail with unknown submodule' '
@@ -644,7 +644,7 @@ test_expect_success 'update --init' '
test_must_fail git config submodule.example.url &&
git submodule update init 2> update.out &&
- test_i18ngrep "not initialized" update.out &&
+ test_grep "not initialized" update.out &&
test_must_fail git rev-parse --resolve-git-dir init/.git &&
git submodule update --init init &&
@@ -661,7 +661,7 @@ test_expect_success 'update --init from subdirectory' '
(
cd sub &&
git submodule update ../init 2>update.out &&
- test_i18ngrep "not initialized" update.out &&
+ test_grep "not initialized" update.out &&
test_must_fail git rev-parse --resolve-git-dir ../init/.git &&
git submodule update --init ../init
@@ -1121,7 +1121,7 @@ test_expect_success 'submodule deinit from subdirectory' '
cd sub &&
git submodule deinit ../init >../output
) &&
- test_i18ngrep "\\.\\./init" output &&
+ test_grep "\\.\\./init" output &&
test -z "$(git config --get-regexp "submodule\.example\.")" &&
test -n "$(git config --get-regexp "submodule\.example2\.")" &&
test -f example2/.git &&
@@ -1136,8 +1136,8 @@ test_expect_success 'submodule deinit . deinits all initialized submodules' '
git submodule deinit . >actual &&
test -z "$(git config --get-regexp "submodule\.example\.")" &&
test -z "$(git config --get-regexp "submodule\.example2\.")" &&
- test_i18ngrep "Cleared directory .init" actual &&
- test_i18ngrep "Cleared directory .example2" actual &&
+ test_grep "Cleared directory .init" actual &&
+ test_grep "Cleared directory .example2" actual &&
rmdir init example2
'
@@ -1149,8 +1149,8 @@ test_expect_success 'submodule deinit --all deinits all initialized submodules'
git submodule deinit --all >actual &&
test -z "$(git config --get-regexp "submodule\.example\.")" &&
test -z "$(git config --get-regexp "submodule\.example2\.")" &&
- test_i18ngrep "Cleared directory .init" actual &&
- test_i18ngrep "Cleared directory .example2" actual &&
+ test_grep "Cleared directory .init" actual &&
+ test_grep "Cleared directory .example2" actual &&
rmdir init example2
'
@@ -1160,8 +1160,8 @@ test_expect_success 'submodule deinit deinits a submodule when its work tree is
git submodule deinit init example2 >actual &&
test -z "$(git config --get-regexp "submodule\.example\.")" &&
test -z "$(git config --get-regexp "submodule\.example2\.")" &&
- test_i18ngrep ! "Cleared directory .init" actual &&
- test_i18ngrep "Cleared directory .example2" actual &&
+ test_grep ! "Cleared directory .init" actual &&
+ test_grep "Cleared directory .example2" actual &&
rmdir init
'
@@ -1173,7 +1173,7 @@ test_expect_success 'submodule deinit fails when the submodule contains modifica
test -f example2/.git &&
git submodule deinit -f init >actual &&
test -z "$(git config --get-regexp "submodule\.example\.")" &&
- test_i18ngrep "Cleared directory .init" actual &&
+ test_grep "Cleared directory .init" actual &&
rmdir init
'
@@ -1185,7 +1185,7 @@ test_expect_success 'submodule deinit fails when the submodule contains untracke
test -f example2/.git &&
git submodule deinit -f init >actual &&
test -z "$(git config --get-regexp "submodule\.example\.")" &&
- test_i18ngrep "Cleared directory .init" actual &&
+ test_grep "Cleared directory .init" actual &&
rmdir init
'
@@ -1200,30 +1200,30 @@ test_expect_success 'submodule deinit fails when the submodule HEAD does not mat
test -f example2/.git &&
git submodule deinit -f init >actual &&
test -z "$(git config --get-regexp "submodule\.example\.")" &&
- test_i18ngrep "Cleared directory .init" actual &&
+ test_grep "Cleared directory .init" actual &&
rmdir init
'
test_expect_success 'submodule deinit is silent when used on an uninitialized submodule' '
git submodule update --init &&
git submodule deinit init >actual &&
- test_i18ngrep "Submodule .example. (.*) unregistered for path .init" actual &&
- test_i18ngrep "Cleared directory .init" actual &&
+ test_grep "Submodule .example. (.*) unregistered for path .init" actual &&
+ test_grep "Cleared directory .init" actual &&
git submodule deinit init >actual &&
- test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
- test_i18ngrep "Cleared directory .init" actual &&
+ test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+ test_grep "Cleared directory .init" actual &&
git submodule deinit . >actual &&
- test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
- test_i18ngrep "Submodule .example2. (.*) unregistered for path .example2" actual &&
- test_i18ngrep "Cleared directory .init" actual &&
+ test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+ test_grep "Submodule .example2. (.*) unregistered for path .example2" actual &&
+ test_grep "Cleared directory .init" actual &&
git submodule deinit . >actual &&
- test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
- test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
- test_i18ngrep "Cleared directory .init" actual &&
+ test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+ test_grep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
+ test_grep "Cleared directory .init" actual &&
git submodule deinit --all >actual &&
- test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual &&
- test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
- test_i18ngrep "Cleared directory .init" actual &&
+ test_grep ! "Submodule .example. (.*) unregistered for path .init" actual &&
+ test_grep ! "Submodule .example2. (.*) unregistered for path .example2" actual &&
+ test_grep "Cleared directory .init" actual &&
rmdir init example2
'
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index ff09443a0a..19b6135d11 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -163,7 +163,7 @@ test_expect_success '"git submodule sync" should update submodule URLs - subdire
cd sub &&
git submodule sync >../../output
) &&
- test_i18ngrep "\\.\\./submodule" output &&
+ test_grep "\\.\\./submodule" output &&
test -d "$(
cd super-clone/submodule &&
git config remote.origin.url
@@ -194,7 +194,7 @@ test_expect_success '"git submodule sync --recursive" should update all submodul
cd sub &&
git submodule sync --recursive >../../output
) &&
- test_i18ngrep "\\.\\./submodule/sub-submodule" output &&
+ test_grep "\\.\\./submodule/sub-submodule" output &&
test -d "$(
cd super-clone/submodule &&
git config remote.origin.url
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 00651c25cb..8491b8c58b 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -945,7 +945,7 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
git clone super_update_r super_update_r2 &&
(cd super_update_r2 &&
git submodule update --init --recursive >actual &&
- test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual &&
+ test_grep "Submodule path .submodule/subsubmodule.: checked out" actual &&
(cd submodule/subsubmodule &&
git log > ../../expected
) &&
@@ -1025,7 +1025,7 @@ test_expect_success 'submodule update clone shallow submodule outside of depth'
# unadvertised objects, so restrict this test to v0.
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
git submodule update --init --depth=1 2>actual &&
- test_i18ngrep "Direct fetching of that commit failed." actual &&
+ test_grep "Direct fetching of that commit failed." actual &&
git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
git submodule update --init --depth=1 >actual &&
git -C submodule log --oneline >out &&
@@ -1039,7 +1039,7 @@ test_expect_success 'submodule update --recursive drops module name before recur
git checkout HEAD^
) &&
git submodule update --recursive deeper/submodule >actual &&
- test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
+ test_grep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
)
'
diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index c0167944ab..31271f8e0a 100755
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -45,7 +45,7 @@ test_expect_success 'configuration parsing with error' '
(
cd repo &&
test_must_fail test-tool submodule-config "" s 2>actual &&
- test_i18ngrep "bad config" actual
+ test_grep "bad config" actual
)
'
@@ -101,7 +101,7 @@ test_expect_success 'error in history of one submodule config lets continue, std
>actual \
2>actual_stderr &&
test_cmp expect_error actual &&
- test_i18ngrep "submodule-blob $sha1:.gitmodules" actual_stderr >/dev/null
+ test_grep "submodule-blob $sha1:.gitmodules" actual_stderr >/dev/null
)
'
diff --git a/t/t7414-submodule-mistakes.sh b/t/t7414-submodule-mistakes.sh
index 101afff30f..24f30e3bf9 100755
--- a/t/t7414-submodule-mistakes.sh
+++ b/t/t7414-submodule-mistakes.sh
@@ -13,13 +13,13 @@ test_expect_success 'create embedded repository' '
test_expect_success 'git-add on embedded repository warns' '
test_when_finished "git rm --cached -f embed" &&
git add embed 2>stderr &&
- test_i18ngrep warning stderr
+ test_grep warning stderr
'
test_expect_success '--no-warn-embedded-repo suppresses warning' '
test_when_finished "git rm --cached -f embed" &&
git add --no-warn-embedded-repo embed 2>stderr &&
- test_i18ngrep ! warning stderr
+ test_grep ! warning stderr
'
test_expect_success 'no warning when updating entry' '
@@ -27,14 +27,14 @@ test_expect_success 'no warning when updating entry' '
git add embed &&
git -C embed commit --allow-empty -m two &&
git add embed 2>stderr &&
- test_i18ngrep ! warning stderr
+ test_grep ! warning stderr
'
test_expect_success 'submodule add does not warn' '
test_when_finished "git rm -rf submodule .gitmodules" &&
git -c protocol.file.allow=always \
submodule add ./embed submodule 2>stderr &&
- test_i18ngrep ! warning stderr
+ test_grep ! warning stderr
'
test_done
diff --git a/t/t7416-submodule-dash-url.sh b/t/t7416-submodule-dash-url.sh
index 7cf72b9a07..2ab566e717 100755
--- a/t/t7416-submodule-dash-url.sh
+++ b/t/t7416-submodule-dash-url.sh
@@ -41,7 +41,7 @@ test_expect_success 'remove ./ protection from .gitmodules url' '
test_expect_success 'clone rejects unprotected dash' '
test_when_finished "rm -rf dst" &&
test_must_fail git clone --recurse-submodules . dst 2>err &&
- test_i18ngrep ignoring err
+ test_grep ignoring err
'
test_expect_success 'fsck rejects unprotected dash' '
@@ -63,7 +63,7 @@ test_expect_success 'trailing backslash is handled correctly' '
mv .new .gitmodules &&
git commit -am "Add testmodule" &&
test_must_fail git clone --verbose --recurse-submodules . dolly 2>err &&
- test_i18ngrep ! "unknown option" err
+ test_grep ! "unknown option" err
'
test_expect_success 'fsck rejects missing URL scheme' '
diff --git a/t/t7417-submodule-path-url.sh b/t/t7417-submodule-path-url.sh
index 2f4b25dfd7..5e3051da8b 100755
--- a/t/t7417-submodule-path-url.sh
+++ b/t/t7417-submodule-path-url.sh
@@ -21,7 +21,7 @@ test_expect_success 'create submodule with dash in path' '
test_expect_success 'clone rejects unprotected dash' '
test_when_finished "rm -rf dst" &&
git clone --recurse-submodules . dst 2>err &&
- test_i18ngrep ignoring err
+ test_grep ignoring err
'
test_expect_success 'fsck rejects unprotected dash' '
@@ -46,7 +46,7 @@ test_expect_success MINGW 'submodule paths disallows trailing spaces' '
git -C super update-ref refs/heads/main $commit &&
test_must_fail git clone --recurse-submodules super dst 2>err &&
- test_i18ngrep "sub " err
+ test_grep "sub " err
'
test_done
diff --git a/t/t7450-bad-git-dotfiles.sh b/t/t7450-bad-git-dotfiles.sh
index 0d0c3f2c68..35a31acd4d 100755
--- a/t/t7450-bad-git-dotfiles.sh
+++ b/t/t7450-bad-git-dotfiles.sh
@@ -238,7 +238,7 @@ test_expect_success 'fsck detects non-blob .gitmodules' '
git ls-tree HEAD | sed s/subdir/.gitmodules/ | git mktree &&
test_must_fail git fsck 2>output &&
- test_i18ngrep gitmodulesBlob output
+ test_grep gitmodulesBlob output
)
'
@@ -252,8 +252,8 @@ test_expect_success 'fsck detects corrupt .gitmodules' '
git commit -m "broken gitmodules" &&
git fsck 2>output &&
- test_i18ngrep gitmodulesParse output &&
- test_i18ngrep ! "bad config" output
+ test_grep gitmodulesParse output &&
+ test_grep ! "bad config" output
)
'
@@ -275,7 +275,7 @@ test_expect_success WINDOWS 'prevent git~1 squatting on Windows' '
hash="$(echo x | git hash-object -w --stdin)" &&
test_must_fail git update-index --add \
--cacheinfo 160000,$rev,d\\a 2>err &&
- test_i18ngrep "Invalid path" err &&
+ test_grep "Invalid path" err &&
git -c core.protectNTFS=false update-index --add \
--cacheinfo 100644,$modules,.gitmodules \
--cacheinfo 160000,$rev,c \
@@ -289,7 +289,7 @@ test_expect_success WINDOWS 'prevent git~1 squatting on Windows' '
then
test_must_fail git -c core.protectNTFS=false \
clone --recurse-submodules squatting squatting-clone 2>err &&
- test_i18ngrep -e "directory not empty" -e "not an empty directory" err &&
+ test_grep -e "directory not empty" -e "not an empty directory" err &&
! grep gitdir squatting-clone/d/a/git~2
fi
'
@@ -314,7 +314,7 @@ test_expect_success 'git dirs of sibling submodules must not be nested' '
git commit -m nested
) &&
test_must_fail git clone --recurse-submodules nested clone 2>err &&
- test_i18ngrep "is inside git dir" err
+ test_grep "is inside git dir" err
'
test_done
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
index 5fcaa0b4f2..4dca8d97a7 100755
--- a/t/t7500-commit-template-squash-signoff.sh
+++ b/t/t7500-commit-template-squash-signoff.sh
@@ -555,7 +555,7 @@ test_expect_success 'commit without staging files fails and displays hints' '
git commit -m initial &&
echo "changes" >>file &&
test_must_fail git commit -m update >actual &&
- test_i18ngrep "no changes added to commit (use \"git add\" and/or \"git commit -a\")" actual
+ test_grep "no changes added to commit (use \"git add\" and/or \"git commit -a\")" actual
'
test_done
diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basic-functionality.sh
index fb5417d5e7..3d8500a52e 100755
--- a/t/t7501-commit-basic-functionality.sh
+++ b/t/t7501-commit-basic-functionality.sh
@@ -21,7 +21,7 @@ test_expect_success 'initial status' '
echo bongo bongo >file &&
git add file &&
git status >actual &&
- test_i18ngrep "No commits yet" actual
+ test_grep "No commits yet" actual
'
test_expect_success 'fail initial amend' '
@@ -141,7 +141,7 @@ test_expect_success 'template "emptyness" check does not kick in with -F' '
test_expect_success 'template "emptyness" check' '
git checkout HEAD file && echo >>file && git add file &&
test_must_fail git commit -t file 2>err &&
- test_i18ngrep "did not edit" err
+ test_grep "did not edit" err
'
test_expect_success 'setup: commit message from file' '
@@ -671,7 +671,7 @@ test_expect_success 'commit a file whose name is a dash' '
git add ./- &&
test_tick &&
git commit -m "add dash" >output </dev/null &&
- test_i18ngrep " changed, 5 insertions" output
+ test_grep " changed, 5 insertions" output
'
test_expect_success '--only works on to-be-born branch' '
diff --git a/t/t7502-commit-porcelain.sh b/t/t7502-commit-porcelain.sh
index b5bf7de7cd..61c8e810cc 100755
--- a/t/t7502-commit-porcelain.sh
+++ b/t/t7502-commit-porcelain.sh
@@ -706,14 +706,14 @@ test_expect_success 'cleanup commit message (whitespace config, -m)' '
test_expect_success 'message shows author when it is not equal to committer' '
echo >>negative &&
git commit -e -m "sample" -a &&
- test_i18ngrep \
+ test_grep \
"^# Author: *A U Thor <author@example.com>\$" \
.git/COMMIT_EDITMSG
'
test_expect_success 'message shows date when it is explicitly set' '
git commit --allow-empty -e -m foo --date="2010-01-02T03:04:05" &&
- test_i18ngrep \
+ test_grep \
"^# Date: *Sat Jan 2 03:04:05 2010 +0000" \
.git/COMMIT_EDITMSG
'
@@ -728,7 +728,7 @@ test_expect_success AUTOIDENT 'message shows committer when it is automatic' '
) &&
# the ident is calculated from the system, so we cannot
# check the actual value, only that it is there
- test_i18ngrep "^# Committer: " .git/COMMIT_EDITMSG
+ test_grep "^# Committer: " .git/COMMIT_EDITMSG
'
write_script .git/FAKE_EDITOR <<EOF
@@ -860,9 +860,9 @@ try_commit () {
GIT_EDITOR=.git/FAKE_EDITOR git commit -a $* $use_template &&
case "$use_template" in
'')
- test_i18ngrep ! "^## Custom template" .git/COMMIT_EDITMSG ;;
+ test_grep ! "^## Custom template" .git/COMMIT_EDITMSG ;;
*)
- test_i18ngrep "^## Custom template" .git/COMMIT_EDITMSG ;;
+ test_grep "^## Custom template" .git/COMMIT_EDITMSG ;;
esac
}
@@ -870,53 +870,53 @@ try_commit_status_combo () {
test_expect_success 'commit' '
try_commit "" &&
- test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+ test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
test_expect_success 'commit --status' '
try_commit --status &&
- test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+ test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
test_expect_success 'commit --no-status' '
try_commit --no-status &&
- test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+ test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
test_expect_success 'commit with commit.status = yes' '
test_config commit.status yes &&
try_commit "" &&
- test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+ test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
test_expect_success 'commit with commit.status = no' '
test_config commit.status no &&
try_commit "" &&
- test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+ test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
test_expect_success 'commit --status with commit.status = yes' '
test_config commit.status yes &&
try_commit --status &&
- test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+ test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
test_expect_success 'commit --no-status with commit.status = yes' '
test_config commit.status yes &&
try_commit --no-status &&
- test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+ test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
test_expect_success 'commit --status with commit.status = no' '
test_config commit.status no &&
try_commit --status &&
- test_i18ngrep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+ test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
test_expect_success 'commit --no-status with commit.status = no' '
test_config commit.status no &&
try_commit --no-status &&
- test_i18ngrep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+ test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
}
@@ -930,13 +930,13 @@ try_commit_status_combo
test_expect_success 'commit --status with custom comment character' '
test_config core.commentchar ";" &&
try_commit --status &&
- test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG
+ test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
'
test_expect_success 'switch core.commentchar' '
test_commit "#foo" foo &&
GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend &&
- test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG
+ test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
'
test_expect_success 'switch core.commentchar but out of options' '
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index d050091345..46566d529e 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -37,19 +37,19 @@ test_expect_success 'setup' '
test_expect_success 'status clean' '
git status >output &&
- test_i18ngrep "nothing to commit" output
+ test_grep "nothing to commit" output
'
test_expect_success 'commit --dry-run -a clean' '
test_must_fail git commit --dry-run -a >output &&
- test_i18ngrep "nothing to commit" output
+ test_grep "nothing to commit" output
'
test_expect_success 'status with modified file in submodule' '
(cd sub && git reset --hard) &&
echo "changed" >sub/foo &&
git status >output &&
- test_i18ngrep "modified: sub (modified content)" output
+ test_grep "modified: sub (modified content)" output
'
test_expect_success 'status with modified file in submodule (porcelain)' '
@@ -73,7 +73,7 @@ test_expect_success 'status with modified file in submodule (short)' '
test_expect_success 'status with added file in submodule' '
(cd sub && git reset --hard && echo >foo && git add foo) &&
git status >output &&
- test_i18ngrep "modified: sub (modified content)" output
+ test_grep "modified: sub (modified content)" output
'
test_expect_success 'status with added file in submodule (porcelain)' '
@@ -96,12 +96,12 @@ test_expect_success 'status with untracked file in submodule' '
(cd sub && git reset --hard) &&
echo "content" >sub/new-file &&
git status >output &&
- test_i18ngrep "modified: sub (untracked content)" output
+ test_grep "modified: sub (untracked content)" output
'
test_expect_success 'status -uno with untracked file in submodule' '
git status -uno >output &&
- test_i18ngrep "^nothing to commit" output
+ test_grep "^nothing to commit" output
'
test_expect_success 'status with untracked file in submodule (porcelain)' '
@@ -122,7 +122,7 @@ test_expect_success 'status with added and untracked file in submodule' '
(cd sub && git reset --hard && echo >foo && git add foo) &&
echo "content" >sub/new-file &&
git status >output &&
- test_i18ngrep "modified: sub (modified content, untracked content)" output
+ test_grep "modified: sub (modified content, untracked content)" output
'
test_expect_success 'status with added and untracked file in submodule (porcelain)' '
@@ -140,7 +140,7 @@ test_expect_success 'status with modified file in modified submodule' '
(cd sub && echo "next change" >foo && git commit -m "next change" foo) &&
echo "changed" >sub/foo &&
git status >output &&
- test_i18ngrep "modified: sub (new commits, modified content)" output
+ test_grep "modified: sub (new commits, modified content)" output
'
test_expect_success 'status with modified file in modified submodule (porcelain)' '
@@ -155,7 +155,7 @@ test_expect_success 'status with modified file in modified submodule (porcelain)
test_expect_success 'status with added file in modified submodule' '
(cd sub && git reset --hard && echo >foo && git add foo) &&
git status >output &&
- test_i18ngrep "modified: sub (new commits, modified content)" output
+ test_grep "modified: sub (new commits, modified content)" output
'
test_expect_success 'status with added file in modified submodule (porcelain)' '
@@ -170,7 +170,7 @@ test_expect_success 'status with untracked file in modified submodule' '
(cd sub && git reset --hard) &&
echo "content" >sub/new-file &&
git status >output &&
- test_i18ngrep "modified: sub (new commits, untracked content)" output
+ test_grep "modified: sub (new commits, untracked content)" output
'
test_expect_success 'status with untracked file in modified submodule (porcelain)' '
@@ -184,7 +184,7 @@ test_expect_success 'status with added and untracked file in modified submodule'
(cd sub && git reset --hard && echo >foo && git add foo) &&
echo "content" >sub/new-file &&
git status >output &&
- test_i18ngrep "modified: sub (new commits, modified content, untracked content)" output
+ test_grep "modified: sub (new commits, modified content, untracked content)" output
'
test_expect_success 'status with added and untracked file in modified submodule (porcelain)' '
@@ -209,7 +209,7 @@ test_expect_success 'setup .git file for sub' '
test_expect_success 'status with added file in modified submodule with .git file' '
(cd sub && git reset --hard && echo >foo && git add foo) &&
git status >output &&
- test_i18ngrep "modified: sub (new commits, modified content)" output
+ test_grep "modified: sub (new commits, modified content)" output
'
test_expect_success 'status with a lot of untracked files in the submodule' '
@@ -234,12 +234,12 @@ test_expect_success 'rm submodule contents' '
test_expect_success 'status clean (empty submodule dir)' '
git status >output &&
- test_i18ngrep "nothing to commit" output
+ test_grep "nothing to commit" output
'
test_expect_success 'status -a clean (empty submodule dir)' '
test_must_fail git commit --dry-run -a >output &&
- test_i18ngrep "nothing to commit" output
+ test_grep "nothing to commit" output
'
cat >status_expect <<\EOF
diff --git a/t/t7507-commit-verbose.sh b/t/t7507-commit-verbose.sh
index 916470c48b..c3281b192e 100755
--- a/t/t7507-commit-verbose.sh
+++ b/t/t7507-commit-verbose.sh
@@ -89,7 +89,7 @@ test_expect_success 'submodule log is stripped out too with -v' '
export GIT_EDITOR &&
test_must_fail git commit -a -v 2>err
) &&
- test_i18ngrep "Aborting commit due to empty commit message." err
+ test_grep "Aborting commit due to empty commit message." err
'
test_expect_success 'verbose diff is stripped out with set core.commentChar' '
@@ -98,7 +98,7 @@ test_expect_success 'verbose diff is stripped out with set core.commentChar' '
export GIT_EDITOR &&
test_must_fail git -c core.commentchar=";" commit -a -v 2>err
) &&
- test_i18ngrep "Aborting commit due to empty commit message." err
+ test_grep "Aborting commit due to empty commit message." err
'
test_expect_success 'status does not verbose without --verbose' '
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 6928fd89f5..1607df4c2a 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -19,7 +19,7 @@ test_expect_success 'status -h in broken repository' '
echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
test_expect_code 129 git status -h >usage 2>&1
) &&
- test_i18ngrep "[Uu]sage" broken/usage
+ test_grep "[Uu]sage" broken/usage
'
test_expect_success 'commit -h in broken repository' '
@@ -31,7 +31,7 @@ test_expect_success 'commit -h in broken repository' '
echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
test_expect_code 129 git commit -h >usage 2>&1
) &&
- test_i18ngrep "[Uu]sage" broken/usage
+ test_grep "[Uu]sage" broken/usage
'
test_expect_success 'create upstream branch' '
@@ -72,7 +72,7 @@ test_expect_success 'setup' '
'
test_expect_success 'status (1)' '
- test_i18ngrep "use \"git rm --cached <file>\.\.\.\" to unstage" output
+ test_grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
'
strip_comments () {
@@ -1542,12 +1542,12 @@ test_expect_success 'git commit will commit a staged but ignored submodule' '
git config --add -f .gitmodules submodule.subname.path sm &&
git config --add submodule.subname.ignore all &&
git status -s --ignore-submodules=dirty >output &&
- test_i18ngrep "^M. sm" output &&
+ test_grep "^M. sm" output &&
GIT_EDITOR="echo hello >>\"\$1\"" &&
export GIT_EDITOR &&
git commit -uno &&
git status -s --ignore-submodules=dirty >output &&
- test_i18ngrep ! "^M. sm" output
+ test_grep ! "^M. sm" output
'
test_expect_success 'git commit --dry-run will show a staged but ignored submodule' '
@@ -1572,13 +1572,13 @@ EOF
git commit -uno --dry-run >output &&
test_cmp expect output &&
git status -s --ignore-submodules=dirty >output &&
- test_i18ngrep "^M. sm" output
+ test_grep "^M. sm" output
'
test_expect_success 'git commit -m will commit a staged but ignored submodule' '
git commit -uno -m message &&
git status -s --ignore-submodules=dirty >output &&
- test_i18ngrep ! "^M. sm" output &&
+ test_grep ! "^M. sm" output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1591,7 +1591,7 @@ test_expect_success 'show stash info with "--show-stash"' '
git stash &&
git status >expected_default &&
git status --show-stash >expected_with_stash &&
- test_i18ngrep "^Your stash currently has 1 entry$" expected_with_stash
+ test_grep "^Your stash currently has 1 entry$" expected_with_stash
'
test_expect_success 'no stash info with "--show-stash --no-show-stash"' '
@@ -1618,14 +1618,14 @@ test_expect_success 'no additional info if no stash entries' '
test_expect_success '"No commits yet" should be noted in status output' '
git checkout --orphan empty-branch-1 &&
git status >output &&
- test_i18ngrep "No commits yet" output
+ test_grep "No commits yet" output
'
test_expect_success '"No commits yet" should not be noted in status output' '
git checkout --orphan empty-branch-2 &&
test_commit test-commit-1 &&
git status >output &&
- test_i18ngrep ! "No commits yet" output
+ test_grep ! "No commits yet" output
'
test_expect_success '"Initial commit" should be noted in commit template' '
@@ -1633,7 +1633,7 @@ test_expect_success '"Initial commit" should be noted in commit template' '
touch to_be_committed_1 &&
git add to_be_committed_1 &&
git commit --dry-run >output &&
- test_i18ngrep "Initial commit" output
+ test_grep "Initial commit" output
'
test_expect_success '"Initial commit" should not be noted in commit template' '
@@ -1642,7 +1642,7 @@ test_expect_success '"Initial commit" should not be noted in commit template' '
touch to_be_committed_2 &&
git add to_be_committed_2 &&
git commit --dry-run >output &&
- test_i18ngrep ! "Initial commit" output
+ test_grep ! "Initial commit" output
'
test_expect_success '--no-optional-locks prevents index update' '
diff --git a/t/t7509-commit-authorship.sh b/t/t7509-commit-authorship.sh
index 5d890949f7..fd8c8f8f0b 100755
--- a/t/t7509-commit-authorship.sh
+++ b/t/t7509-commit-authorship.sh
@@ -99,7 +99,7 @@ test_expect_success '--amend option with empty author' '
echo "Empty author test" >>foo &&
test_tick &&
test_must_fail git commit -a -m "empty author" --amend 2>err &&
- test_i18ngrep "empty ident" err
+ test_grep "empty ident" err
'
test_expect_success '--amend option with missing author' '
@@ -112,7 +112,7 @@ test_expect_success '--amend option with missing author' '
echo "Missing author test" >>foo &&
test_tick &&
test_must_fail git commit -a -m "malformed author" --amend 2>err &&
- test_i18ngrep "empty ident" err
+ test_grep "empty ident" err
'
test_expect_success '--reset-author makes the commit ours even with --amend option' '
diff --git a/t/t7518-ident-corner-cases.sh b/t/t7518-ident-corner-cases.sh
index 9ab2ae2f3b..b37de0af49 100755
--- a/t/t7518-ident-corner-cases.sh
+++ b/t/t7518-ident-corner-cases.sh
@@ -15,7 +15,7 @@ test_expect_success 'empty name and missing email' '
sane_unset GIT_AUTHOR_EMAIL &&
GIT_AUTHOR_NAME= &&
test_must_fail git commit --allow-empty -m foo 2>err &&
- test_i18ngrep ! "(null)" err
+ test_grep ! "(null)" err
)
'
@@ -40,8 +40,8 @@ test_expect_success 'empty configured name does not auto-detect' '
sane_unset GIT_AUTHOR_NAME &&
test_must_fail \
git -c user.name= commit --allow-empty -m foo 2>err &&
- test_i18ngrep "empty ident name" err &&
- test_i18ngrep "Author identity unknown" err
+ test_grep "empty ident name" err &&
+ test_grep "Author identity unknown" err
)
'
@@ -50,8 +50,8 @@ test_expect_success 'empty configured name does not auto-detect for committer' '
sane_unset GIT_COMMITTER_NAME &&
test_must_fail \
git -c user.name= commit --allow-empty -m foo 2>err &&
- test_i18ngrep "empty ident name" err &&
- test_i18ngrep "Committer identity unknown" err
+ test_grep "empty ident name" err &&
+ test_grep "Committer identity unknown" err
)
'
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index 8348e3ae7d..7ee69ecdd4 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -322,14 +322,14 @@ do
rm -f marker &&
git status >actual &&
test_path_is_file marker &&
- test_i18ngrep ! "Changes not staged for commit:" actual &&
+ test_grep ! "Changes not staged for commit:" actual &&
if test $uc_val = true
then
- test_i18ngrep ! "Untracked files:" actual
+ test_grep ! "Untracked files:" actual
fi &&
if test $uc_val = false
then
- test_i18ngrep "Untracked files:" actual
+ test_grep "Untracked files:" actual
fi &&
rm -f marker
'
diff --git a/t/t7520-ignored-hook-warning.sh b/t/t7520-ignored-hook-warning.sh
index 184b258989..3b63c34a30 100755
--- a/t/t7520-ignored-hook-warning.sh
+++ b/t/t7520-ignored-hook-warning.sh
@@ -13,27 +13,27 @@ test_expect_success setup '
test_expect_success 'no warning if hook is not ignored' '
git commit --allow-empty -m "more" 2>message &&
- test_i18ngrep ! -e "hook was ignored" message
+ test_grep ! -e "hook was ignored" message
'
test_expect_success POSIXPERM 'warning if hook is ignored' '
test_hook --disable pre-commit &&
git commit --allow-empty -m "even more" 2>message &&
- test_i18ngrep -e "hook was ignored" message
+ test_grep -e "hook was ignored" message
'
test_expect_success POSIXPERM 'no warning if advice.ignoredHook set to false' '
test_config advice.ignoredHook false &&
test_hook --disable pre-commit &&
git commit --allow-empty -m "even more" 2>message &&
- test_i18ngrep ! -e "hook was ignored" message
+ test_grep ! -e "hook was ignored" message
'
test_expect_success 'no warning if unset advice.ignoredHook and hook removed' '
test_hook --remove pre-commit &&
test_unconfig advice.ignoredHook &&
git commit --allow-empty -m "even more" 2>message &&
- test_i18ngrep ! -e "hook was ignored" message
+ test_grep ! -e "hook was ignored" message
'
test_done
diff --git a/t/t7525-status-rename.sh b/t/t7525-status-rename.sh
index 22bf5c7e5d..a9210d3a3a 100755
--- a/t/t7525-status-rename.sh
+++ b/t/t7525-status-rename.sh
@@ -21,81 +21,81 @@ test_expect_success 'setup' '
test_expect_success 'status no-options' '
git status >actual &&
- test_i18ngrep "renamed:" actual
+ test_grep "renamed:" actual
'
test_expect_success 'status --no-renames' '
git status --no-renames >actual &&
- test_i18ngrep "deleted:" actual &&
- test_i18ngrep "new file:" actual
+ test_grep "deleted:" actual &&
+ test_grep "new file:" actual
'
test_expect_success 'status.renames inherits from diff.renames false' '
git -c diff.renames=false status >actual &&
- test_i18ngrep "deleted:" actual &&
- test_i18ngrep "new file:" actual
+ test_grep "deleted:" actual &&
+ test_grep "new file:" actual
'
test_expect_success 'status.renames inherits from diff.renames true' '
git -c diff.renames=true status >actual &&
- test_i18ngrep "renamed:" actual
+ test_grep "renamed:" actual
'
test_expect_success 'status.renames overrides diff.renames false' '
git -c diff.renames=true -c status.renames=false status >actual &&
- test_i18ngrep "deleted:" actual &&
- test_i18ngrep "new file:" actual
+ test_grep "deleted:" actual &&
+ test_grep "new file:" actual
'
test_expect_success 'status.renames overrides from diff.renames true' '
git -c diff.renames=false -c status.renames=true status >actual &&
- test_i18ngrep "renamed:" actual
+ test_grep "renamed:" actual
'
test_expect_success 'status status.renames=false' '
git -c status.renames=false status >actual &&
- test_i18ngrep "deleted:" actual &&
- test_i18ngrep "new file:" actual
+ test_grep "deleted:" actual &&
+ test_grep "new file:" actual
'
test_expect_success 'status status.renames=true' '
git -c status.renames=true status >actual &&
- test_i18ngrep "renamed:" actual
+ test_grep "renamed:" actual
'
test_expect_success 'commit honors status.renames=false' '
git -c status.renames=false commit --dry-run >actual &&
- test_i18ngrep "deleted:" actual &&
- test_i18ngrep "new file:" actual
+ test_grep "deleted:" actual &&
+ test_grep "new file:" actual
'
test_expect_success 'commit honors status.renames=true' '
git -c status.renames=true commit --dry-run >actual &&
- test_i18ngrep "renamed:" actual
+ test_grep "renamed:" actual
'
test_expect_success 'status config overridden' '
git -c status.renames=true status --no-renames >actual &&
- test_i18ngrep "deleted:" actual &&
- test_i18ngrep "new file:" actual
+ test_grep "deleted:" actual &&
+ test_grep "new file:" actual
'
test_expect_success 'status score=100%' '
git status -M=100% >actual &&
- test_i18ngrep "deleted:" actual &&
- test_i18ngrep "new file:" actual &&
+ test_grep "deleted:" actual &&
+ test_grep "new file:" actual &&
git status --find-renames=100% >actual &&
- test_i18ngrep "deleted:" actual &&
- test_i18ngrep "new file:" actual
+ test_grep "deleted:" actual &&
+ test_grep "new file:" actual
'
test_expect_success 'status score=01%' '
git status -M=01% >actual &&
- test_i18ngrep "renamed:" actual &&
+ test_grep "renamed:" actual &&
git status --find-renames=01% >actual &&
- test_i18ngrep "renamed:" actual
+ test_grep "renamed:" actual
'
test_expect_success 'copies not overridden by find-renames' '
@@ -103,12 +103,12 @@ test_expect_success 'copies not overridden by find-renames' '
git add copy &&
git -c status.renames=copies status -M=01% >actual &&
- test_i18ngrep "copied:" actual &&
- test_i18ngrep "renamed:" actual &&
+ test_grep "copied:" actual &&
+ test_grep "renamed:" actual &&
git -c status.renames=copies status --find-renames=01% >actual &&
- test_i18ngrep "copied:" actual &&
- test_i18ngrep "renamed:" actual
+ test_grep "copied:" actual &&
+ test_grep "renamed:" actual
'
test_done
diff --git a/t/t7526-commit-pathspec-file.sh b/t/t7526-commit-pathspec-file.sh
index ad011bb9f1..c97c550021 100755
--- a/t/t7526-commit-pathspec-file.sh
+++ b/t/t7526-commit-pathspec-file.sh
@@ -141,25 +141,25 @@ test_expect_success 'error conditions' '
>empty_list &&
test_must_fail git commit --pathspec-from-file=list --interactive -m "Commit" 2>err &&
- test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+ test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
test_must_fail git commit --pathspec-from-file=list --patch -m "Commit" 2>err &&
- test_i18ngrep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+ test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
test_must_fail git commit --pathspec-from-file=list --all -m "Commit" 2>err &&
- test_i18ngrep -e "options .--pathspec-from-file. and .-a. cannot be used together" err &&
+ test_grep -e "options .--pathspec-from-file. and .-a. cannot be used together" err &&
test_must_fail git commit --pathspec-from-file=list -m "Commit" -- fileA.t 2>err &&
- test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+ test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
- test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+ test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
test_must_fail git commit --pathspec-from-file=empty_list --include -m "Commit" 2>err &&
- test_i18ngrep -e "No paths with --include/--only does not make sense." err &&
+ test_grep -e "No paths with --include/--only does not make sense." err &&
test_must_fail git commit --pathspec-from-file=empty_list --only -m "Commit" 2>err &&
- test_i18ngrep -e "No paths with --include/--only does not make sense." err
+ test_grep -e "No paths with --include/--only does not make sense." err
'
test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index fdc607277c..e5ff073099 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -175,7 +175,7 @@ test_expect_success 'merge -h with invalid index' '
>.git/index &&
test_expect_code 129 git merge -h 2>usage
) &&
- test_i18ngrep "[Uu]sage: git merge" broken/usage
+ test_grep "[Uu]sage: git merge" broken/usage
'
test_expect_success 'reject non-strategy with a git-merge-foo name' '
@@ -681,7 +681,7 @@ test_debug 'git log --graph --decorate --oneline --all'
test_expect_success 'in-index merge' '
git reset --hard c0 &&
git merge --no-ff -s resolve c1 >out &&
- test_i18ngrep "Wonderful." out &&
+ test_grep "Wonderful." out &&
verify_parents $c0 $c1
'
@@ -697,7 +697,7 @@ test_expect_success 'merge with --autostash' '
git reset --hard c1 &&
git merge-file file file.orig file.9 &&
git merge --autostash c2 2>err &&
- test_i18ngrep "Applied autostash." err &&
+ test_grep "Applied autostash." err &&
git show HEAD:file >merge-result &&
test_cmp result.1-5 merge-result &&
test_cmp result.1-5-9 file
@@ -708,7 +708,7 @@ test_expect_success 'merge with merge.autoStash' '
git reset --hard c1 &&
git merge-file file file.orig file.9 &&
git merge c2 2>err &&
- test_i18ngrep "Applied autostash." err &&
+ test_grep "Applied autostash." err &&
git show HEAD:file >merge-result &&
test_cmp result.1-5 merge-result &&
test_cmp result.1-5-9 file
@@ -718,7 +718,7 @@ test_expect_success 'fast-forward merge with --autostash' '
git reset --hard c0 &&
git merge-file file file.orig file.5 &&
git merge --autostash c1 2>err &&
- test_i18ngrep "Applied autostash." err &&
+ test_grep "Applied autostash." err &&
test_cmp result.1-5 file
'
@@ -728,7 +728,7 @@ test_expect_success 'failed fast-forward merge with --autostash' '
cp file.5 other &&
test_when_finished "rm other" &&
test_must_fail git merge --autostash c1 2>err &&
- test_i18ngrep "Applied autostash." err &&
+ test_grep "Applied autostash." err &&
test_cmp file.5 file
'
@@ -736,7 +736,7 @@ test_expect_success 'octopus merge with --autostash' '
git reset --hard c1 &&
git merge-file file file.orig file.3 &&
git merge --autostash c2 c3 2>err &&
- test_i18ngrep "Applied autostash." err &&
+ test_grep "Applied autostash." err &&
git show HEAD:file >merge-result &&
test_cmp result.1-5-9 merge-result &&
test_cmp result.1-3-5-9 file
@@ -746,7 +746,7 @@ test_expect_success 'failed merge (exit 2) with --autostash' '
git reset --hard c1 &&
git merge-file file file.orig file.5 &&
test_must_fail git merge -s recursive --autostash c2 c3 2>err &&
- test_i18ngrep "Applied autostash." err &&
+ test_grep "Applied autostash." err &&
test_cmp result.1-5 file
'
@@ -755,7 +755,7 @@ test_expect_success 'conflicted merge with --autostash, --abort restores stash'
cp file.1 file &&
test_must_fail git merge --autostash c7 &&
git merge --abort 2>err &&
- test_i18ngrep "Applied autostash." err &&
+ test_grep "Applied autostash." err &&
test_cmp file.1 file
'
@@ -767,7 +767,7 @@ test_expect_success 'completed merge (git commit) with --no-commit and --autosta
git stash show -p MERGE_AUTOSTASH >actual &&
test_cmp expect actual &&
git commit 2>err &&
- test_i18ngrep "Applied autostash." err &&
+ test_grep "Applied autostash." err &&
git show HEAD:file >merge-result &&
test_cmp result.1-5 merge-result &&
test_cmp result.1-5-9 file
@@ -781,7 +781,7 @@ test_expect_success 'completed merge (git merge --continue) with --no-commit and
git stash show -p MERGE_AUTOSTASH >actual &&
test_cmp expect actual &&
git merge --continue 2>err &&
- test_i18ngrep "Applied autostash." err &&
+ test_grep "Applied autostash." err &&
git show HEAD:file >merge-result &&
test_cmp result.1-5 merge-result &&
test_cmp result.1-5-9 file
@@ -795,7 +795,7 @@ test_expect_success 'aborted merge (merge --abort) with --no-commit and --autost
git stash show -p MERGE_AUTOSTASH >actual &&
test_cmp expect actual &&
git merge --abort 2>err &&
- test_i18ngrep "Applied autostash." err &&
+ test_grep "Applied autostash." err &&
git diff >actual &&
test_cmp expect actual
'
@@ -808,7 +808,7 @@ test_expect_success 'aborted merge (reset --hard) with --no-commit and --autosta
git stash show -p MERGE_AUTOSTASH >actual &&
test_cmp expect actual &&
git reset --hard 2>err &&
- test_i18ngrep "Autostash exists; creating a new stash entry." err &&
+ test_grep "Autostash exists; creating a new stash entry." err &&
git diff --exit-code
'
@@ -821,7 +821,7 @@ test_expect_success 'quit merge with --no-commit and --autostash' '
test_cmp expect actual &&
git diff HEAD >expect &&
git merge --quit 2>err &&
- test_i18ngrep "Autostash exists; creating a new stash entry." err &&
+ test_grep "Autostash exists; creating a new stash entry." err &&
git diff HEAD >actual &&
test_cmp expect actual
'
@@ -832,7 +832,7 @@ test_expect_success 'merge with conflicted --autostash changes' '
git diff >expect &&
test_when_finished "test_might_fail git stash drop" &&
git merge --autostash c3 2>err &&
- test_i18ngrep "Applying autostash resulted in conflicts." err &&
+ test_grep "Applying autostash resulted in conflicts." err &&
git show HEAD:file >merge-result &&
test_cmp result.1-9 merge-result &&
git stash show -p >actual &&
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index bd238d89b0..8cebe2dbe1 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -30,117 +30,117 @@ test_expect_success 'setup' '
test_expect_success 'pull.rebase not set, ff possible' '
git reset --hard c0 &&
git pull . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and pull.ff=true' '
git reset --hard c0 &&
test_config pull.ff true &&
git pull . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and pull.ff=false' '
git reset --hard c0 &&
test_config pull.ff false &&
git pull . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and pull.ff=only' '
git reset --hard c0 &&
test_config pull.ff only &&
git pull . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and --rebase given' '
git reset --hard c0 &&
git pull --rebase . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and --no-rebase given' '
git reset --hard c0 &&
git pull --no-rebase . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and --ff given' '
git reset --hard c0 &&
git pull --ff . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and --no-ff given' '
git reset --hard c0 &&
git pull --no-ff . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and --ff-only given' '
git reset --hard c0 &&
git pull --ff-only . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set (not-fast-forward)' '
git reset --hard c2 &&
test_must_fail git -c color.advice=always pull . c1 2>err &&
test_decode_color <err >decoded &&
- test_i18ngrep "<YELLOW>hint: " decoded &&
- test_i18ngrep "You have divergent branches" decoded
+ test_grep "<YELLOW>hint: " decoded &&
+ test_grep "You have divergent branches" decoded
'
test_expect_success 'pull.rebase not set and pull.ff=true (not-fast-forward)' '
git reset --hard c2 &&
test_config pull.ff true &&
git pull . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and pull.ff=false (not-fast-forward)' '
git reset --hard c2 &&
test_config pull.ff false &&
git pull . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and pull.ff=only (not-fast-forward)' '
git reset --hard c2 &&
test_config pull.ff only &&
test_must_fail git pull . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and --rebase given (not-fast-forward)' '
git reset --hard c2 &&
git pull --rebase . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and --no-rebase given (not-fast-forward)' '
git reset --hard c2 &&
git pull --no-rebase . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and --ff given (not-fast-forward)' '
git reset --hard c2 &&
git pull --ff . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and --no-ff given (not-fast-forward)' '
git reset --hard c2 &&
git pull --no-ff . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_expect_success 'pull.rebase not set and --ff-only given (not-fast-forward)' '
git reset --hard c2 &&
test_must_fail git pull --ff-only . c1 2>err &&
- test_i18ngrep ! "You have divergent branches" err
+ test_grep ! "You have divergent branches" err
'
test_does_rebase () {
@@ -202,7 +202,7 @@ test_falls_back_to_full_merge () {
test_attempts_fast_forward () {
git reset --hard c2 &&
test_must_fail git "$@" . c1 2>err &&
- test_i18ngrep "Not possible to fast-forward, aborting" err
+ test_grep "Not possible to fast-forward, aborting" err
}
#
@@ -328,23 +328,23 @@ test_expect_success 'pull.rebase=false and --ff, ff not possible' '
test_expect_success 'Multiple heads warns about inability to fast forward' '
git reset --hard c1 &&
test_must_fail git pull . c2 c3 2>err &&
- test_i18ngrep "You have divergent branches" err
+ test_grep "You have divergent branches" err
'
test_expect_success 'Multiple can never be fast forwarded' '
git reset --hard c0 &&
test_must_fail git -c pull.ff=only pull . c1 c2 c3 2>err &&
- test_i18ngrep ! "You have divergent branches" err &&
+ test_grep ! "You have divergent branches" err &&
# In addition to calling out "cannot fast-forward", we very much
# want the "multiple branches" piece to be called out to users.
- test_i18ngrep "Cannot fast-forward to multiple branches" err
+ test_grep "Cannot fast-forward to multiple branches" err
'
test_expect_success 'Cannot rebase with multiple heads' '
git reset --hard c0 &&
test_must_fail git -c pull.rebase=true pull . c1 c2 c3 2>err &&
- test_i18ngrep ! "You have divergent branches" err &&
- test_i18ngrep "Cannot rebase onto multiple branches." err
+ test_grep ! "You have divergent branches" err &&
+ test_grep "Cannot rebase onto multiple branches." err
'
test_expect_success 'merge c1 with c2' '
diff --git a/t/t7611-merge-abort.sh b/t/t7611-merge-abort.sh
index c0e9425115..d6975ca48d 100755
--- a/t/t7611-merge-abort.sh
+++ b/t/t7611-merge-abort.sh
@@ -50,7 +50,7 @@ pre_merge_head="$(git rev-parse HEAD)"
test_expect_success 'fails without MERGE_HEAD (unstarted merge)' '
test_must_fail git merge --abort 2>output &&
- test_i18ngrep MERGE_HEAD output
+ test_grep MERGE_HEAD output
'
test_expect_success 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity' '
@@ -64,7 +64,7 @@ test_expect_success 'fails without MERGE_HEAD (completed merge)' '
# Merge successfully completed
post_merge_head="$(git rev-parse HEAD)" &&
test_must_fail git merge --abort 2>output &&
- test_i18ngrep MERGE_HEAD output
+ test_grep MERGE_HEAD output
'
test_expect_success 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity' '
diff --git a/t/t7612-merge-verify-signatures.sh b/t/t7612-merge-verify-signatures.sh
index f5c90cc22a..84ddb56851 100755
--- a/t/t7612-merge-verify-signatures.sh
+++ b/t/t7612-merge-verify-signatures.sh
@@ -41,54 +41,54 @@ test_expect_success GPG 'create signed commits' '
test_expect_success GPG 'merge unsigned commit with verification' '
test_when_finished "git reset --hard && git checkout initial" &&
test_must_fail git merge --ff-only --verify-signatures side-unsigned 2>mergeerror &&
- test_i18ngrep "does not have a GPG signature" mergeerror
+ test_grep "does not have a GPG signature" mergeerror
'
test_expect_success GPG 'merge unsigned commit with merge.verifySignatures=true' '
test_when_finished "git reset --hard && git checkout initial" &&
test_config merge.verifySignatures true &&
test_must_fail git merge --ff-only side-unsigned 2>mergeerror &&
- test_i18ngrep "does not have a GPG signature" mergeerror
+ test_grep "does not have a GPG signature" mergeerror
'
test_expect_success GPG 'merge commit with bad signature with verification' '
test_when_finished "git reset --hard && git checkout initial" &&
test_must_fail git merge --ff-only --verify-signatures $(cat forged.commit) 2>mergeerror &&
- test_i18ngrep "has a bad GPG signature" mergeerror
+ test_grep "has a bad GPG signature" mergeerror
'
test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=true' '
test_when_finished "git reset --hard && git checkout initial" &&
test_config merge.verifySignatures true &&
test_must_fail git merge --ff-only $(cat forged.commit) 2>mergeerror &&
- test_i18ngrep "has a bad GPG signature" mergeerror
+ test_grep "has a bad GPG signature" mergeerror
'
test_expect_success GPG 'merge commit with untrusted signature with verification' '
test_when_finished "git reset --hard && git checkout initial" &&
test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror &&
- test_i18ngrep "has an untrusted GPG signature" mergeerror
+ test_grep "has an untrusted GPG signature" mergeerror
'
test_expect_success GPG 'merge commit with untrusted signature with verification and high minTrustLevel' '
test_when_finished "git reset --hard && git checkout initial" &&
test_config gpg.minTrustLevel marginal &&
test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror &&
- test_i18ngrep "has an untrusted GPG signature" mergeerror
+ test_grep "has an untrusted GPG signature" mergeerror
'
test_expect_success GPG 'merge commit with untrusted signature with verification and low minTrustLevel' '
test_when_finished "git reset --hard && git checkout initial" &&
test_config gpg.minTrustLevel undefined &&
git merge --ff-only --verify-signatures side-untrusted >mergeoutput &&
- test_i18ngrep "has a good GPG signature" mergeoutput
+ test_grep "has a good GPG signature" mergeoutput
'
test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true' '
test_when_finished "git reset --hard && git checkout initial" &&
test_config merge.verifySignatures true &&
test_must_fail git merge --ff-only side-untrusted 2>mergeerror &&
- test_i18ngrep "has an untrusted GPG signature" mergeerror
+ test_grep "has an untrusted GPG signature" mergeerror
'
test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true and minTrustLevel' '
@@ -96,20 +96,20 @@ test_expect_success GPG 'merge commit with untrusted signature with merge.verify
test_config merge.verifySignatures true &&
test_config gpg.minTrustLevel marginal &&
test_must_fail git merge --ff-only side-untrusted 2>mergeerror &&
- test_i18ngrep "has an untrusted GPG signature" mergeerror
+ test_grep "has an untrusted GPG signature" mergeerror
'
test_expect_success GPG 'merge signed commit with verification' '
test_when_finished "git reset --hard && git checkout initial" &&
git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput &&
- test_i18ngrep "has a good GPG signature" mergeoutput
+ test_grep "has a good GPG signature" mergeoutput
'
test_expect_success GPG 'merge signed commit with merge.verifySignatures=true' '
test_when_finished "git reset --hard && git checkout initial" &&
test_config merge.verifySignatures true &&
git merge --verbose --ff-only side-signed >mergeoutput &&
- test_i18ngrep "has a good GPG signature" mergeoutput
+ test_grep "has a good GPG signature" mergeoutput
'
test_expect_success GPG 'merge commit with bad signature without verification' '
@@ -133,7 +133,7 @@ test_expect_success GPG 'merge unsigned commit into unborn branch' '
test_when_finished "git checkout initial" &&
git checkout --orphan unborn &&
test_must_fail git merge --verify-signatures side-unsigned 2>mergeerror &&
- test_i18ngrep "does not have a GPG signature" mergeerror
+ test_grep "does not have a GPG signature" mergeerror
'
test_done
diff --git a/t/t7703-repack-geometric.sh b/t/t7703-repack-geometric.sh
index 00f28fb558..9fc1626fbf 100755
--- a/t/t7703-repack-geometric.sh
+++ b/t/t7703-repack-geometric.sh
@@ -23,7 +23,7 @@ test_expect_success '--geometric with no packs' '
cd geometric &&
git repack --write-midx --geometric 2 >out &&
- test_i18ngrep "Nothing new to pack" out
+ test_grep "Nothing new to pack" out
)
'
@@ -38,7 +38,7 @@ test_expect_success '--geometric with one pack' '
git repack --geometric 2 >out &&
- test_i18ngrep "Nothing new to pack" out
+ test_grep "Nothing new to pack" out
)
'
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 59d3847bf8..6a36be1e63 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -28,14 +28,14 @@ prompt_given ()
test_expect_success 'basic usage requires no repo' '
test_expect_code 129 git difftool -h >output &&
- test_i18ngrep ^usage: output &&
+ test_grep ^usage: output &&
# create a ceiling directory to prevent Git from finding a repo
mkdir -p not/repo &&
test_when_finished rm -r not &&
test_expect_code 129 \
env GIT_CEILING_DIRECTORIES="$(pwd)/not" \
git -C not/repo difftool -h >output &&
- test_i18ngrep ^usage: output
+ test_grep ^usage: output
'
# Create a file on main and change it on branch
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 39d6d713ec..bdacb57dcb 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -1386,7 +1386,7 @@ test_expect_success 'grep --no-index pattern -- path' '
test_expect_success 'grep --no-index complains of revs' '
test_must_fail git grep --no-index o main -- 2>err &&
- test_i18ngrep "cannot be used with revs" err
+ test_grep "cannot be used with revs" err
'
test_expect_success 'grep --no-index prefers paths to revs' '
@@ -1399,7 +1399,7 @@ test_expect_success 'grep --no-index prefers paths to revs' '
test_expect_success 'grep --no-index does not "diagnose" revs' '
test_must_fail git grep --no-index o :1:hello.c 2>err &&
- test_i18ngrep ! -i "did you mean" err
+ test_grep ! -i "did you mean" err
'
cat >expected <<EOF
diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index 1dd07141a7..fe38d88a1a 100755
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -63,7 +63,7 @@ test_expect_success SIMPLEPAGER 'git grep -O' '
test_expect_success 'git grep -O --cached' '
test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
- test_i18ngrep open-files-in-pager msg
+ test_grep open-files-in-pager msg
'
test_expect_success 'git grep -O --no-index' '
diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh
index d37c83b464..167fe66150 100755
--- a/t/t7814-grep-recurse-submodules.sh
+++ b/t/t7814-grep-recurse-submodules.sh
@@ -348,7 +348,7 @@ test_incompatible_with_recurse_submodules ()
{
test_expect_success "--recurse-submodules and $1 are incompatible" "
test_must_fail git grep -e. --recurse-submodules $1 2>actual &&
- test_i18ngrep 'not supported with --recurse-submodules' actual
+ test_grep 'not supported with --recurse-submodules' actual
"
}
diff --git a/t/t7816-grep-binary-pattern.sh b/t/t7816-grep-binary-pattern.sh
index fdb2355649..4353be5adb 100755
--- a/t/t7816-grep-binary-pattern.sh
+++ b/t/t7816-grep-binary-pattern.sh
@@ -26,7 +26,7 @@ nul_match_internal () {
>stderr &&
printf '$pattern' | q_to_nul >f &&
test_must_fail env LC_ALL=\"$lc_all\" git grep $extra_flags -f f $flags a 2>stderr &&
- test_i18ngrep ! 'This is only supported with -P under PCRE v2' stderr
+ test_grep ! 'This is only supported with -P under PCRE v2' stderr
"
elif test "$matches" = P
then
@@ -34,7 +34,7 @@ nul_match_internal () {
>stderr &&
printf '$pattern' | q_to_nul >f &&
test_must_fail env LC_ALL=\"$lc_all\" git grep -f f $flags a 2>stderr &&
- test_i18ngrep 'This is only supported with -P under PCRE v2' stderr
+ test_grep 'This is only supported with -P under PCRE v2' stderr
"
else
test_expect_success "PANIC: Test framework error. Unknown matches value $matches" 'false'
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
index 487e326b3f..760079b411 100755
--- a/t/t7900-maintenance.sh
+++ b/t/t7900-maintenance.sh
@@ -33,13 +33,13 @@ test_systemd_analyze_verify () {
test_expect_success 'help text' '
test_expect_code 129 git maintenance -h >actual &&
- test_i18ngrep "usage: git maintenance <subcommand>" actual &&
+ test_grep "usage: git maintenance <subcommand>" actual &&
test_expect_code 129 git maintenance barf 2>err &&
- test_i18ngrep "unknown subcommand: \`barf'\''" err &&
- test_i18ngrep "usage: git maintenance" err &&
+ test_grep "unknown subcommand: \`barf'\''" err &&
+ test_grep "usage: git maintenance" err &&
test_expect_code 129 git maintenance 2>err &&
- test_i18ngrep "error: need a subcommand" err &&
- test_i18ngrep "usage: git maintenance" err
+ test_grep "error: need a subcommand" err &&
+ test_grep "usage: git maintenance" err
'
test_expect_success 'run [--auto|--quiet]' '
@@ -131,12 +131,12 @@ test_expect_success 'commit-graph auto condition' '
test_expect_success 'run --task=bogus' '
test_must_fail git maintenance run --task=bogus 2>err &&
- test_i18ngrep "is not a valid task" err
+ test_grep "is not a valid task" err
'
test_expect_success 'run --task duplicate' '
test_must_fail git maintenance run --task=gc --task=gc 2>err &&
- test_i18ngrep "cannot be selected multiple times" err
+ test_grep "cannot be selected multiple times" err
'
test_expect_success 'run --task=prefetch with no remotes' '
@@ -377,12 +377,12 @@ test_expect_success 'pack-refs task' '
test_expect_success '--auto and --schedule incompatible' '
test_must_fail git maintenance run --auto --schedule=daily 2>err &&
- test_i18ngrep "at most one" err
+ test_grep "at most one" err
'
test_expect_success 'invalid --schedule value' '
test_must_fail git maintenance run --schedule=annually 2>err &&
- test_i18ngrep "unrecognized --schedule" err
+ test_grep "unrecognized --schedule" err
'
test_expect_success '--schedule inheritance weekly -> daily -> hourly' '
@@ -576,15 +576,15 @@ test_expect_success !MINGW 'register and unregister with regex metacharacters' '
test_expect_success 'start --scheduler=<scheduler>' '
test_expect_code 129 git maintenance start --scheduler=foo 2>err &&
- test_i18ngrep "unrecognized --scheduler argument" err &&
+ test_grep "unrecognized --scheduler argument" err &&
test_expect_code 129 git maintenance start --no-scheduler 2>err &&
- test_i18ngrep "unknown option" err &&
+ test_grep "unknown option" err &&
test_expect_code 128 \
env GIT_TEST_MAINT_SCHEDULER="launchctl:true,schtasks:true" \
git maintenance start --scheduler=crontab 2>err &&
- test_i18ngrep "fatal: crontab scheduler is not available" err
+ test_grep "fatal: crontab scheduler is not available" err
'
test_expect_success 'start from empty cron table' '
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index 8bcd39e81b..731265541a 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -207,7 +207,7 @@ EOF
test_expect_success 'blame -L with invalid start' '
test_must_fail git blame -L5 tres 2>errors &&
- test_i18ngrep "has only 2 lines" errors
+ test_grep "has only 2 lines" errors
'
test_expect_success 'blame -L with invalid end' '
diff --git a/t/t8013-blame-ignore-revs.sh b/t/t8013-blame-ignore-revs.sh
index b18633dee1..9a03b0f361 100755
--- a/t/t8013-blame-ignore-revs.sh
+++ b/t/t8013-blame-ignore-revs.sh
@@ -129,14 +129,14 @@ test_expect_success override_ignore_revs_file '
'
test_expect_success bad_files_and_revs '
test_must_fail git blame file --ignore-rev NOREV 2>err &&
- test_i18ngrep "cannot find revision NOREV to ignore" err &&
+ test_grep "cannot find revision NOREV to ignore" err &&
test_must_fail git blame file --ignore-revs-file NOFILE 2>err &&
- test_i18ngrep "could not open.*: NOFILE" err &&
+ test_grep "could not open.*: NOFILE" err &&
echo NOREV >ignore_norev &&
test_must_fail git blame file --ignore-revs-file ignore_norev 2>err &&
- test_i18ngrep "invalid object name: NOREV" err
+ test_grep "invalid object name: NOREV" err
'
# For ignored revs that have added 'unblamable' lines, mark those lines with a
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index a60b05ad3f..5307947db8 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -371,7 +371,7 @@ test_expect_success $PREREQ,!AUTOIDENT 'broken implicit ident aborts send-email'
--smtp-server="$(pwd)/fake.sendmail" \
--to=to@example.com \
$patches </dev/null 2>errors &&
- test_i18ngrep "tell me who you are" errors
+ test_grep "tell me who you are" errors
)
'
@@ -2062,7 +2062,7 @@ test_expect_success $PREREQ 'aliases and sendemail.identity' '
-c sendemail.aliasesfile=default-aliases \
-c sendemail.cloud.aliasesfile=cloud-aliases \
send-email -1 2>stderr &&
- test_i18ngrep "cloud-aliases" stderr
+ test_grep "cloud-aliases" stderr
'
test_sendmail_aliases () {
@@ -2427,7 +2427,7 @@ test_expect_success $PREREQ 'invoke hook' '
--to=nobody@example.com \
--smtp-server="$(pwd)/../fake.sendmail" \
../another.patch 2>err &&
- test_i18ngrep "rejected by sendemail-validate hook" err
+ test_grep "rejected by sendemail-validate hook" err
)
'
@@ -2483,7 +2483,7 @@ test_expect_success $PREREQ 'test that sendmail config is rejected' '
--to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \
HEAD^ 2>err &&
- test_i18ngrep "found configuration options for '"'"sendmail"'"'" err
+ test_grep "found configuration options for '"'"sendmail"'"'" err
'
test_expect_success $PREREQ 'test that sendmail config rejection is specific' '
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index ac237a1f90..dbb5042b0b 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -2879,7 +2879,7 @@ test_expect_success 'S: filemodify with garbage after mark must fail' '
COMMIT
M 100644 :403x hello.c
EOF
- test_i18ngrep "space after mark" err
+ test_grep "space after mark" err
'
# inline is misspelled; fast-import thinks it is some unknown dataref
@@ -2895,7 +2895,7 @@ test_expect_success 'S: filemodify with garbage after inline must fail' '
inline
BLOB
EOF
- test_i18ngrep "nvalid dataref" err
+ test_grep "nvalid dataref" err
'
test_expect_success 'S: filemodify with garbage after sha1 must fail' '
@@ -2908,7 +2908,7 @@ test_expect_success 'S: filemodify with garbage after sha1 must fail' '
COMMIT
M 100644 ${sha1}x hello.c
EOF
- test_i18ngrep "space after SHA1" err
+ test_grep "space after SHA1" err
'
#
@@ -2923,7 +2923,7 @@ test_expect_success 'S: notemodify with garbage after mark dataref must fail' '
COMMIT
N :202x :302
EOF
- test_i18ngrep "space after mark" err
+ test_grep "space after mark" err
'
test_expect_success 'S: notemodify with garbage after inline dataref must fail' '
@@ -2938,7 +2938,7 @@ test_expect_success 'S: notemodify with garbage after inline dataref must fail'
note blob
BLOB
EOF
- test_i18ngrep "nvalid dataref" err
+ test_grep "nvalid dataref" err
'
test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' '
@@ -2951,7 +2951,7 @@ test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' '
COMMIT
N ${sha1}x :302
EOF
- test_i18ngrep "space after SHA1" err
+ test_grep "space after SHA1" err
'
#
@@ -2966,7 +2966,7 @@ test_expect_success 'S: notemodify with garbage after mark commit-ish must fail'
COMMIT
N :202 :302x
EOF
- test_i18ngrep "after mark" err
+ test_grep "after mark" err
'
#
@@ -2999,7 +2999,7 @@ test_expect_success 'S: from with garbage after mark must fail' '
EOF
# now evaluate the error
- test_i18ngrep "after mark" err
+ test_grep "after mark" err
'
@@ -3018,7 +3018,7 @@ test_expect_success 'S: merge with garbage after mark must fail' '
merge :303x
M 100644 :403 hello.c
EOF
- test_i18ngrep "after mark" err
+ test_grep "after mark" err
'
#
@@ -3033,7 +3033,7 @@ test_expect_success 'S: tag with garbage after mark must fail' '
tag S
TAG
EOF
- test_i18ngrep "after mark" err
+ test_grep "after mark" err
'
#
@@ -3043,7 +3043,7 @@ test_expect_success 'S: cat-blob with garbage after mark must fail' '
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
cat-blob :403x
EOF
- test_i18ngrep "after mark" err
+ test_grep "after mark" err
'
#
@@ -3053,7 +3053,7 @@ test_expect_success 'S: ls with garbage after mark must fail' '
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
ls :302x hello.c
EOF
- test_i18ngrep "space after mark" err
+ test_grep "space after mark" err
'
test_expect_success 'S: ls with garbage after sha1 must fail' '
@@ -3061,7 +3061,7 @@ test_expect_success 'S: ls with garbage after sha1 must fail' '
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
ls ${sha1}x hello.c
EOF
- test_i18ngrep "space after tree-ish" err
+ test_grep "space after tree-ish" err
'
###
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index a4b3cb9492..53af8e34ac 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -54,7 +54,7 @@ test_expect_success 'git p4 sync uninitialized repo' '
(
cd "$git" &&
test_must_fail git p4 sync 2>errs &&
- test_i18ngrep "Perhaps you never did" errs
+ test_grep "Perhaps you never did" errs
)
'
@@ -86,7 +86,7 @@ test_expect_success 'git p4 sync existing branch without changes' '
test_commit head &&
git p4 sync --branch=depot //depot@all &&
git p4 sync --branch=refs/remotes/p4/depot >out &&
- test_i18ngrep "No changes to import!" out
+ test_grep "No changes to import!" out
)
'
@@ -101,7 +101,7 @@ test_expect_success 'git p4 sync existing branch with relative name' '
test_commit head &&
git p4 sync --branch=branch1 //depot@all &&
git p4 sync --branch=p4/branch1 >out &&
- test_i18ngrep "No changes to import!" out
+ test_grep "No changes to import!" out
)
'
@@ -116,7 +116,7 @@ test_expect_success 'git p4 sync existing branch with nested path' '
test_commit head &&
git p4 sync --branch=p4/some/path //depot@all &&
git p4 sync --branch=some/path >out &&
- test_i18ngrep "No changes to import!" out
+ test_grep "No changes to import!" out
)
'
@@ -131,7 +131,7 @@ test_expect_success 'git p4 sync branch explicit ref without p4 in path' '
test_commit head &&
git p4 sync --branch=refs/remotes/someremote/depot //depot@all &&
git p4 sync --branch=refs/remotes/someremote/depot >out &&
- test_i18ngrep "No changes to import!" out
+ test_grep "No changes to import!" out
)
'
@@ -143,7 +143,7 @@ test_expect_success 'git p4 sync nonexistent ref' '
test_commit head &&
git p4 sync --branch=depot //depot@all &&
test_must_fail git p4 sync --branch=depot2 2>errs &&
- test_i18ngrep "Perhaps you never did" errs
+ test_grep "Perhaps you never did" errs
)
'
@@ -155,7 +155,7 @@ test_expect_success 'git p4 sync existing non-p4-imported ref' '
test_commit head &&
git p4 sync --branch=depot //depot@all &&
test_must_fail git p4 sync --branch=refs/heads/master 2>errs &&
- test_i18ngrep "Perhaps you never did" errs
+ test_grep "Perhaps you never did" errs
)
'
@@ -290,7 +290,7 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
export PATH &&
test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1
) &&
- test_i18ngrep ! Traceback errs
+ test_grep ! Traceback errs
'
# Hide a file from p4d, make sure we catch its complaint. This won't fail in
@@ -301,7 +301,7 @@ test_expect_success 'exit gracefully for p4 server errors' '
mv "$db"/depot/file1,v "$db"/depot/file1,v,hidden &&
test_when_finished cleanup_git &&
test_expect_code 1 git p4 clone --dest="$git" //depot@1 >out 2>err &&
- test_i18ngrep "Error from p4 print" err
+ test_grep "Error from p4 print" err
'
test_expect_success 'clone --bare should make a bare repository' '
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 759a14fa87..73cca0d143 100755
--- a/t/t9801-git-p4-branch.sh
+++ b/t/t9801-git-p4-branch.sh
@@ -135,7 +135,7 @@ test_expect_success 'sync specific detected branch' '
(
cd "$git" &&
git p4 sync --branch=depot/branch2 >out &&
- test_i18ngrep "No changes to import!" out
+ test_grep "No changes to import!" out
)
'
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index 7d4109f29d..af4b286f9d 100755
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -75,7 +75,7 @@ test_expect_success 'submit --dry-run' '
test_commit "dry-run1" &&
test_commit "dry-run2" &&
git p4 submit --dry-run >out &&
- test_i18ngrep "Would apply" out
+ test_grep "Would apply" out
) &&
(
cd "$cli" &&
@@ -99,7 +99,7 @@ test_expect_success 'submit --dry-run --export-labels' '
git commit -m "dry-run2" dry-run2 &&
git tag -m "dry-run-tag1" dry-run-tag1 HEAD^ &&
git p4 submit --dry-run --export-labels >out &&
- test_i18ngrep "Would create p4 label" out
+ test_grep "Would create p4 label" out
) &&
(
cd "$cli" &&
@@ -443,7 +443,7 @@ test_expect_success 'description with Jobs section and bogus following text' '
# build a job
make_job $(cat jobname) &&
test_must_fail git p4 submit 2>err &&
- test_i18ngrep "Unknown field name" err
+ test_grep "Unknown field name" err
) &&
(
cd "$cli" &&
@@ -461,9 +461,9 @@ test_expect_success 'submit --prepare-p4-only' '
git add prep-only-add &&
git commit -m "prep only add" &&
git p4 submit --prepare-p4-only >out &&
- test_i18ngrep "prepared for submission" out &&
- test_i18ngrep "must be deleted" out &&
- test_i18ngrep ! "everything below this line is just the diff" out
+ test_grep "prepared for submission" out &&
+ test_grep "must be deleted" out &&
+ test_grep ! "everything below this line is just the diff" out
) &&
(
cd "$cli" &&
diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh
index 0ca9937de6..c766fd159f 100755
--- a/t/t9815-git-p4-submit-fail.sh
+++ b/t/t9815-git-p4-submit-fail.sh
@@ -35,7 +35,7 @@ test_expect_success 'conflict on one commit' '
git add file1 &&
git commit -m "line3 in file1 will conflict" &&
test_expect_code 1 git p4 submit >out &&
- test_i18ngrep "No commits applied" out
+ test_grep "No commits applied" out
)
'
@@ -58,7 +58,7 @@ test_expect_success 'conflict on second of two commits' '
git add file1 &&
git commit -m "line4 in file1 will conflict" &&
test_expect_code 1 git p4 submit >out &&
- test_i18ngrep "Applied only the commits" out
+ test_grep "Applied only the commits" out
)
'
@@ -81,7 +81,7 @@ test_expect_success 'conflict on first of two commits, skip' '
# but this commit is okay
test_commit "okay_commit_after_skip" &&
echo s | test_expect_code 1 git p4 submit >out &&
- test_i18ngrep "Applied only the commits" out
+ test_grep "Applied only the commits" out
)
'
@@ -104,7 +104,7 @@ test_expect_success 'conflict on first of two commits, quit' '
# but this commit is okay
test_commit "okay_commit_after_quit" &&
echo q | test_expect_code 1 git p4 submit >out &&
- test_i18ngrep "No commits applied" out
+ test_grep "No commits applied" out
)
'
@@ -144,7 +144,7 @@ test_expect_success 'conflict on first of two commits, --conflict=skip' '
# but this commit is okay
test_commit "okay_commit_after_auto_skip" &&
test_expect_code 1 git p4 submit --conflict=skip >out &&
- test_i18ngrep "Applied only the commits" out
+ test_grep "Applied only the commits" out
)
'
@@ -167,7 +167,7 @@ test_expect_success 'conflict on first of two commits, --conflict=quit' '
# but this commit is okay
test_commit "okay_commit_after_auto_quit" &&
test_expect_code 1 git p4 submit --conflict=quit >out &&
- test_i18ngrep "No commits applied" out
+ test_grep "No commits applied" out
)
'
--
2.42.0-530-g692be87cbb
^ permalink raw reply related [relevance 1%]
* [PATCH v2] fix `git mv existing-dir non-existing-dir` in some environments.
2023-08-08 14:53 10% [PATCH] fix `git mv existing-dir non-existing-dir`* Sebastian Thiel via GitGitGadget
2023-08-08 17:36 0% ` Junio C Hamano
@ 2023-08-09 7:47 9% ` Sebastian Thiel via GitGitGadget
1 sibling, 0 replies; 200+ results
From: Sebastian Thiel via GitGitGadget @ 2023-08-09 7:47 UTC (permalink / raw)
To: git; +Cc: Torsten Bögershausen, Sebastian Thiel, Sebastian Thiel
From: Sebastian Thiel <sebastian.thiel@icloud.com>
When moving a directory onto another with `git mv` various checks are
performed. One of of these validates that the destination is not existing.
When calling `lstat` on the destination path and it fails as the path
doesn't exist, some environments seem to overwrite the passed in
`stat` memory nonetheless (I observed this issue on debian 12 of x86_64,
running on OrbStack on ARM, emulated with Rosetta).
This would affect the code that followed as it would still acccess a now
modified `st` structure, which now seems to contain uninitialized memory.
`S_ISDIR(st_dir_mode)` would then typically return false causing the code
to run into a bad case.
The fix avoids overwriting the existing `st` structure, providing an
alternative that exists only for that purpose.
Note that this patch minimizes complexity instead of stack-frame size.
Signed-off-by: Sebastian Thiel <sebastian.thiel@icloud.com>
---
[PATCH] mv: handle lstat() failure correctly
When moving a directory onto another with git mv various checks are
performed. One of of these validates that the destination is not
existing.
When calling lstat on the destination path and it fails as the path
doesn't exist, some environments seem to overwrite the passed in stat
memory nonetheless (I observed this issue on debian 12 of x86_64,
running on OrbStack on ARM, emulated with Rosetta).
This would affect the code that followed as it would still acccess a now
modified st structure, which now seems to contain uninitialized memory.
S_ISDIR(st_dir_mode) would then typically return false causing the code
to run into a bad case.
The fix avoids overwriting the existing st structure, providing an
alternative that exists only for that purpose.
Note that this patch minimizes complexity instead of stack-frame size.
======================================================================
It's worth pointing out that the test demonstrates this case only if one
happens to execute it in one of the environments that happen to have an
lstat that writes into stat even on error. Thus it already worked for me
on MacOS, even without the patch applied, which matches my observation
that a certain script works there but doesn't work on the VM.
Even though the patch now minimizes size, I can imagine one might
instead want to rather copy st.st_mode to protect only the relevant
field from being affected by potential rewrites of st later on.
Changes since v1:
* replaced previous title with recommendation by Junio C Hermano
* improved formatting of commit message and renamed gix to git. Let's
call that a typo
* apply Junio C Hermano's suggestions to test-case
* I refrained from changing the error message as this would mean all
translations need adjustment (and I don't know how this is tracked
then)
I also want to apologise for the possibly terrible formatting and the
repetition - it feels strange but is what gitgadget seems to suggests.
Further, it's my honour to submit a patch to git and interact with the
maintainers, it's like meeting my idols!
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1561%2FByron%2Ffix-mv-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1561/Byron/fix-mv-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1561
Range-diff vs v1:
1: ad0e6754e2d ! 1: 8908fd228fe fix `git mv existing-dir non-existing-dir`*
@@ Metadata
Author: Sebastian Thiel <sebastian.thiel@icloud.com>
## Commit message ##
- fix `git mv existing-dir non-existing-dir`*
+ fix `git mv existing-dir non-existing-dir` in some environments.
- *in some environments.
+ When moving a directory onto another with `git mv` various checks are
+ performed. One of of these validates that the destination is not existing.
- When moving a directory onto another with `gix mv`
- various checks are performed. One of of these
- validates that the destination is not an existing
- file.
+ When calling `lstat` on the destination path and it fails as the path
+ doesn't exist, some environments seem to overwrite the passed in
+ `stat` memory nonetheless (I observed this issue on debian 12 of x86_64,
+ running on OrbStack on ARM, emulated with Rosetta).
- When calling `lstat` on the destination path and
- it fails as the path doesn't exist, some
- environments seem to overwrite the passed in
- `stat` memory nonetheless.
- (I observed this issue on debian 12 of x86_64,
- running on OrbStack on ARM, emulated with Rosetta)
+ This would affect the code that followed as it would still acccess a now
+ modified `st` structure, which now seems to contain uninitialized memory.
+ `S_ISDIR(st_dir_mode)` would then typically return false causing the code
+ to run into a bad case.
- This would affect the code that followed as it
- would still acccess a now
- modified `st` structure, which now seems to
- contain uninitialized memory.
- `S_ISDIR(st_dir_mode)` would then typically
- return false causing the code to run into a bad
- case.
+ The fix avoids overwriting the existing `st` structure, providing an
+ alternative that exists only for that purpose.
- The fix avoids overwriting the existing `st`
- structure, providing an alternative that exists
- only for that purpose.
-
- Note that this patch minimizes complexity instead of stack-size.
+ Note that this patch minimizes complexity instead of stack-frame size.
Signed-off-by: Sebastian Thiel <sebastian.thiel@icloud.com>
@@ t/t7001-mv.sh: test_expect_success 'do not move directory over existing director
'
+test_expect_success 'rename directory to non-existing directory' '
-+ mkdir dir-a && touch dir-a/f &&
++ mkdir dir-a &&
++ >dir-a/f &&
+ git add dir-a &&
+ git mv dir-a non-existing-dir
+'
builtin/mv.c | 4 ++--
t/t7001-mv.sh | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index fa84fcb20d8..05e7156034e 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -184,7 +184,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
int src_dir_nr = 0, src_dir_alloc = 0;
struct strbuf a_src_dir = STRBUF_INIT;
enum update_mode *modes, dst_mode = 0;
- struct stat st;
+ struct stat st, dest_st;
struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
struct lock_file lock_file = LOCK_INIT;
struct cache_entry *ce;
@@ -304,7 +304,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
goto act_on_entry;
}
if (S_ISDIR(st.st_mode)
- && lstat(dst, &st) == 0) {
+ && lstat(dst, &dest_st) == 0) {
bad = _("cannot move directory over file");
goto act_on_entry;
}
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 898a9205328..f136ea76f7f 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -174,6 +174,13 @@ test_expect_success 'do not move directory over existing directory' '
test_must_fail git mv path2 path0
'
+test_expect_success 'rename directory to non-existing directory' '
+ mkdir dir-a &&
+ >dir-a/f &&
+ git add dir-a &&
+ git mv dir-a non-existing-dir
+'
+
test_expect_success 'move into "."' '
git mv path1/path2/ .
'
base-commit: 1b0a5129563ebe720330fdc8f5c6843d27641137
--
gitgitgadget
^ permalink raw reply related [relevance 9%]
* Re: [PATCH] fix `git mv existing-dir non-existing-dir`*
2023-08-08 14:53 10% [PATCH] fix `git mv existing-dir non-existing-dir`* Sebastian Thiel via GitGitGadget
@ 2023-08-08 17:36 0% ` Junio C Hamano
2023-08-09 7:47 9% ` [PATCH v2] fix `git mv existing-dir non-existing-dir` in some environments Sebastian Thiel via GitGitGadget
1 sibling, 0 replies; 200+ results
From: Junio C Hamano @ 2023-08-08 17:36 UTC (permalink / raw)
To: Sebastian Thiel via GitGitGadget; +Cc: git, Sebastian Thiel
"Sebastian Thiel via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Sebastian Thiel <sebastian.thiel@icloud.com>
>
> *in some environments.
Please do not chop a single sentence in the middle and mark that
fact with an asterisk nobody understands what it means.
Subject: [PATCH] mv: handle lstat() failure correctly
perhaps?
> When moving a directory onto another with `gix mv` various checks
> are performed. One of of these validates that the destination is
> not an existing file.
>
> When calling `lstat` on the destination path and it fails as the
> path doesn't exist, some environments seem to overwrite the passed
> in `stat` memory nonetheless. (I observed this issue on debian 12
> of x86_64, running on OrbStack on ARM, emulated with Rosetta)
Very cleanly written, except "gix" -> "git".
POSIX does not seem to specify what should happen to buf when the
call fails, which I take to mean that its contents can become any
garbage at that point.
> diff --git a/builtin/mv.c b/builtin/mv.c
> index fa84fcb20d8..05e7156034e 100644
> --- a/builtin/mv.c
> +++ b/builtin/mv.c
> @@ -184,7 +184,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
> int src_dir_nr = 0, src_dir_alloc = 0;
> struct strbuf a_src_dir = STRBUF_INIT;
> enum update_mode *modes, dst_mode = 0;
> - struct stat st;
> + struct stat st, dest_st;
> struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
> struct lock_file lock_file = LOCK_INIT;
> struct cache_entry *ce;
> @@ -304,7 +304,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
> goto act_on_entry;
> }
> if (S_ISDIR(st.st_mode)
> - && lstat(dst, &st) == 0) {
> + && lstat(dst, &dest_st) == 0) {
This is good. After this "if (S_ISDIR)" thing, there is another "if
(S_ISDIR)" on the same st.st_mode, so clobbering st like the
original was a stupid thing to do.
> bad = _("cannot move directory over file");
What is curious is that dest_st.st_mode, after lstat on dst
succeeds, is never checked, even though the error message claims
that it detected an attempt to move directory over file. What
should happen when the user did this then?
$ git mv existing-dir another-existing-dir
Shouldn't it do something similar to
$ mv D1 D2
which is to move the entire hierarchy of D1 and make it appear at
D2/D1?
Even if the answer to the above question is "yes", that is a
separate bugfix, so let's not get distracted and see how our
test looks like.
> goto act_on_entry;
> }
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> index 898a9205328..9894bc45ee6 100755
> --- a/t/t7001-mv.sh
> +++ b/t/t7001-mv.sh
> @@ -174,6 +174,12 @@ test_expect_success 'do not move directory over existing directory' '
> test_must_fail git mv path2 path0
> '
>
> +test_expect_success 'rename directory to non-existing directory' '
> + mkdir dir-a && touch dir-a/f &&
One command per line, and reserve the use of "touch" to cases where
you care about the timestamps, not existence. I.e.
mkdir dir-a &&
>dir-a/f &&
> + git add dir-a &&
> + git mv dir-a non-existing-dir
> +'
OK, there is no guarantee that this would fail on a system whose
lstat() may clobber buf when it notices that the path does not
exist, but it is a good test to have.
Thanks.
^ permalink raw reply [relevance 0%]
* [PATCH] fix `git mv existing-dir non-existing-dir`*
@ 2023-08-08 14:53 10% Sebastian Thiel via GitGitGadget
2023-08-08 17:36 0% ` Junio C Hamano
2023-08-09 7:47 9% ` [PATCH v2] fix `git mv existing-dir non-existing-dir` in some environments Sebastian Thiel via GitGitGadget
0 siblings, 2 replies; 200+ results
From: Sebastian Thiel via GitGitGadget @ 2023-08-08 14:53 UTC (permalink / raw)
To: git; +Cc: Sebastian Thiel, Sebastian Thiel
From: Sebastian Thiel <sebastian.thiel@icloud.com>
*in some environments.
When moving a directory onto another with `gix mv`
various checks are performed. One of of these
validates that the destination is not an existing
file.
When calling `lstat` on the destination path and
it fails as the path doesn't exist, some
environments seem to overwrite the passed in
`stat` memory nonetheless.
(I observed this issue on debian 12 of x86_64,
running on OrbStack on ARM, emulated with Rosetta)
This would affect the code that followed as it
would still acccess a now
modified `st` structure, which now seems to
contain uninitialized memory.
`S_ISDIR(st_dir_mode)` would then typically
return false causing the code to run into a bad
case.
The fix avoids overwriting the existing `st`
structure, providing an alternative that exists
only for that purpose.
Note that this patch minimizes complexity instead of stack-size.
Signed-off-by: Sebastian Thiel <sebastian.thiel@icloud.com>
---
fix git mv existing-dir non-existing-dir*
fix git mv existing-dir non-existing-dir*
*in some environments.
When moving a directory onto another with gix mv various checks are
performed. One of of these validates that the destination is not an
existing file.
When calling lstat on the destination path and it fails as the path
doesn't exist, some environments seem to overwrite the passed in stat
memory nonetheless. (I observed this issue on debian 12 of x86_64,
running on OrbStack on ARM, emulated with Rosetta)
This would affect the code that followed as it would still acccess a now
modified st structure, which now seems to contain uninitialized memory.
S_ISDIR(st_dir_mode) would then typically return false causing the code
to run into a bad case.
The fix avoids overwriting the existing st structure, providing an
alternative that exists only for that purpose.
------------------------------------------------------------------------
It's worth pointing out that the test demonstrates this case only if one
happens to execute it in one of the environments that happen to have an
lstat that writes into stat even on error. Thus it already worked for me
on MacOS, even without the patch applied, which matches my observation
that a certain script works there but doesn't work on the VM.
Even though the patch now minimizes size, I can imagine one might
instead want to rather copy st.st_mode to protect only the relevant
field from being affected by potential rewrites of st later on.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1561%2FByron%2Ffix-mv-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1561/Byron/fix-mv-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1561
builtin/mv.c | 4 ++--
t/t7001-mv.sh | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index fa84fcb20d8..05e7156034e 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -184,7 +184,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
int src_dir_nr = 0, src_dir_alloc = 0;
struct strbuf a_src_dir = STRBUF_INIT;
enum update_mode *modes, dst_mode = 0;
- struct stat st;
+ struct stat st, dest_st;
struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
struct lock_file lock_file = LOCK_INIT;
struct cache_entry *ce;
@@ -304,7 +304,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
goto act_on_entry;
}
if (S_ISDIR(st.st_mode)
- && lstat(dst, &st) == 0) {
+ && lstat(dst, &dest_st) == 0) {
bad = _("cannot move directory over file");
goto act_on_entry;
}
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 898a9205328..9894bc45ee6 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -174,6 +174,12 @@ test_expect_success 'do not move directory over existing directory' '
test_must_fail git mv path2 path0
'
+test_expect_success 'rename directory to non-existing directory' '
+ mkdir dir-a && touch dir-a/f &&
+ git add dir-a &&
+ git mv dir-a non-existing-dir
+'
+
test_expect_success 'move into "."' '
git mv path1/path2/ .
'
base-commit: 1b0a5129563ebe720330fdc8f5c6843d27641137
--
gitgitgadget
^ permalink raw reply related [relevance 10%]
* [ANNOUNCE] Git v2.41.0
@ 2023-06-01 10:11 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2023-06-01 10:11 UTC (permalink / raw)
To: git; +Cc: Linux Kernel, git-packagers
The latest feature release Git v2.41.0 is now available at the
usual places. It is comprised of 542 non-merge commits since
v2.40.0, contributed by 95 people, 29 of which are new faces [*].
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.41.0'
tag and the 'master' branch that the tag points at:
url = https://git.kernel.org/pub/scm/git/git
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.40.0 are as follows.
Welcome to the Git development community!
Adam Johnson, André Baptista, Andy Koppe, Arkadii Yakovets,
Benjamin Jorand, Clement Mabileau, Corentin Garcia, Cristian Le,
Daniel Watson, D. Ben Knoble, Douglas Anderson, Edwin Kofler,
Jonas Haag, Jouke Witteveen, Kate Golovanova, Matthias Görgens,
Maxim Cournoyer, Michael Henry, Michael Strawbridge, Nico Rieck,
Peter Dave Hello, Raghul Nanth A, Rolf Eike Beer, Shuqi Liang,
Siddharth Singh, Stanislav Malishevskiy, Stephane Odul, Vítor
Pinho, and Xin Xing.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Ævar Arnfjörð Bjarmason, Alexander Shopov, Alex Henrie,
Andreas Schwab, Andrei Rybak, Bagas Sanjaya, Beat Bolli, brian
m. carlson, Christian Hesse, Daniel Santos, Derrick Stolee,
Elijah Newren, Emily Shaffer, Emir SARI, Eric Sunshine, Eric
Wong, Fangyi Zhou, Felipe Contreras, Glen Choo, Han Xin, Jacob
Keller, Jean-Noël Avila, Jeff King, Jiang Xin, Joakim Petersen,
Johannes Schindelin, Johannes Sixt, John Cai, John Keeping,
Jordi Mas, Josh Soref, Junio C Hamano, Kristoffer Haugsbakk,
Linus Arver, Linus Torvalds, Martin Ågren, Mathias Krause,
Matthew John Cheetham, Matthias Rüster, M Hickford, Michael
J Gruber, Mike Hommey, Oswald Buddenhagen, Øystein Walle,
Patrick Steinhardt, Paul Eggert, Peter Krefting, Philippe Blain,
Phillip Wood, Ralf Thielow, Randall S. Becker, René Scharfe,
Robin Jarry, Rubén Justo, RyotaK, Sohom Datta, SZEDER Gábor,
Tao Klerks, Taylor Blau, Teng Long, Todd Zullinger, Torsten
Bögershausen, William Sprent, Yi-Jyun Pan, ZheNing Hu,
and 依云.
[*] We are counting not just the authorship contribution but issue
reporting, mentoring, helping and reviewing that are recorded in
the commit trailers.
----------------------------------------------------------------
Git v2.41 Release Notes
=======================
UI, Workflows & Features
* Allow information carried on the WWW-Authenticate header to be
passed to the credential helpers.
* A new "fetch.hideRefs" option can be used to exclude specified refs
from "rev-list --objects --stdin --not --all" traversal for
checking object connectivity, most useful when there are many
unrelated histories in a single repository.
* "git push" has been taught to allow deletion of refs with one-level
names to help repairing a repository who acquired such a ref by
mistake. In general, we don't encourage use of such a ref, and
creation or update to such a ref is rejected as before.
* Allow "git bisect reset" to check out the original branch when the
branch is already checked out in a different worktree linked to the
same repository.
* A few subcommands have been taught to stop users from working on a
branch that is being used in another worktree linked to the same
repository.
* "git format-patch" learned to write a log-message only output file
for empty commits.
* "git format-patch" honors the src/dst prefixes set to nonstandard
values with configuration variables like "diff.noprefix", causing
receiving end of the patch that expects the standard -p1 format to
break. "format-patch" has been taught to ignore end-user configuration
and always use the standard prefixes.
This is a backward compatibility breaking change.
* Lift the limitation that colored prompts can only be used with
PROMPT_COMMAND mode.
* "git blame --contents=<file> <rev> -- <path>" used to be forbidden,
but now it finds the origins of lines starting at <file> contents
through the history that leads to <rev>.
* "git pack-redundant" gave a warning when run, as the command has
outlived its usefulness long ago and is nominated for future
removal. Now we escalate to give an error.
* "git clone" from an empty repository learned to propagate the
choice of the hash algorithm from the source repository to the
newly created repository over any one of the v0/v1/v2 protocol.
* "git mergetool" and "git difftool" learns a new configuration
guiDefault to optionally favor configured guitool over non-gui-tool
automatically when $DISPLAY is set.
* "git branch -d origin/master" would say "no such branch", but it is
likely a missed "-r" if refs/remotes/origin/master exists. The
command has been taught to give such a hint in its error message.
* Clean-up of the code path that deals with merge strategy option
handling in "git rebase".
* "git clone --local" stops copying from an original repository that
has symbolic links inside its $GIT_DIR; an error message when that
happens has been updated.
* The "--format=..." option of "git for-each-ref", "git branch", and
"git tag" commands learn "--omit-empty" to hide refs whose
formatting results in an empty string from the output.
* The sendemail-validate validate hook learned to pass the total
number of input files and where in the sequence each invocation is
via environment variables.
* When "gc" needs to retain unreachable objects, packing them into
cruft packs (instead of exploding them into loose object files) has
been offered as a more efficient option for some time. Now the use
of cruft packs has been made the default and no longer considered
an experimental feature.
* The output given by "git blame" that attributes a line to contents
taken from the file specified by the "--contents" option shows it
differently from a line attributed to the working tree file.
* "git send-email" learned to give the e-mail headers to the validate
hook by passing an extra argument from the command line.
* The credential subsystem learns to help OAuth framework.
* The titles of manual pages used to be chomped at an unreasonably
short limit, which has been removed.
* Error messages given when working on an unborn branch that is
checked out in another worktree have been improved.
* The documentation was misleading about the interaction between
GIT_DEFAULT_HASH and "git clone", which has been clarified to
stress that the variable is to be ignored by the command.
* "git send-email" learned "--header-cmd=<cmd>" that can inject
arbitrary e-mail header lines to the outgoing messages.
* "git fsck" learned to detect bit-flip breakages in the reachability
bitmap files.
* The "--stdin" option of "git name-rev" has been replaced with
the "--annotate-stdin" option more than a year ago. We stop
advertising it in the "git name-rev -h" output.
* "git push --all" gained an alias "git push --branches".
* "git fetch" learned the "--porcelain" option that emits what it did
in a machine-parseable format.
* "git --attr-source=<tree> cmd $args" is a new way to have any
command to read attributes not from the working tree but from the
given tree object.
Performance, Internal Implementation, Development Support etc.
* Code clean-up to clarify directory traversal API.
* Code clean-up to clarify the rule that "git-compat-util.h" must be
the first to be included.
* More work towards -Wunused.
* Instead of forcing each command to choose to honor GPG related
configuration variables, make the subsystem lazily initialize
itself.
* Remove workaround for ancient versions of DocBook to make it work
correctly with groff, which has not been necessary since docbook
1.76 from 2010.
* Code clean-up to include and/or uninclude parse-options.h file as
needed.
* The code path that reports what "git fetch" did to each ref has
been cleaned up.
* Assorted config API updates.
* A few configuration variables to tell the cURL library that
different types of ssl-cert and ssl-key are in use have been added.
* Split key function and data structure definitions out of cache.h to
new header files and adjust the users.
* "git fetch --all" does not have to download and handle the same
bundleURI over and over, which has been corrected.
* "git sparse-checkout" command learns a debugging aid for the sparse
rule definitions.
* "git write-tree" learns to work better with sparse-index.
* The on-disk reverse index that allows mapping from the pack offset
to the object name for the object stored at the offset has been
enabled by default.
* "git fsck" learned to validate the on-disk pack reverse index files.
* strtok() and strtok_r() are banned in this codebase.
* The detect-compilers script to help auto-tweaking the build system
had trouble working with compilers whose version number has extra
suffixes. The script has been taught that certain suffixes (like
"-win32" in "gcc 10-win32") can be safely stripped as they share
the same features and bugs with the version without the suffix.
* ctype tests have been taught to test EOF, too.
* The implementation of credential helpers used fgets() over fixed
size buffers to read protocol messages, causing the remainder of
the folded long line to trigger unexpected behaviour, which has
been corrected.
* The implementation of the default "negotiator", used to find common
ancestor over the network for object tranfer, used to be recursive;
it was updated to be iterative to conserve stackspace usage.
* Our custom callout formatter is no longer used in the documentation
formatting toolchain, as the upstream default ones give better
output these days.
* The tracing mechanism learned to notice and report when
auto-discovered bare repositories are being used, as allowing so
without explicitly stating the user intends to do so (with setting
GIT_DIR for example) can be used with social engineering as an
attack vector.
* "git diff-files" learned not to expand sparse-index unless needed.
Fixes since v2.40
-----------------
* "git fsck" learned to check the index files in other worktrees,
just like "git gc" honors them as anchoring points.
(merge 8d3e7eac52 jk/fsck-indices-in-worktrees later to maint).
* Fix a segfaulting loop. The function and its caller may need
further clean-up.
(merge c5773dc078 ew/commit-reach-clean-up-flags-fix later to maint).
* "git restore" supports options like "--ours" that are only
meaningful during a conflicted merge, but these options are only
meaningful when updating the working tree files. These options are
marked to be incompatible when both "--staged" and "--worktree" are
in effect.
(merge ee8a88826a ak/restore-both-incompatible-with-conflicts later to maint).
* Simplify UI to control progress meter given by "git bundle" command.
(merge 8b95521edb jk/bundle-progress later to maint).
* "git bundle" learned that "-" is a common way to say that the input
comes from the standard input and/or the output goes to the
standard output. It used to work only for output and only from the
root level of the working tree.
(merge 0bbe10313e jk/bundle-use-dash-for-stdfiles later to maint).
* Once we start running, we assumed that the list of alternate object
databases would never change. Hook into the machinery used to
update the list of packfiles during runtime to update this list as
well.
(merge e2d003dbed ds/reprepare-alternates-when-repreparing-packfiles later to maint).
* The code to parse "git rebase -X<opt>" was not prepared to see an
unparsable option string, which has been corrected.
(merge 15a4cc912e ab/fix-strategy-opts-parsing later to maint).
* "git add -p" while the index is unmerged sometimes failed to parse
the diff output it internally produces and died, which has been
corrected.
(merge 28d1122f9c jk/add-p-unmerged-fix later to maint).
* Fix for a "ls-files --format="%(path)" that produced nonsense
output, which was a bug in 2.38.
(merge cfb62dd006 aj/ls-files-format-fix later to maint).
* "git receive-pack" that responds to "git push" requests failed to
clean a stale lockfile when killed in the middle, which has been
corrected.
(merge c55c30669c ps/receive-pack-unlock-before-die later to maint).
* "git rev-parse --quiet foo@{u}", or anything that asks @{u} to be
parsed with GET_OID_QUIETLY option, did not quietly fail, which has
been corrected.
(merge dfbfdc521d fc/oid-quietly-parse-upstream later to maint).
* Transports that do not support protocol v2 did not correctly fall
back to protocol v0 under certain conditions, which has been
corrected.
(merge eaa0fd6584 jk/fix-proto-downgrade-to-v0 later to maint).
* time(2) on glib 2.31+, especially on Linux, goes out of sync with
higher resolution timers used for gettimeofday(2) and by the
filesystem. Replace all calls to it with a git_time() wrapper and
(merge 370ddcbc89 pe/time-use-gettimeofday later to maint).
* Code clean-up to use designated initializers in parse-options API.
(merge 353e6d4554 sg/parse-options-h-initializers later to maint).
* A recent-ish change to allow unicode character classes to be used
with "grep -P" triggered a JIT bug in older pcre2 libraries.
The problematic change in Git built with these older libraries has
been disabled to work around the bug.
(merge 14b9a04479 mk/workaround-pcre-jit-ucp-bug later to maint).
* The wildmatch library code unlearns exponential behaviour it
acquired some time ago since it was borrowed from rsync.
(merge 3dc0b7f0dc pw/wildmatch-fixes later to maint).
* The index files can become corrupt under certain conditions when
the split-index feature is in use, especially together with
fsmonitor, which have been corrected.
(merge 061dd722dc js/split-index-fixes later to maint).
* Document what the pathname-looking strings in "rev-list --object"
output are for and what they mean.
(merge 15364d2a3c jk/document-rev-list-object-name later to maint).
* Fix unnecessary truncation of generation numbers used in-core.
(merge d3af1c193d ps/ahead-behind-truncation-fix later to maint).
* Code clean-up around the use of the_repository.
(merge 4a93b899c1 ab/remove-implicit-use-of-the-repository later to maint).
* Consistently spell "Message-ID" as such, not "Message-Id".
(merge ba4324c4e1 jc/spell-id-in-both-caps-in-message-id later to maint).
* Correct use of an uninitialized structure member.
(merge dc12ee77ab jx/cap-object-info-uninitialized-fix later to maint).
* Tests had a few places where we ignored PERL_PATH and blindly used
/usr/bin/perl, which have been corrected.
(merge c1917156a0 jk/use-perl-path-consistently later to maint).
* Documentation mark-up fix.
(merge 78b6369e67 la/mfc-markup-fix later to maint).
* Doc toolchain update to remove old workaround for AsciiDoc.
(merge 8806120de6 fc/remove-header-workarounds-for-asciidoc later to maint).
* The userdiff regexp patterns for various filetypes that are built
into the system have been updated to avoid triggering regexp errors
from UTF-8 aware regex engines.
(merge be39144954 rs/userdiff-multibyte-regex later to maint).
* The approxidate() API has been simplified by losing an extra
function that did the same thing as another one.
(merge 8a7f0b666f rs/remove-approxidate-relative later to maint).
* Code clean-up to replace a hardcoded constant with a CPP macro.
(merge c870de6502 rs/get-tar-commit-id-use-defined-const later to maint).
* Doc build simplification.
(merge 9a09ed3229 fc/doc-stop-using-manversion later to maint).
* "git archive" run from a subdirectory mishandled attributes and
paths outside the current directory.
(merge 92b1dd1b9e rs/archive-from-subdirectory-fixes later to maint).
* The code to parse capability list for v0 on-wire protocol fell into
an infinite loop when a capability appears multiple times, which
has been corrected.
* Geometric repacking ("git repack --geometric=<n>") in a repository
that borrows from an alternate object database had various corner
case bugs, which have been corrected.
(merge d85cd18777 ps/fix-geom-repack-with-alternates later to maint).
* The "%GT" placeholder for the "--format" option of "git log" and
friends caused BUG() to trigger on a commit signed with an unknown
key, which has been corrected.
(merge 7891e46585 jk/gpg-trust-level-fix later to maint).
* The completion script used to use bare "read" without the "-r"
option to read the contents of various state files, which risked
getting confused with backslashes in them. This has been
corrected.
(merge 197152098a ek/completion-use-read-r-to-read-literally later to maint).
* A small API fix to the ort merge strategy backend.
(merge 000c4ceca7 en/ort-finalize-after-0-merges-fix later to maint).
* The commit object parser has been taught to be a bit more lenient
to parse timestamps on the author/committer line with a malformed
author/committer ident.
(merge 90ef0f14eb jk/parse-commit-with-malformed-ident later to maint).
* Retitle a test script with an overly narrow name.
(merge 8bb19c14fb ob/t3501-retitle later to maint).
* Doc update to clarify how text and eol attributes interact to
specify the end-of-line conversion.
(merge 6696077ace ah/doc-attributes-text later to maint).
* Gitk updates from GfW project.
(merge 99e70f3077 js/gitk-fixes-from-gfw later to maint).
* "git diff --dirstat" leaked memory, which has been plugged.
(merge 83973981eb jc/dirstat-plug-leaks later to maint).
* "git merge-tree" reads the basic configuration, which can be used
by git forges to disable replace-refs feature.
(merge b6551feadf ds/merge-tree-use-config later to maint).
* A few bugs in the sequencer machinery that results in miscounting
the steps have been corrected.
(merge 170eea9750 js/rebase-count-fixes later to maint).
* Other code cleanup, docfix, build fix, etc.
(merge f7111175df as/doc-markup-fix later to maint).
(merge 90ff7c9898 fc/test-aggregation-clean-up later to maint).
(merge 9b0c7f308a jc/am-doc-refer-to-format-patch later to maint).
(merge b10cbdac4c bb/unicode-width-table-15 later to maint).
(merge 3457b50e8c ab/retire-scripted-add-p later to maint).
(merge d52fcf493b ds/p2000-fix-grep-sparse later to maint).
(merge ec063d2591 ss/hashmap-typofix later to maint).
(merge 1aaed69d11 rs/archive-mtime later to maint).
(merge 2da2cc9b28 ob/rollback-after-commit-lock-failure later to maint).
(merge 54dbd0933b ob/sequencer-save-head-simplify later to maint).
(merge a93cbe8d78 ar/test-cleanup-unused-file-creation later to maint).
(merge cc48ddd937 jk/chainlint-fixes later to maint).
(merge 4833b08426 ow/ref-format-remove-unused-member later to maint).
(merge d0ea2ca1cf dw/doc-submittingpatches-grammofix later to maint).
(merge fd72637423 ar/t2024-checkout-output-fix later to maint).
(merge d45cbe3fe0 ob/sequencer-i18n-fix later to maint).
(merge b734fe49fd ob/messages-capitalize-exception later to maint).
(merge ad353d7e77 ma/gittutorial-fixes later to maint).
(merge a5855fd8d4 ar/test-cleanup-unused-file-creation-part2 later to maint).
(merge 0c5308af30 sd/doc-gitignore-and-rm-cached later to maint).
(merge cbb83daeaf kh/doc-interpret-trailers-updates later to maint).
(merge 3d77fbb664 ar/config-count-tests-updates later to maint).
(merge b7cf25c8f4 jc/t9800-fix-use-of-show-s-raw later to maint).
----------------------------------------------------------------
Changes since v2.40.0 are as follows:
Adam Johnson (1):
ls-files: fix "--format" output of relative paths
Alex Henrie (5):
rebase: add documentation and test for --no-rebase-merges
rebase: deprecate --rebase-merges=""
rebase: add a config option for --rebase-merges
format-patch: correct documentation of --thread without an argument
docs: rewrite the documentation of the text and eol attributes
Alexander Shopov (1):
l10n: bg.po: Updated Bulgarian translation (5515t)
Andreas Schwab (1):
git-merge-tree.txt: replace spurious HTML entity
Andrei Rybak (19):
t1005: assert output of ls-files
t1006: assert error output of cat-file
t1010: don't create unused files
t1302: don't create unused file
t1400: assert output of update-ref
t1404: don't create unused file
t1507: assert output of rev-parse
t3060: fix mention of function prune_index
t2107: fix mention of the_index.cache_changed
t2024: fix loose/strict local base branch DWIM test
t1300: drop duplicate test
t1300: check stderr for "ignores pairs" tests
t1300: add tests for missing keys
t0300: don't create unused file
t1300: fix config file syntax error descriptions
t1300: don't create unused files
t1450: don't create unused files
t1502: don't create unused files
t2019: don't create unused files
Andy Koppe (1):
restore: fault --staged --worktree with merge opts
Arkadii Yakovets (3):
l10n: uk: add initial translation
l10n: uk: remove stale lines
l10n: update uk localization
Bagas Sanjaya (1):
l10n: po-id for 2.41 (round 1)
Beat Bolli (1):
unicode: update the width tables to Unicode 15
Benjamin Jorand (1):
l10n: fr: fix translation of stash save help
Christian Hesse (1):
imap-send: include strbuf.h
Clement Mabileau (1):
branch: improve error log on branch not found by checking remotes refs
Corentin Garcia (1):
doc/git-config: add unit for http.lowSpeedLimit
Daniel Santos (1):
l10n: TEAMS: Update pt_PT repo link
Daniel Watson (1):
SubmittingPatches: clarify MUA discussion with "the"
Derrick Stolee (19):
object-file: reprepare alternates when necessary
for-each-ref: add --stdin option
for-each-ref: explicitly test no matches
commit-graph: refactor compute_topological_levels()
commit-graph: simplify compute_generation_numbers()
commit-graph: return generation from memory
commit-reach: implement ahead_behind() logic
for-each-ref: add ahead-behind format atom
commit-reach: add tips_reachable_from_bases()
p2000: remove stray '--sparse' flag from test
fetch: download bundles once, even with --all
ci: update 'static-analysis' to Ubuntu 22.04
fsck: create scaffolding for rev-index checks
fsck: check rev-index checksums
fsck: check rev-index position values
fsck: validate .rev file header
fsck: verify checksums of all .bitmap files
fsck: use local repository
merge-tree: load default git config
Edwin Kofler (1):
completion: suppress unwanted unescaping of `read`
Elijah Newren (94):
treewide: ensure one of the appropriate headers is sourced first
treewide: remove unnecessary git-compat-util.h includes in headers
treewide: remove unnecessary cache.h includes
treewide: remove unnecessary cache.h includes in source files
alloc.h: move ALLOC_GROW() functions from cache.h
hash.h: move some oid-related declarations from cache.h
hex.h: move some hex-related declarations from cache.h
cache.h: remove dependence on hex.h; make other files include it explicitly
pretty.h: move has_non_ascii() declaration from commit.h
ident.h: move ident-related declarations out of cache.h
object.h: stop depending on cache.h; make cache.h depend on object.h
dir.h: refactor to no longer need to include cache.h
object-store.h: move struct object_info from cache.h
replace-object.h: move read_replace_refs declaration from cache.h to here
treewide: replace cache.h with more direct headers, where possible
Remove unnecessary includes of builtin.h
diff.h: remove unnecessary include of object.h
t2021: fix platform-specific leftover cruft
unpack-trees: heed requests to overwrite ignored files
dir: separate public from internal portion of dir_struct
dir: add a usage note to exclude_per_dir
dir: mark output only fields of dir_struct as such
unpack-trees: clean up some flow control
sparse-checkout: avoid using internal API of unpack-trees
sparse-checkout: avoid using internal API of unpack-trees, take 2
unpack_trees: start splitting internal fields from public API
unpack-trees: mark fields only used internally as internal
unpack-trees: rewrap a few overlong lines from previous patch
unpack-trees: special case read-tree debugging as internal usage
unpack-trees: add usage notices around df_conflict_entry
treewide: remove unnecessary cache.h inclusion from a few headers
treewide: be explicit about dependence on gettext.h
treewide: remove unnecessary inclusion of gettext.h
treewide: remove unnecessary cache.h inclusion from several sources
environment: move comment_line_char from cache.h
abspath.h: move absolute path functions from cache.h
cache.h: remove expand_user_path()
path.h: move function declarations for path.c functions from cache.h
wrapper.h: move declarations for wrapper.c functions from cache.h
treewide: remove unnecessary includes of cache.h
environment.h: move declarations for environment.c functions from cache.h
treewide: remove cache.h inclusion due to environment.h changes
setup.h: move declarations for setup.c functions from cache.h
treewide: remove cache.h inclusion due to setup.h changes
write-or-die.h: move declarations for write-or-die.c functions from cache.h
csum-file.h: remove unnecessary inclusion of cache.h
treewide: be explicit about dependence on trace.h & trace2.h
treewide: be explicit about dependence on advice.h
treewide: be explicit about dependence on convert.h
treewide: be explicit about dependence on pack-revindex.h
treewide: be explicit about dependence on oid-array.h
treewide: be explicit about dependence on mem-pool.h
treewide: remove unnecessary cache.h inclusion
object-name.h: move declarations for object-name.c functions from cache.h
treewide: remove cache.h inclusion due to object-name.h changes
git-zlib: move declarations for git-zlib functions from cache.h
treewide: remove cache.h inclusion due to git-zlib changes
object-file.h: move declarations for object-file.c functions from cache.h
treewide: remove cache.h inclusion due to object-file.h changes
object.h: move some inline functions and defines from cache.h
treewide: remove cache.h inclusion due to object.h changes
editor: move editor-related functions and declarations into common file
treewide: remove cache.h inclusion due to editor.h changes
pager.h: move declarations for pager.c functions from cache.h
treewide: remove cache.h inclusion due to pager.h changes
cache.h: remove unnecessary includes
treewide: remove double forward declaration of read_in_full
treewide: reduce includes of cache.h in other headers
mailmap, quote: move declarations of global vars to correct unit
protocol.h: move definition of DEFAULT_GIT_PORT from cache.h
treewide: be explicit about dependence on strbuf.h
symlinks.h: move declarations for symlinks.c functions from cache.h
packfile.h: move pack_window and pack_entry from cache.h
server-info.h: move declarations for server-info.c functions from cache.h
copy.h: move declarations for copy.c functions from cache.h
base85.h: move declarations for base85.c functions from cache.h
pkt-line.h: move declarations for pkt-line.c functions from cache.h
match-trees.h: move declarations for match-trees.c functions from cache.h
ws.h: move declarations for ws.c functions from cache.h
versioncmp.h: move declarations for versioncmp.c functions from cache.h
dir.h: move DTYPE defines from cache.h
tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
hash-ll.h: split out of hash.h to remove dependency on repository.h
cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
cache,tree: move basic name compare functions from read-cache to tree
treewide: remove cache.h inclusion due to previous changes
cache.h: remove unnecessary headers
fsmonitor: reduce includes of cache.h
commit.h: reduce unnecessary includes
object-store.h: reduce unnecessary includes
diff.h: reduce unnecessary includes
reftable: ensure git-compat-util.h is the first (indirect) include
merge-ort: fix calling merge_finalize() with no intermediate merge
t5583: fix shebang line
Emily Shaffer (1):
mailmap: change primary address for Emily Shaffer
Emir SARI (1):
l10n: tr: Update Turkish translations for 2.41.0
Eric Sunshine (1):
tests: diagnose unclosed here-doc in chainlint.pl
Eric Wong (3):
commit-reach: avoid NULL dereference
fetch: support hideRefs to speed up connectivity checks
fetch: pass --no-write-fetch-head to subprocesses
Fangyi Zhou (1):
rebase: fix capitalisation autoSquash in i18n string
Felipe Contreras (16):
advice: add diverging advice for novices
test: simplify counts aggregation
test: don't print aggregate-results command
object-name: fix quiet @{u} parsing
completion: prompt: use generic colors
doc: remove GNU troff workaround
doc: remove manpage-base-url workaround
doc: asciidoc: remove custom header macro
doc: simplify man version
doc: set actual revdate for manpages
doc: git-checkout: trivial callout cleanup
doc: git-checkout: reorganize examples
doc: remove custom callouts format
doc: manpage: remove maximum title length
doc: doc-diff: specify date
test: rev-parse-upstream: add missing cmp
Glen Choo (10):
config.c: plumb config_source through static fns
config.c: don't assign to "cf_global" directly
config.c: create config_reader and the_reader
config.c: plumb the_reader through callbacks
config.c: remove current_config_kvi
config.c: remove current_parsing_scope
config: report cached filenames in die_bad_number()
config.c: rename "struct config_source cf"
clone: error specifically with --local and symlinked objects
setup: trace bare repository setups
Han Xin (2):
negotiator/default: avoid stack overflow
negotiator/skipping: fix some problems in mark_common()
Jacob Keller (2):
blame: allow --contents to work with non-HEAD commit
blame: use different author name for fake commit generated by --contents
Jean-Noël Avila (2):
l10n: fr.po v2.41.0 rnd1
l10n: fr.po v2.41.0 rnd2
Jeff King (90):
ref-filter: drop unused atom parameter from get_worktree_path()
ls-refs: drop config caching
serve: use repository pointer to get config
serve: mark unused parameters in virtual functions
object-name: mark unused parameters in disambiguate callbacks
http-backend: mark argc/argv unused
http-backend: mark unused parameters in virtual functions
ref-filter: mark unused callback parameters
mark "pointless" data pointers in callbacks
run-command: mark error routine parameters as unused
mark unused parameters in signal handlers
list-objects: mark unused callback parameters
for_each_object: mark unused callback parameters
prio-queue: mark unused parameters in comparison functions
notes: mark unused callback parameters
fetch-pack: mark unused parameter in callback function
rewrite_parents(): mark unused callback parameter
for_each_commit_graft(): mark unused callback parameter
userformat_want_item(): mark unused parameter
run_processes_parallel: mark unused callback parameters
help: mark unused parameter in git_unknown_cmd_config()
fsck: factor out index fsck
fsck: check index files in all worktrees
fsck: mention file path for index errors
fsck: check even zero-entry index files
drop pure pass-through config callbacks
bundle: turn on --all-progress-implied by default
bundle: let "-" mean stdin for reading operations
bundle: document handling of "-" as stdin
parse-options: consistently allocate memory in fix_filename()
parse-options: use prefix_filename_except_for_dash() helper
diff: factor out src/dst prefix setup
t4013: add tests for diff prefix options
diff: add --default-prefix option
format-patch: do not respect diff.noprefix
format-patch: add format.noprefix option
add-patch: handle "* Unmerged path" lines
http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
range-diff: drop useless "offset" variable from read_patches()
http: support CURLOPT_PROTOCOLS_STR
range-diff: handle unterminated lines in read_patches()
range-diff: use ssize_t for parsed "len" in read_patches()
rebase: prefer --default-prefix to --{src,dst}-prefix for format-patch
mailmap: drop debugging code
http: drop unused parameter from start_object_request()
http: mark unused parameter in fill_active_slot() callbacks
transport: mark unused parameters in fetch_refs_from_bundle()
git_connect(): fix corner cases in downgrading v2 to v0
fast-export: drop const when storing anonymized values
fast-export: simplify initialization of anonymized hashmaps
fast-export: factor out anonymized_entry creation
fast-export: de-obfuscate --anonymize-map handling
fast-export: drop data parameter from anonymous generators
fast-export: drop unused parameter from anonymize_commit_message()
Makefile: force -O0 when compiling with SANITIZE=leak
pack-redundant: escalate deprecation warning to an error
docs: document caveats of rev-list's object-name output
fast-import: fix file access when run from subdir
builtins: always pass prefix to parse_options()
builtins: annotate always-empty prefix parameters
builtins: mark unused prefix parameters
mark "argv" as unused when we check argc
t/helper: mark unused argv/argc arguments
parse-options: drop parse_opt_unknown_cb()
pack-redundant: document deprecation
tests: run internal chain-linter under "make test"
tests: replace chainlint subshell with a function
tests: drop here-doc check from internal chain-linter
tests: skip test_eval_ in internal chain-lint
t/lib-httpd: pass PERL_PATH to CGI scripts
v0 protocol: fix infinite loop when parsing multi-valued capabilities
t5512: stop referring to "v1" protocol
v0 protocol: fix sha1/sha256 confusion for capabilities^{}
t5512: add v2 support for "ls-remote --symref" test
t5512: allow any protocol version for filtered symref test
t5512: test "ls-remote --heads --symref" filtering with v0 and v2
v0 protocol: use size_t for capability length/offset
gpg-interface: set trust level of missing key to "undefined"
notes: clean up confusing NULL checks in init_notes()
fetch_bundle_uri(): drop pointless NULL check
t4212: avoid putting git on left-hand side of pipe
parse_commit(): parse timestamp from end of line
parse_commit(): handle broken whitespace-only timestamp
parse_commit(): describe more date-parsing failure modes
doc-diff: drop SOURCE_DATE_EPOCH override
t7001: avoid git on upstream of pipe
t7001: use "ls-files --format" instead of "cut"
t: drop "verbose" helper function
t/lib-httpd: make CGIPassAuth support conditional
Jiang Xin (5):
github-actions: run gcc-8 on ubuntu-20.04 image
ci: remove the pipe after "p4 -V" to catch errors
ci: use the same version of p4 on both Linux and macOS
ci: install python on ubuntu
object-info: init request_info before reading arg
Johannes Schindelin (31):
compat/win32/syslog: fix use-after-realloc
nedmalloc: avoid new compile error
t0033: GETTEXT_POISON fix
t0003: GETTEXT_POISON fix, part 1
t0003: GETTEXT_POISON fix, conclusion
t5619: GETTEXT_POISON fix
t5604: GETTEXT_POISON fix, part 1
t5604: GETTEXT_POISON fix, conclusion
clone.c: avoid "exceeds maximum object size" error with GCC v12.x
split-index & fsmonitor: demonstrate a bug
split-index; stop abusing the `base_oid` to strip the "link" extension
fsmonitor: avoid overriding `cache_changed` bits
unpack-trees: take care to propagate the split-index flag
t3701: we don't need no Perl for `add -i` anymore
t5563: prevent "ambiguous redirect"
apply --reject: overwrite existing `.rej` symlink if it exists
gettext: avoid using gettext if the locale dir is not present
tests: avoid using `test_i18ncmp`
Git 2.31.8
Git 2.32.7
Git 2.33.8
Git 2.34.8
Git 2.35.8
Git 2.36.6
Git 2.37.7
Git 2.38.5
Git 2.39.3
Git 2.40.1
gitk: prevent overly long command lines
rebase --update-refs: fix loops
rebase -r: fix the total number shown in the progress
John Cai (2):
name-rev: make --stdin hidden
attr: teach "--attr-source=<tree>" global option to "git"
John Keeping (1):
format-patch: output header for empty commits
Jordi Mas (2):
l10n: Update Catalan translation
l10n: Update Catalan translation
Josh Soref (1):
subtree: support long global flags
Jouke Witteveen (1):
send-email docs: Remove mention of discontinued gmail feature
Junio C Hamano (39):
gpg-interface: lazily initialize and read the configuration
bundle: don't blindly apply prefix_filename() to "-"
Start the 2.41 cycle
The second batch
am: refer to format-patch in the documentation
The third batch
http.c: clear the 'finished' member once we are done with it
The fourth batch
The fifth batch
The sixth batch
e-mail workflow: Message-ID is spelled with ID in both capital letters
The seventh batch
clone: propagate object-format when cloning from void
The eighth batch
The ninth batch
The tenth batch
The eleventh batch
The twelfth batch
The thirteenth batch
doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
The fourteenth batch
The fifteenth batch
The sixteenth batch
diff: refactor common tail part of dirstat computation
diff: plug leaks in dirstat
t9800: correct misuse of 'show -s --raw' in a test
The seventeenth batch
The eighteenth batch
Git 2.41-rc0
tests: do not negate test_path_exists
t2021: do not negate test_path_is_dir
test: do not negate test_path_is_* to assert absense
A bit more before -rc1
send-email: clear the $message_id after validation
t9001: mark the script as no longer leak checker clean
Git 2.41-rc1
A few more topics after 2.41-rc1
Git 2.41-rc2
Git 2.41
Kristoffer Haugsbakk (5):
config: tell the user that we expect an ASCII character
doc: interpret-trailers: don’t use heredoc in examples
doc: interpret-trailers: use input redirection
doc: interpret-trailers: don’t use deprecated config
doc: interpret-trailers: fix example
Linus Arver (1):
MyFirstContribution: render literal *
M Hickford (3):
credential/wincred: include wincred.h
credential/wincred: store password_expiry_utc
credential: new attribute oauth_refresh_token
Martin Ågren (2):
gittutorial: drop early mention of origin
gittutorial: wrap literal examples in backticks
Mathias Krause (1):
grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34
Matthew John Cheetham (3):
t5563: add tests for basic and anoymous HTTP access
http: read HTTP WWW-Authenticate response headers
credential: add WWW-Authenticate header to cred requests
Maxim Cournoyer (3):
send-email: extract execute_cmd from recipients_cmd
send-email: add --header-cmd, --no-header-cmd options
send-email: detect empty blank lines in command output
Michael J Gruber (1):
t3070: make chain lint tester happy
Michael Strawbridge (2):
send-email: refactor header generation functions
send-email: expose header information to git-send-email's sendemail-validate hook
Mike Hommey (1):
Handle some compiler versions containing a dash
Nico Rieck (1):
gitk: escape file paths before piping to git log
Oswald Buddenhagen (5):
sequencer: remove pointless rollback_lock_file()
sequencer: rewrite save_head() in terms of write_message()
sequencer: actually translate report in do_exec()
messages: capitalization and punctuation exceptions
t/t3501-revert-cherry-pick.sh: clarify scope of the file
Patrick Steinhardt (27):
receive-pack: fix stale packfile locks when dying
fetch: move reference width calculation into `display_state`
fetch: move output format into `display_state`
fetch: pass the full local reference name to `format_display`
fetch: centralize handling of per-reference format
fetch: centralize logic to print remote URL
fetch: centralize printing of reference updates
commit-graph: fix truncated generation numbers
midx: fix segfault with no packs and invalid preferred pack
repack: fix trying to use preferred pack in alternates
repack: fix generating multi-pack-index with only non-local packs
pack-objects: split out `--stdin-packs` tests into separate file
pack-objects: fix error when packing same pack twice
pack-objects: fix error when same packfile is included and excluded
pack-objects: extend test coverage of `--stdin-packs` with alternates
t/helper: allow chmtime to print verbosely without modifying mtime
repack: honor `-l` when calculating pack geometry
repack: disable writing bitmaps when doing a local repack
fetch: fix `--no-recurse-submodules` with multi-remote fetches
fetch: split out tests for output format
fetch: add a test to exercise invalid output formats
fetch: print left-hand side when fetching HEAD:foo
fetch: refactor calculation of the display table width
fetch: introduce `display_format` enum
fetch: lift up parsing of "fetch.output" config variable
fetch: move option related variables into main function
fetch: introduce machine-parseable "porcelain" output format
Paul Eggert (1):
git-compat-util: use gettimeofday(2) for time(2)
Peter Krefting (1):
l10n: sv.po: Update Swedish translation (5515t0f0u)
Phillip Wood (8):
wildmatch: fix exponential behavior
wildmatch: avoid undefined behavior
wildmatch: hide internal return values
rebase: stop reading and writing unnecessary strategy state
sequencer: use struct strvec to store merge strategy options
rebase -m: cleanup --strategy-option handling
rebase -m: fix serialization of strategy options
rebase: remove a couple of redundant strategy tests
Raghul Nanth A (1):
describe: enable sparse index for describe
Ralf Thielow (1):
l10n: Update German translation
René Scharfe (6):
archive: improve support for running in subdirectory
t5000: use check_mtime()
userdiff: support regexec(3) with multi-byte support
date: remove approxidate_relative()
get-tar-commit-id: use TYPEFLAG_GLOBAL_HEADER instead of magic value
test-ctype: check EOF
Robin Jarry (1):
send-email: export patch counters in validate environment
Rubén Justo (10):
bisect: fix "reset" when branch is checked out elsewhere
worktree: introduce is_shared_symref()
branch: fix die_if_checked_out() when ignore_current_worktree
rebase: refuse to switch to a branch already checked out elsewhere (test)
switch: reject if the branch is already checked out elsewhere (test)
branch: test for failures while renaming branches
branch: use get_worktrees() in copy_or_rename_branch()
branch: description for orphan branch errors
branch: rename orphan branches in any worktree
branch: avoid unnecessary worktrees traversals
SZEDER Gábor (6):
treewide: include parse-options.h in source files
treewide: remove unnecessary inclusions of parse-options.h from headers
parse-options.h: use consistent name for the callback parameters
parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters
parse-options.h: use designated initializers in OPT_* macros
cocci: remove 'unused.cocci'
Shuqi Liang (4):
write-tree: integrate with sparse index
t1092: update a write-tree test
t1092: add tests for `git diff-files`
diff-files: integrate with sparse index
Siddharth Singh (1):
hashmap.h: fix minor typo
Sohom Datta (1):
docs: clarify git rm --cached function in gitignore note
Stanislav Malishevskiy (1):
http: add support for different sslcert and sslkey types.
Tao Klerks (1):
mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
Taylor Blau (37):
commit-graph: introduce `ensure_generations_valid()`
pack-write.c: plug a leak in stage_tmp_packfiles()
t5325: mark as leak-free
pack-revindex: make `load_pack_revindex` take a repository
pack-revindex: introduce GIT_TEST_REV_INDEX_DIE_ON_DISK
pack-revindex: introduce `pack.readReverseIndex`
config: enable `pack.writeReverseIndex` by default
t: invert `GIT_TEST_WRITE_REV_INDEX`
t1300: demonstrate failure when renaming sections with long lines
config: avoid fixed-sized buffer when renaming/deleting a section
config.c: avoid integer truncation in `copy_or_rename_section_in_file()`
config.c: disallow overly-long lines in `copy_or_rename_section_in_file()`
Git 2.30.9
pack-write.c: plug a leak in stage_tmp_packfiles()
builtin/repack.c: fix incorrect reference to '-C'
builtin/gc.c: ignore cruft packs with `--keep-largest-pack`
t/t5304-prune.sh: prepare for `gc --cruft` by default
t/t6501-freshen-objects.sh: prepare for `gc --cruft` by default
t/t6500-gc.sh: refactor cruft pack tests
t/t6500-gc.sh: add additional test cases
t/t9300-fast-import.sh: prepare for `gc --cruft` by default
builtin/gc.c: make `gc.cruftPacks` enabled by default
repository.h: drop unused `gc_cruft_packs`
string-list: multi-delimiter `string_list_split_in_place()`
string-list: introduce `string_list_setlen()`
t/helper/test-hashmap.c: avoid using `strtok()`
t/helper/test-oidmap.c: avoid using `strtok()`
t/helper/test-json-writer.c: avoid using `strtok()`
banned.h: mark `strtok()` and `strtok_r()` as banned
credential.c: store "wwwauth[]" values in `credential_read()`
t/lib-credential.sh: ensure credential helpers handle long headers
contrib/credential: avoid fixed-size buffer in osxkeychain
contrib/credential: remove 'gnome-keyring' credential helper
contrib/credential: .gitignore libsecret build artifacts
contrib/credential: avoid fixed-size buffer in libsecret
contrib/credential: embiggen fixed-size buffer in wincred
run-command.c: fix missing include under `NO_PTHREADS`
Teng Long (2):
push: introduce '--branches' option
l10n: zh_CN: Git 2.41.0 round #1
William Sprent (2):
builtin/sparse-checkout: remove NEED_WORK_TREE flag
builtin/sparse-checkout: add check-rules command
Yi-Jyun Pan (1):
l10n: zh_TW.po: Git 2.41.0
ZheNing Hu (2):
receive-pack: fix funny ref error messsage
push: allow delete single-level ref
brian m. carlson (1):
upload-pack: advertise capabilities when cloning empty repos
Ævar Arnfjörð Bjarmason (33):
auto-crlf tests: don't lose exit code in loops and outside tests
t/lib-patch-mode.sh: fix ignored exit codes
tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
tests: don't lose "git" exit codes in "! ( git ... | grep )"
tests: don't lose exit status with "test <op> $(git ...)"
tests: don't lose misc "git" exit codes
sequencer.c: fix overflow & segfault in parse_strategy_opts()
cocci: remove dead rule from "the_repository.pending.cocci"
cocci: fix incorrect & verbose "the_repository" rules
cocci: sort "the_repository" rules by header
cocci: add missing "the_repository" macros to "pending"
cocci: apply the "cache.h" part of "the_repository.pending"
cocci: apply the "commit-reach.h" part of "the_repository.pending"
cocci: apply the "commit.h" part of "the_repository.pending"
cocci: apply the "diff.h" part of "the_repository.pending"
cocci: apply the "object-store.h" part of "the_repository.pending"
cocci: apply the "pretty.h" part of "the_repository.pending"
cocci: apply the "packfile.h" part of "the_repository.pending"
cocci: apply the "promisor-remote.h" part of "the_repository.pending"
cocci: apply the "refs.h" part of "the_repository.pending"
cocci: apply the "rerere.h" part of "the_repository.pending"
cocci: apply the "revision.h" part of "the_repository.pending"
post-cocci: adjust comments for recent repo_* migration
libs: use "struct repository *" argument, not "the_repository"
config tests: cover blind spots in git_die_config() tests
config tests: add "NULL" tests for *_get_value_multi()
config API: add and use a "git_config_get()" family of functions
versioncmp.c: refactor config reading next commit
config API: have *_multi() return an "int" and take a "dest"
for-each-repo: error on bad --config
config API users: test for *_get_value_multi() segfaults
config API: add "string" version of *_value_multi(), fix segfaults
for-each-repo: with bad config, don't conflate <path> and <cmd>
Øystein Walle (2):
ref-filter: remove unused ref_format member
branch, for-each-ref, tag: add option to omit empty lines
^ permalink raw reply [relevance 1%]
* [ANNOUNCE] Git v2.41.0-rc2
@ 2023-05-24 21:41 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2023-05-24 21:41 UTC (permalink / raw)
To: git; +Cc: Linux Kernel, git-packagers
A release candidate Git v2.41.0-rc2 is now available for testing at
the usual places. It is comprised of 525 non-merge commits since
v2.40.0, contributed by 80 people, 25 of which are new faces [*].
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.41.0-rc2' tag and the 'master' branch that the tag points at:
url = https://git.kernel.org/pub/scm/git/git
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.40.0 are as follows.
Welcome to the Git development community!
Adam Johnson, André Baptista, Andy Koppe, Clement Mabileau,
Corentin Garcia, Cristian Le, Daniel Watson, D. Ben Knoble,
Douglas Anderson, Edwin Kofler, Jonas Haag, Jouke Witteveen,
Matthias Görgens, Maxim Cournoyer, Michael Henry, Michael
Strawbridge, Nico Rieck, Raghul Nanth A, Rolf Eike Beer, Shuqi
Liang, Siddharth Singh, Stanislav Malishevskiy, Stephane Odul,
Vítor Pinho, and Xin Xing.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Ævar Arnfjörð Bjarmason, Alex Henrie, Andreas Schwab,
Andrei Rybak, Beat Bolli, brian m. carlson, Christian Hesse,
Derrick Stolee, Elijah Newren, Emily Shaffer, Eric Sunshine,
Eric Wong, Fangyi Zhou, Felipe Contreras, Glen Choo, Han Xin,
Jacob Keller, Jeff King, Jiang Xin, Joakim Petersen, Johannes
Schindelin, Johannes Sixt, John Cai, John Keeping, Josh Soref,
Junio C Hamano, Kristoffer Haugsbakk, Linus Arver, Linus
Torvalds, Martin Ågren, Mathias Krause, Matthew John Cheetham,
M Hickford, Michael J Gruber, Mike Hommey, Oswald Buddenhagen,
Øystein Walle, Patrick Steinhardt, Paul Eggert, Philippe Blain,
Phillip Wood, Randall S. Becker, René Scharfe, Robin Jarry,
Rubén Justo, RyotaK, Sohom Datta, SZEDER Gábor, Tao Klerks,
Taylor Blau, Teng Long, Todd Zullinger, Torsten Bögershausen,
William Sprent, and ZheNing Hu.
[*] We are counting not just the authorship contribution but issue
reporting, mentoring, helping and reviewing that are recorded in
the commit trailers.
----------------------------------------------------------------
Git v2.41 Release Notes (draft)
===============================
UI, Workflows & Features
* Allow information carried on the WWW-Authenticate header to be
passed to the credential helpers.
* A new "fetch.hideRefs" option can be used to exclude specified refs
from "rev-list --objects --stdin --not --all" traversal for
checking object connectivity, most useful when there are many
unrelated histories in a single repository.
* "git push" has been taught to allow deletion of refs with one-level
names to help repairing a repository who acquired such a ref by
mistake. In general, we don't encourage use of such a ref, and
creation or update to such a ref is rejected as before.
* Allow "git bisect reset" to check out the original branch when the
branch is already checked out in a different worktree linked to the
same repository.
* A few subcommands have been taught to stop users from working on a
branch that is being used in another worktree linked to the same
repository.
* "git format-patch" learned to write a log-message only output file
for empty commits.
* "git format-patch" honors the src/dst prefixes set to nonstandard
values with configuration variables like "diff.noprefix", causing
receiving end of the patch that expects the standard -p1 format to
break. "format-patch" has been taught to ignore end-user configuration
and always use the standard prefixes.
This is a backward compatibility breaking change.
* Lift the limitation that colored prompts can only be used with
PROMPT_COMMAND mode.
* "git blame --contents=<file> <rev> -- <path>" used to be forbidden,
but now it finds the origins of lines starting at <file> contents
through the history that leads to <rev>.
* "git pack-redundant" gave a warning when run, as the command has
outlived its usefulness long ago and is nominated for future
removal. Now we escalate to give an error.
* "git clone" from an empty repository learned to propagate the
choice of the hash algorithm from the source repository to the
newly created repository over any one of the v0/v1/v2 protocol.
* "git mergetool" and "git difftool" learns a new configuration
guiDefault to optionally favor configured guitool over non-gui-tool
automatically when $DISPLAY is set.
* "git branch -d origin/master" would say "no such branch", but it is
likely a missed "-r" if refs/remotes/origin/master exists. The
command has been taught to give such a hint in its error message.
* Clean-up of the code path that deals with merge strategy option
handling in "git rebase".
* "git clone --local" stops copying from an original repository that
has symbolic links inside its $GIT_DIR; an error message when that
happens has been updated.
* The "--format=..." option of "git for-each-ref", "git branch", and
"git tag" commands learn "--omit-empty" to hide refs whose
formatting results in an empty string from the output.
* The sendemail-validate validate hook learned to pass the total
number of input files and where in the sequence each invocation is
via environment variables.
* When "gc" needs to retain unreachable objects, packing them into
cruft packs (instead of exploding them into loose object files) has
been offered as a more efficient option for some time. Now the use
of cruft packs has been made the default and no longer considered
an experimental feature.
* The output given by "git blame" that attributes a line to contents
taken from the file specified by the "--contents" option shows it
differently from a line attributed to the working tree file.
* "git send-email" learned to give the e-mail headers to the validate
hook by passing an extra argument from the command line.
* The credential subsystem learns to help OAuth framework.
* The titles of manual pages used to be chomped at an unreasonably
short limit, which has been removed.
* Error messages given when working on an unborn branch that is
checked out in another worktree have been improved.
* The documentation was misleading about the interaction between
GIT_DEFAULT_HASH and "git clone", which has been clarified to
stress that the variable is to be ignored by the command.
* "git send-email" learned "--header-cmd=<cmd>" that can inject
arbitrary e-mail header lines to the outgoing messages.
* "git fsck" learned to detect bit-flip breakages in the reachability
bitmap files.
* The "--stdin" option of "git name-rev" has been replaced with
the "--annotate-stdin" option more than a year ago. We stop
advertising it in the "git name-rev -h" output.
* "git push --all" gained an alias "git push --branches".
* "git fetch" learned the "--porcelain" option that emits what it did
in a machine-parseable format.
* "git --attr-source=<tree> cmd $args" is a new way to have any
command to read attributes not from the working tree but from the
given tree object.
Performance, Internal Implementation, Development Support etc.
* Code clean-up to clarify directory traversal API.
* Code clean-up to clarify the rule that "git-compat-util.h" must be
the first to be included.
* More work towards -Wunused.
* Instead of forcing each command to choose to honor GPG related
configuration variables, make the subsystem lazily initialize
itself.
* Remove workaround for ancient versions of DocBook to make it work
correctly with groff, which has not been necessary since docbook
1.76 from 2010.
* Code clean-up to include and/or uninclude parse-options.h file as
needed.
* The code path that reports what "git fetch" did to each ref has
been cleaned up.
* Assorted config API updates.
* A few configuration variables to tell the cURL library that
different types of ssl-cert and ssl-key are in use have been added.
* Split key function and data structure definitions out of cache.h to
new header files and adjust the users.
* "git fetch --all" does not have to download and handle the same
bundleURI over and over, which has been corrected.
* "git sparse-checkout" command learns a debugging aid for the sparse
rule definitions.
* "git write-tree" learns to work better with sparse-index.
* The on-disk reverse index that allows mapping from the pack offset
to the object name for the object stored at the offset has been
enabled by default.
* "git fsck" learned to validate the on-disk pack reverse index files.
* strtok() and strtok_r() are banned in this codebase.
* The detect-compilers script to help auto-tweaking the build system
had trouble working with compilers whose version number has extra
suffixes. The script has been taught that certain suffixes (like
"-win32" in "gcc 10-win32") can be safely stripped as they share
the same features and bugs with the version without the suffix.
* ctype tests have been taught to test EOF, too.
* The implementation of credential helpers used fgets() over fixed
size buffers to read protocol messages, causing the remainder of
the folded long line to trigger unexpected behaviour, which has
been corrected.
* The implementation of the default "negotiator", used to find common
ancestor over the network for object tranfer, used to be recursive;
it was updated to be iterative to conserve stackspace usage.
* Our custom callout formatter is no longer used in the documentation
formatting toolchain, as the upstream default ones give better
output these days.
* The tracing mechanism learned to notice and report when
auto-discovered bare repositories are being used, as allowing so
without explicitly stating the user intends to do so (with setting
GIT_DIR for example) can be used with social engineering as an
attack vector.
* "git diff-files" learned not to expand sparse-index unless needed.
Fixes since v2.40
-----------------
* "git fsck" learned to check the index files in other worktrees,
just like "git gc" honors them as anchoring points.
(merge 8d3e7eac52 jk/fsck-indices-in-worktrees later to maint).
* Fix a segfaulting loop. The function and its caller may need
further clean-up.
(merge c5773dc078 ew/commit-reach-clean-up-flags-fix later to maint).
* "git restore" supports options like "--ours" that are only
meaningful during a conflicted merge, but these options are only
meaningful when updating the working tree files. These options are
marked to be incompatible when both "--staged" and "--worktree" are
in effect.
(merge ee8a88826a ak/restore-both-incompatible-with-conflicts later to maint).
* Simplify UI to control progress meter given by "git bundle" command.
(merge 8b95521edb jk/bundle-progress later to maint).
* "git bundle" learned that "-" is a common way to say that the input
comes from the standard input and/or the output goes to the
standard output. It used to work only for output and only from the
root level of the working tree.
(merge 0bbe10313e jk/bundle-use-dash-for-stdfiles later to maint).
* Once we start running, we assumed that the list of alternate object
databases would never change. Hook into the machinery used to
update the list of packfiles during runtime to update this list as
well.
(merge e2d003dbed ds/reprepare-alternates-when-repreparing-packfiles later to maint).
* The code to parse "git rebase -X<opt>" was not prepared to see an
unparsable option string, which has been corrected.
(merge 15a4cc912e ab/fix-strategy-opts-parsing later to maint).
* "git add -p" while the index is unmerged sometimes failed to parse
the diff output it internally produces and died, which has been
corrected.
(merge 28d1122f9c jk/add-p-unmerged-fix later to maint).
* Fix for a "ls-files --format="%(path)" that produced nonsense
output, which was a bug in 2.38.
(merge cfb62dd006 aj/ls-files-format-fix later to maint).
* "git receive-pack" that responds to "git push" requests failed to
clean a stale lockfile when killed in the middle, which has been
corrected.
(merge c55c30669c ps/receive-pack-unlock-before-die later to maint).
* "git rev-parse --quiet foo@{u}", or anything that asks @{u} to be
parsed with GET_OID_QUIETLY option, did not quietly fail, which has
been corrected.
(merge dfbfdc521d fc/oid-quietly-parse-upstream later to maint).
* Transports that do not support protocol v2 did not correctly fall
back to protocol v0 under certain conditions, which has been
corrected.
(merge eaa0fd6584 jk/fix-proto-downgrade-to-v0 later to maint).
* time(2) on glib 2.31+, especially on Linux, goes out of sync with
higher resolution timers used for gettimeofday(2) and by the
filesystem. Replace all calls to it with a git_time() wrapper and
(merge 370ddcbc89 pe/time-use-gettimeofday later to maint).
* Code clean-up to use designated initializers in parse-options API.
(merge 353e6d4554 sg/parse-options-h-initializers later to maint).
* A recent-ish change to allow unicode character classes to be used
with "grep -P" triggered a JIT bug in older pcre2 libraries.
The problematic change in Git built with these older libraries has
been disabled to work around the bug.
(merge 14b9a04479 mk/workaround-pcre-jit-ucp-bug later to maint).
* The wildmatch library code unlearns exponential behaviour it
acquired some time ago since it was borrowed from rsync.
(merge 3dc0b7f0dc pw/wildmatch-fixes later to maint).
* The index files can become corrupt under certain conditions when
the split-index feature is in use, especially together with
fsmonitor, which have been corrected.
(merge 061dd722dc js/split-index-fixes later to maint).
* Document what the pathname-looking strings in "rev-list --object"
output are for and what they mean.
(merge 15364d2a3c jk/document-rev-list-object-name later to maint).
* Fix unnecessary truncation of generation numbers used in-core.
(merge d3af1c193d ps/ahead-behind-truncation-fix later to maint).
* Code clean-up around the use of the_repository.
(merge 4a93b899c1 ab/remove-implicit-use-of-the-repository later to maint).
* Consistently spell "Message-ID" as such, not "Message-Id".
(merge ba4324c4e1 jc/spell-id-in-both-caps-in-message-id later to maint).
* Correct use of an uninitialized structure member.
(merge dc12ee77ab jx/cap-object-info-uninitialized-fix later to maint).
* Tests had a few places where we ignored PERL_PATH and blindly used
/usr/bin/perl, which have been corrected.
(merge c1917156a0 jk/use-perl-path-consistently later to maint).
* Documentation mark-up fix.
(merge 78b6369e67 la/mfc-markup-fix later to maint).
* Doc toolchain update to remove old workaround for AsciiDoc.
(merge 8806120de6 fc/remove-header-workarounds-for-asciidoc later to maint).
* The userdiff regexp patterns for various filetypes that are built
into the system have been updated to avoid triggering regexp errors
from UTF-8 aware regex engines.
(merge be39144954 rs/userdiff-multibyte-regex later to maint).
* The approxidate() API has been simplified by losing an extra
function that did the same thing as another one.
(merge 8a7f0b666f rs/remove-approxidate-relative later to maint).
* Code clean-up to replace a hardcoded constant with a CPP macro.
(merge c870de6502 rs/get-tar-commit-id-use-defined-const later to maint).
* Doc build simplification.
(merge 9a09ed3229 fc/doc-stop-using-manversion later to maint).
* "git archive" run from a subdirectory mishandled attributes and
paths outside the current directory.
(merge 92b1dd1b9e rs/archive-from-subdirectory-fixes later to maint).
* The code to parse capability list for v0 on-wire protocol fell into
an infinite loop when a capability appears multiple times, which
has been corrected.
* Geometric repacking ("git repack --geometric=<n>") in a repository
that borrows from an alternate object database had various corner
case bugs, which have been corrected.
(merge d85cd18777 ps/fix-geom-repack-with-alternates later to maint).
* The "%GT" placeholder for the "--format" option of "git log" and
friends caused BUG() to trigger on a commit signed with an unknown
key, which has been corrected.
(merge 7891e46585 jk/gpg-trust-level-fix later to maint).
* The completion script used to use bare "read" without the "-r"
option to read the contents of various state files, which risked
getting confused with backslashes in them. This has been
corrected.
(merge 197152098a ek/completion-use-read-r-to-read-literally later to maint).
* A small API fix to the ort merge strategy backend.
(merge 000c4ceca7 en/ort-finalize-after-0-merges-fix later to maint).
* The commit object parser has been taught to be a bit more lenient
to parse timestamps on the author/committer line with a malformed
author/committer ident.
(merge 90ef0f14eb jk/parse-commit-with-malformed-ident later to maint).
* Retitle a test script with an overly narrow name.
(merge 8bb19c14fb ob/t3501-retitle later to maint).
* Doc update to clarify how text and eol attributes interact to
specify the end-of-line conversion.
(merge 6696077ace ah/doc-attributes-text later to maint).
* Gitk updates from GfW project.
(merge 99e70f3077 js/gitk-fixes-from-gfw later to maint).
* "git diff --dirstat" leaked memory, which has been plugged.
(merge 83973981eb jc/dirstat-plug-leaks later to maint).
* "git merge-tree" reads the basic configuration, which can be used
by git forges to disable replace-refs feature.
(merge b6551feadf ds/merge-tree-use-config later to maint).
* A few bugs in the sequencer machinery that results in miscounting
the steps have been corrected.
(merge 170eea9750 js/rebase-count-fixes later to maint).
* Other code cleanup, docfix, build fix, etc.
(merge f7111175df as/doc-markup-fix later to maint).
(merge 90ff7c9898 fc/test-aggregation-clean-up later to maint).
(merge 9b0c7f308a jc/am-doc-refer-to-format-patch later to maint).
(merge b10cbdac4c bb/unicode-width-table-15 later to maint).
(merge 3457b50e8c ab/retire-scripted-add-p later to maint).
(merge d52fcf493b ds/p2000-fix-grep-sparse later to maint).
(merge ec063d2591 ss/hashmap-typofix later to maint).
(merge 1aaed69d11 rs/archive-mtime later to maint).
(merge 2da2cc9b28 ob/rollback-after-commit-lock-failure later to maint).
(merge 54dbd0933b ob/sequencer-save-head-simplify later to maint).
(merge a93cbe8d78 ar/test-cleanup-unused-file-creation later to maint).
(merge cc48ddd937 jk/chainlint-fixes later to maint).
(merge 4833b08426 ow/ref-format-remove-unused-member later to maint).
(merge d0ea2ca1cf dw/doc-submittingpatches-grammofix later to maint).
(merge fd72637423 ar/t2024-checkout-output-fix later to maint).
(merge d45cbe3fe0 ob/sequencer-i18n-fix later to maint).
(merge b734fe49fd ob/messages-capitalize-exception later to maint).
(merge ad353d7e77 ma/gittutorial-fixes later to maint).
(merge a5855fd8d4 ar/test-cleanup-unused-file-creation-part2 later to maint).
(merge 0c5308af30 sd/doc-gitignore-and-rm-cached later to maint).
(merge cbb83daeaf kh/doc-interpret-trailers-updates later to maint).
(merge 3d77fbb664 ar/config-count-tests-updates later to maint).
(merge b7cf25c8f4 jc/t9800-fix-use-of-show-s-raw later to maint).
----------------------------------------------------------------
Changes since v2.40.0 are as follows:
Adam Johnson (1):
ls-files: fix "--format" output of relative paths
Alex Henrie (5):
rebase: add documentation and test for --no-rebase-merges
rebase: deprecate --rebase-merges=""
rebase: add a config option for --rebase-merges
format-patch: correct documentation of --thread without an argument
docs: rewrite the documentation of the text and eol attributes
Andreas Schwab (1):
git-merge-tree.txt: replace spurious HTML entity
Andrei Rybak (19):
t1005: assert output of ls-files
t1006: assert error output of cat-file
t1010: don't create unused files
t1302: don't create unused file
t1400: assert output of update-ref
t1404: don't create unused file
t1507: assert output of rev-parse
t3060: fix mention of function prune_index
t2107: fix mention of the_index.cache_changed
t2024: fix loose/strict local base branch DWIM test
t1300: drop duplicate test
t1300: check stderr for "ignores pairs" tests
t1300: add tests for missing keys
t0300: don't create unused file
t1300: fix config file syntax error descriptions
t1300: don't create unused files
t1450: don't create unused files
t1502: don't create unused files
t2019: don't create unused files
Andy Koppe (1):
restore: fault --staged --worktree with merge opts
Beat Bolli (1):
unicode: update the width tables to Unicode 15
Christian Hesse (1):
imap-send: include strbuf.h
Clement Mabileau (1):
branch: improve error log on branch not found by checking remotes refs
Corentin Garcia (1):
doc/git-config: add unit for http.lowSpeedLimit
Daniel Watson (1):
SubmittingPatches: clarify MUA discussion with "the"
Derrick Stolee (19):
object-file: reprepare alternates when necessary
for-each-ref: add --stdin option
for-each-ref: explicitly test no matches
commit-graph: refactor compute_topological_levels()
commit-graph: simplify compute_generation_numbers()
commit-graph: return generation from memory
commit-reach: implement ahead_behind() logic
for-each-ref: add ahead-behind format atom
commit-reach: add tips_reachable_from_bases()
p2000: remove stray '--sparse' flag from test
fetch: download bundles once, even with --all
ci: update 'static-analysis' to Ubuntu 22.04
fsck: create scaffolding for rev-index checks
fsck: check rev-index checksums
fsck: check rev-index position values
fsck: validate .rev file header
fsck: verify checksums of all .bitmap files
fsck: use local repository
merge-tree: load default git config
Edwin Kofler (1):
completion: suppress unwanted unescaping of `read`
Elijah Newren (94):
treewide: ensure one of the appropriate headers is sourced first
treewide: remove unnecessary git-compat-util.h includes in headers
treewide: remove unnecessary cache.h includes
treewide: remove unnecessary cache.h includes in source files
alloc.h: move ALLOC_GROW() functions from cache.h
hash.h: move some oid-related declarations from cache.h
hex.h: move some hex-related declarations from cache.h
cache.h: remove dependence on hex.h; make other files include it explicitly
pretty.h: move has_non_ascii() declaration from commit.h
ident.h: move ident-related declarations out of cache.h
object.h: stop depending on cache.h; make cache.h depend on object.h
dir.h: refactor to no longer need to include cache.h
object-store.h: move struct object_info from cache.h
replace-object.h: move read_replace_refs declaration from cache.h to here
treewide: replace cache.h with more direct headers, where possible
Remove unnecessary includes of builtin.h
diff.h: remove unnecessary include of object.h
t2021: fix platform-specific leftover cruft
unpack-trees: heed requests to overwrite ignored files
dir: separate public from internal portion of dir_struct
dir: add a usage note to exclude_per_dir
dir: mark output only fields of dir_struct as such
unpack-trees: clean up some flow control
sparse-checkout: avoid using internal API of unpack-trees
sparse-checkout: avoid using internal API of unpack-trees, take 2
unpack_trees: start splitting internal fields from public API
unpack-trees: mark fields only used internally as internal
unpack-trees: rewrap a few overlong lines from previous patch
unpack-trees: special case read-tree debugging as internal usage
unpack-trees: add usage notices around df_conflict_entry
treewide: remove unnecessary cache.h inclusion from a few headers
treewide: be explicit about dependence on gettext.h
treewide: remove unnecessary inclusion of gettext.h
treewide: remove unnecessary cache.h inclusion from several sources
environment: move comment_line_char from cache.h
abspath.h: move absolute path functions from cache.h
cache.h: remove expand_user_path()
path.h: move function declarations for path.c functions from cache.h
wrapper.h: move declarations for wrapper.c functions from cache.h
treewide: remove unnecessary includes of cache.h
environment.h: move declarations for environment.c functions from cache.h
treewide: remove cache.h inclusion due to environment.h changes
setup.h: move declarations for setup.c functions from cache.h
treewide: remove cache.h inclusion due to setup.h changes
write-or-die.h: move declarations for write-or-die.c functions from cache.h
csum-file.h: remove unnecessary inclusion of cache.h
treewide: be explicit about dependence on trace.h & trace2.h
treewide: be explicit about dependence on advice.h
treewide: be explicit about dependence on convert.h
treewide: be explicit about dependence on pack-revindex.h
treewide: be explicit about dependence on oid-array.h
treewide: be explicit about dependence on mem-pool.h
treewide: remove unnecessary cache.h inclusion
object-name.h: move declarations for object-name.c functions from cache.h
treewide: remove cache.h inclusion due to object-name.h changes
git-zlib: move declarations for git-zlib functions from cache.h
treewide: remove cache.h inclusion due to git-zlib changes
object-file.h: move declarations for object-file.c functions from cache.h
treewide: remove cache.h inclusion due to object-file.h changes
object.h: move some inline functions and defines from cache.h
treewide: remove cache.h inclusion due to object.h changes
editor: move editor-related functions and declarations into common file
treewide: remove cache.h inclusion due to editor.h changes
pager.h: move declarations for pager.c functions from cache.h
treewide: remove cache.h inclusion due to pager.h changes
cache.h: remove unnecessary includes
treewide: remove double forward declaration of read_in_full
treewide: reduce includes of cache.h in other headers
mailmap, quote: move declarations of global vars to correct unit
protocol.h: move definition of DEFAULT_GIT_PORT from cache.h
treewide: be explicit about dependence on strbuf.h
symlinks.h: move declarations for symlinks.c functions from cache.h
packfile.h: move pack_window and pack_entry from cache.h
server-info.h: move declarations for server-info.c functions from cache.h
copy.h: move declarations for copy.c functions from cache.h
base85.h: move declarations for base85.c functions from cache.h
pkt-line.h: move declarations for pkt-line.c functions from cache.h
match-trees.h: move declarations for match-trees.c functions from cache.h
ws.h: move declarations for ws.c functions from cache.h
versioncmp.h: move declarations for versioncmp.c functions from cache.h
dir.h: move DTYPE defines from cache.h
tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
hash-ll.h: split out of hash.h to remove dependency on repository.h
cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
cache,tree: move basic name compare functions from read-cache to tree
treewide: remove cache.h inclusion due to previous changes
cache.h: remove unnecessary headers
fsmonitor: reduce includes of cache.h
commit.h: reduce unnecessary includes
object-store.h: reduce unnecessary includes
diff.h: reduce unnecessary includes
reftable: ensure git-compat-util.h is the first (indirect) include
merge-ort: fix calling merge_finalize() with no intermediate merge
t5583: fix shebang line
Emily Shaffer (1):
mailmap: change primary address for Emily Shaffer
Eric Sunshine (1):
tests: diagnose unclosed here-doc in chainlint.pl
Eric Wong (3):
commit-reach: avoid NULL dereference
fetch: support hideRefs to speed up connectivity checks
fetch: pass --no-write-fetch-head to subprocesses
Fangyi Zhou (1):
rebase: fix capitalisation autoSquash in i18n string
Felipe Contreras (16):
advice: add diverging advice for novices
test: simplify counts aggregation
test: don't print aggregate-results command
object-name: fix quiet @{u} parsing
completion: prompt: use generic colors
doc: remove GNU troff workaround
doc: remove manpage-base-url workaround
doc: asciidoc: remove custom header macro
doc: simplify man version
doc: set actual revdate for manpages
doc: git-checkout: trivial callout cleanup
doc: git-checkout: reorganize examples
doc: remove custom callouts format
doc: manpage: remove maximum title length
doc: doc-diff: specify date
test: rev-parse-upstream: add missing cmp
Glen Choo (10):
config.c: plumb config_source through static fns
config.c: don't assign to "cf_global" directly
config.c: create config_reader and the_reader
config.c: plumb the_reader through callbacks
config.c: remove current_config_kvi
config.c: remove current_parsing_scope
config: report cached filenames in die_bad_number()
config.c: rename "struct config_source cf"
clone: error specifically with --local and symlinked objects
setup: trace bare repository setups
Han Xin (2):
negotiator/default: avoid stack overflow
negotiator/skipping: fix some problems in mark_common()
Jacob Keller (2):
blame: allow --contents to work with non-HEAD commit
blame: use different author name for fake commit generated by --contents
Jeff King (90):
ref-filter: drop unused atom parameter from get_worktree_path()
ls-refs: drop config caching
serve: use repository pointer to get config
serve: mark unused parameters in virtual functions
object-name: mark unused parameters in disambiguate callbacks
http-backend: mark argc/argv unused
http-backend: mark unused parameters in virtual functions
ref-filter: mark unused callback parameters
mark "pointless" data pointers in callbacks
run-command: mark error routine parameters as unused
mark unused parameters in signal handlers
list-objects: mark unused callback parameters
for_each_object: mark unused callback parameters
prio-queue: mark unused parameters in comparison functions
notes: mark unused callback parameters
fetch-pack: mark unused parameter in callback function
rewrite_parents(): mark unused callback parameter
for_each_commit_graft(): mark unused callback parameter
userformat_want_item(): mark unused parameter
run_processes_parallel: mark unused callback parameters
help: mark unused parameter in git_unknown_cmd_config()
fsck: factor out index fsck
fsck: check index files in all worktrees
fsck: mention file path for index errors
fsck: check even zero-entry index files
drop pure pass-through config callbacks
bundle: turn on --all-progress-implied by default
bundle: let "-" mean stdin for reading operations
bundle: document handling of "-" as stdin
parse-options: consistently allocate memory in fix_filename()
parse-options: use prefix_filename_except_for_dash() helper
diff: factor out src/dst prefix setup
t4013: add tests for diff prefix options
diff: add --default-prefix option
format-patch: do not respect diff.noprefix
format-patch: add format.noprefix option
add-patch: handle "* Unmerged path" lines
http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
range-diff: drop useless "offset" variable from read_patches()
http: support CURLOPT_PROTOCOLS_STR
range-diff: handle unterminated lines in read_patches()
range-diff: use ssize_t for parsed "len" in read_patches()
rebase: prefer --default-prefix to --{src,dst}-prefix for format-patch
mailmap: drop debugging code
http: drop unused parameter from start_object_request()
http: mark unused parameter in fill_active_slot() callbacks
transport: mark unused parameters in fetch_refs_from_bundle()
git_connect(): fix corner cases in downgrading v2 to v0
fast-export: drop const when storing anonymized values
fast-export: simplify initialization of anonymized hashmaps
fast-export: factor out anonymized_entry creation
fast-export: de-obfuscate --anonymize-map handling
fast-export: drop data parameter from anonymous generators
fast-export: drop unused parameter from anonymize_commit_message()
Makefile: force -O0 when compiling with SANITIZE=leak
pack-redundant: escalate deprecation warning to an error
docs: document caveats of rev-list's object-name output
fast-import: fix file access when run from subdir
builtins: always pass prefix to parse_options()
builtins: annotate always-empty prefix parameters
builtins: mark unused prefix parameters
mark "argv" as unused when we check argc
t/helper: mark unused argv/argc arguments
parse-options: drop parse_opt_unknown_cb()
pack-redundant: document deprecation
tests: run internal chain-linter under "make test"
tests: replace chainlint subshell with a function
tests: drop here-doc check from internal chain-linter
tests: skip test_eval_ in internal chain-lint
t/lib-httpd: pass PERL_PATH to CGI scripts
v0 protocol: fix infinite loop when parsing multi-valued capabilities
t5512: stop referring to "v1" protocol
v0 protocol: fix sha1/sha256 confusion for capabilities^{}
t5512: add v2 support for "ls-remote --symref" test
t5512: allow any protocol version for filtered symref test
t5512: test "ls-remote --heads --symref" filtering with v0 and v2
v0 protocol: use size_t for capability length/offset
gpg-interface: set trust level of missing key to "undefined"
notes: clean up confusing NULL checks in init_notes()
fetch_bundle_uri(): drop pointless NULL check
t4212: avoid putting git on left-hand side of pipe
parse_commit(): parse timestamp from end of line
parse_commit(): handle broken whitespace-only timestamp
parse_commit(): describe more date-parsing failure modes
doc-diff: drop SOURCE_DATE_EPOCH override
t7001: avoid git on upstream of pipe
t7001: use "ls-files --format" instead of "cut"
t: drop "verbose" helper function
t/lib-httpd: make CGIPassAuth support conditional
Jiang Xin (5):
github-actions: run gcc-8 on ubuntu-20.04 image
ci: remove the pipe after "p4 -V" to catch errors
ci: use the same version of p4 on both Linux and macOS
ci: install python on ubuntu
object-info: init request_info before reading arg
Johannes Schindelin (31):
compat/win32/syslog: fix use-after-realloc
nedmalloc: avoid new compile error
t0033: GETTEXT_POISON fix
t0003: GETTEXT_POISON fix, part 1
t0003: GETTEXT_POISON fix, conclusion
t5619: GETTEXT_POISON fix
t5604: GETTEXT_POISON fix, part 1
t5604: GETTEXT_POISON fix, conclusion
clone.c: avoid "exceeds maximum object size" error with GCC v12.x
split-index & fsmonitor: demonstrate a bug
split-index; stop abusing the `base_oid` to strip the "link" extension
fsmonitor: avoid overriding `cache_changed` bits
unpack-trees: take care to propagate the split-index flag
t3701: we don't need no Perl for `add -i` anymore
t5563: prevent "ambiguous redirect"
apply --reject: overwrite existing `.rej` symlink if it exists
gettext: avoid using gettext if the locale dir is not present
tests: avoid using `test_i18ncmp`
Git 2.31.8
Git 2.32.7
Git 2.33.8
Git 2.34.8
Git 2.35.8
Git 2.36.6
Git 2.37.7
Git 2.38.5
Git 2.39.3
Git 2.40.1
gitk: prevent overly long command lines
rebase --update-refs: fix loops
rebase -r: fix the total number shown in the progress
John Cai (2):
name-rev: make --stdin hidden
attr: teach "--attr-source=<tree>" global option to "git"
John Keeping (1):
format-patch: output header for empty commits
Josh Soref (1):
subtree: support long global flags
Jouke Witteveen (1):
send-email docs: Remove mention of discontinued gmail feature
Junio C Hamano (38):
gpg-interface: lazily initialize and read the configuration
bundle: don't blindly apply prefix_filename() to "-"
Start the 2.41 cycle
The second batch
am: refer to format-patch in the documentation
The third batch
http.c: clear the 'finished' member once we are done with it
The fourth batch
The fifth batch
The sixth batch
e-mail workflow: Message-ID is spelled with ID in both capital letters
The seventh batch
clone: propagate object-format when cloning from void
The eighth batch
The ninth batch
The tenth batch
The eleventh batch
The twelfth batch
The thirteenth batch
doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
The fourteenth batch
The fifteenth batch
The sixteenth batch
diff: refactor common tail part of dirstat computation
diff: plug leaks in dirstat
t9800: correct misuse of 'show -s --raw' in a test
The seventeenth batch
The eighteenth batch
Git 2.41-rc0
tests: do not negate test_path_exists
t2021: do not negate test_path_is_dir
test: do not negate test_path_is_* to assert absense
A bit more before -rc1
send-email: clear the $message_id after validation
t9001: mark the script as no longer leak checker clean
Git 2.41-rc1
A few more topics after 2.41-rc1
Git 2.41-rc2
Kristoffer Haugsbakk (5):
config: tell the user that we expect an ASCII character
doc: interpret-trailers: don’t use heredoc in examples
doc: interpret-trailers: use input redirection
doc: interpret-trailers: don’t use deprecated config
doc: interpret-trailers: fix example
Linus Arver (1):
MyFirstContribution: render literal *
M Hickford (3):
credential/wincred: include wincred.h
credential/wincred: store password_expiry_utc
credential: new attribute oauth_refresh_token
Martin Ågren (2):
gittutorial: drop early mention of origin
gittutorial: wrap literal examples in backticks
Mathias Krause (1):
grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34
Matthew John Cheetham (3):
t5563: add tests for basic and anoymous HTTP access
http: read HTTP WWW-Authenticate response headers
credential: add WWW-Authenticate header to cred requests
Maxim Cournoyer (3):
send-email: extract execute_cmd from recipients_cmd
send-email: add --header-cmd, --no-header-cmd options
send-email: detect empty blank lines in command output
Michael J Gruber (1):
t3070: make chain lint tester happy
Michael Strawbridge (2):
send-email: refactor header generation functions
send-email: expose header information to git-send-email's sendemail-validate hook
Mike Hommey (1):
Handle some compiler versions containing a dash
Nico Rieck (1):
gitk: escape file paths before piping to git log
Oswald Buddenhagen (5):
sequencer: remove pointless rollback_lock_file()
sequencer: rewrite save_head() in terms of write_message()
sequencer: actually translate report in do_exec()
messages: capitalization and punctuation exceptions
t/t3501-revert-cherry-pick.sh: clarify scope of the file
Patrick Steinhardt (27):
receive-pack: fix stale packfile locks when dying
fetch: move reference width calculation into `display_state`
fetch: move output format into `display_state`
fetch: pass the full local reference name to `format_display`
fetch: centralize handling of per-reference format
fetch: centralize logic to print remote URL
fetch: centralize printing of reference updates
commit-graph: fix truncated generation numbers
midx: fix segfault with no packs and invalid preferred pack
repack: fix trying to use preferred pack in alternates
repack: fix generating multi-pack-index with only non-local packs
pack-objects: split out `--stdin-packs` tests into separate file
pack-objects: fix error when packing same pack twice
pack-objects: fix error when same packfile is included and excluded
pack-objects: extend test coverage of `--stdin-packs` with alternates
t/helper: allow chmtime to print verbosely without modifying mtime
repack: honor `-l` when calculating pack geometry
repack: disable writing bitmaps when doing a local repack
fetch: fix `--no-recurse-submodules` with multi-remote fetches
fetch: split out tests for output format
fetch: add a test to exercise invalid output formats
fetch: print left-hand side when fetching HEAD:foo
fetch: refactor calculation of the display table width
fetch: introduce `display_format` enum
fetch: lift up parsing of "fetch.output" config variable
fetch: move option related variables into main function
fetch: introduce machine-parseable "porcelain" output format
Paul Eggert (1):
git-compat-util: use gettimeofday(2) for time(2)
Phillip Wood (8):
wildmatch: fix exponential behavior
wildmatch: avoid undefined behavior
wildmatch: hide internal return values
rebase: stop reading and writing unnecessary strategy state
sequencer: use struct strvec to store merge strategy options
rebase -m: cleanup --strategy-option handling
rebase -m: fix serialization of strategy options
rebase: remove a couple of redundant strategy tests
Raghul Nanth A (1):
describe: enable sparse index for describe
René Scharfe (6):
archive: improve support for running in subdirectory
t5000: use check_mtime()
userdiff: support regexec(3) with multi-byte support
date: remove approxidate_relative()
get-tar-commit-id: use TYPEFLAG_GLOBAL_HEADER instead of magic value
test-ctype: check EOF
Robin Jarry (1):
send-email: export patch counters in validate environment
Rubén Justo (10):
bisect: fix "reset" when branch is checked out elsewhere
worktree: introduce is_shared_symref()
branch: fix die_if_checked_out() when ignore_current_worktree
rebase: refuse to switch to a branch already checked out elsewhere (test)
switch: reject if the branch is already checked out elsewhere (test)
branch: test for failures while renaming branches
branch: use get_worktrees() in copy_or_rename_branch()
branch: description for orphan branch errors
branch: rename orphan branches in any worktree
branch: avoid unnecessary worktrees traversals
SZEDER Gábor (6):
treewide: include parse-options.h in source files
treewide: remove unnecessary inclusions of parse-options.h from headers
parse-options.h: use consistent name for the callback parameters
parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters
parse-options.h: use designated initializers in OPT_* macros
cocci: remove 'unused.cocci'
Shuqi Liang (4):
write-tree: integrate with sparse index
t1092: update a write-tree test
t1092: add tests for `git diff-files`
diff-files: integrate with sparse index
Siddharth Singh (1):
hashmap.h: fix minor typo
Sohom Datta (1):
docs: clarify git rm --cached function in gitignore note
Stanislav Malishevskiy (1):
http: add support for different sslcert and sslkey types.
Tao Klerks (1):
mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
Taylor Blau (37):
commit-graph: introduce `ensure_generations_valid()`
pack-write.c: plug a leak in stage_tmp_packfiles()
t5325: mark as leak-free
pack-revindex: make `load_pack_revindex` take a repository
pack-revindex: introduce GIT_TEST_REV_INDEX_DIE_ON_DISK
pack-revindex: introduce `pack.readReverseIndex`
config: enable `pack.writeReverseIndex` by default
t: invert `GIT_TEST_WRITE_REV_INDEX`
t1300: demonstrate failure when renaming sections with long lines
config: avoid fixed-sized buffer when renaming/deleting a section
config.c: avoid integer truncation in `copy_or_rename_section_in_file()`
config.c: disallow overly-long lines in `copy_or_rename_section_in_file()`
Git 2.30.9
pack-write.c: plug a leak in stage_tmp_packfiles()
builtin/repack.c: fix incorrect reference to '-C'
builtin/gc.c: ignore cruft packs with `--keep-largest-pack`
t/t5304-prune.sh: prepare for `gc --cruft` by default
t/t6501-freshen-objects.sh: prepare for `gc --cruft` by default
t/t6500-gc.sh: refactor cruft pack tests
t/t6500-gc.sh: add additional test cases
t/t9300-fast-import.sh: prepare for `gc --cruft` by default
builtin/gc.c: make `gc.cruftPacks` enabled by default
repository.h: drop unused `gc_cruft_packs`
string-list: multi-delimiter `string_list_split_in_place()`
string-list: introduce `string_list_setlen()`
t/helper/test-hashmap.c: avoid using `strtok()`
t/helper/test-oidmap.c: avoid using `strtok()`
t/helper/test-json-writer.c: avoid using `strtok()`
banned.h: mark `strtok()` and `strtok_r()` as banned
credential.c: store "wwwauth[]" values in `credential_read()`
t/lib-credential.sh: ensure credential helpers handle long headers
contrib/credential: avoid fixed-size buffer in osxkeychain
contrib/credential: remove 'gnome-keyring' credential helper
contrib/credential: .gitignore libsecret build artifacts
contrib/credential: avoid fixed-size buffer in libsecret
contrib/credential: embiggen fixed-size buffer in wincred
run-command.c: fix missing include under `NO_PTHREADS`
Teng Long (1):
push: introduce '--branches' option
William Sprent (2):
builtin/sparse-checkout: remove NEED_WORK_TREE flag
builtin/sparse-checkout: add check-rules command
ZheNing Hu (2):
receive-pack: fix funny ref error messsage
push: allow delete single-level ref
brian m. carlson (1):
upload-pack: advertise capabilities when cloning empty repos
Ævar Arnfjörð Bjarmason (33):
auto-crlf tests: don't lose exit code in loops and outside tests
t/lib-patch-mode.sh: fix ignored exit codes
tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
tests: don't lose "git" exit codes in "! ( git ... | grep )"
tests: don't lose exit status with "test <op> $(git ...)"
tests: don't lose misc "git" exit codes
sequencer.c: fix overflow & segfault in parse_strategy_opts()
cocci: remove dead rule from "the_repository.pending.cocci"
cocci: fix incorrect & verbose "the_repository" rules
cocci: sort "the_repository" rules by header
cocci: add missing "the_repository" macros to "pending"
cocci: apply the "cache.h" part of "the_repository.pending"
cocci: apply the "commit-reach.h" part of "the_repository.pending"
cocci: apply the "commit.h" part of "the_repository.pending"
cocci: apply the "diff.h" part of "the_repository.pending"
cocci: apply the "object-store.h" part of "the_repository.pending"
cocci: apply the "pretty.h" part of "the_repository.pending"
cocci: apply the "packfile.h" part of "the_repository.pending"
cocci: apply the "promisor-remote.h" part of "the_repository.pending"
cocci: apply the "refs.h" part of "the_repository.pending"
cocci: apply the "rerere.h" part of "the_repository.pending"
cocci: apply the "revision.h" part of "the_repository.pending"
post-cocci: adjust comments for recent repo_* migration
libs: use "struct repository *" argument, not "the_repository"
config tests: cover blind spots in git_die_config() tests
config tests: add "NULL" tests for *_get_value_multi()
config API: add and use a "git_config_get()" family of functions
versioncmp.c: refactor config reading next commit
config API: have *_multi() return an "int" and take a "dest"
for-each-repo: error on bad --config
config API users: test for *_get_value_multi() segfaults
config API: add "string" version of *_value_multi(), fix segfaults
for-each-repo: with bad config, don't conflate <path> and <cmd>
Øystein Walle (2):
ref-filter: remove unused ref_format member
branch, for-each-ref, tag: add option to omit empty lines
^ permalink raw reply [relevance 1%]
* [ANNOUNCE] Git v2.41.0-rc1
@ 2023-05-19 17:39 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2023-05-19 17:39 UTC (permalink / raw)
To: git; +Cc: Linux Kernel, git-packagers
A release candidate Git v2.41.0-rc1 is now available for testing at
the usual places. It is comprised of 516 non-merge commits since
v2.40.0, contributed by 79 people, 24 of which are new faces [*].
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.41.0-rc1' tag and the 'master' branch that the tag points at:
url = https://git.kernel.org/pub/scm/git/git
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.40.0 are as
follows. Welcome to the Git development community!
Adam Johnson, André Baptista, Andy Koppe, Clement Mabileau,
Cristian Le, Daniel Watson, D. Ben Knoble, Douglas Anderson,
Edwin Kofler, Jonas Haag, Jouke Witteveen, Matthias Görgens,
Maxim Cournoyer, Michael Henry, Michael Strawbridge, Nico
Rieck, Raghul Nanth A, Rolf Eike Beer, Shuqi Liang, Siddharth
Singh, Stanislav Malishevskiy, Stephane Odul, Vítor Pinho,
and Xin Xing.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Ævar Arnfjörð Bjarmason, Alex Henrie, Andreas Schwab,
Andrei Rybak, Beat Bolli, brian m. carlson, Christian Hesse,
Derrick Stolee, Elijah Newren, Emily Shaffer, Eric Sunshine,
Eric Wong, Fangyi Zhou, Felipe Contreras, Glen Choo, Han Xin,
Jacob Keller, Jeff King, Jiang Xin, Joakim Petersen, Johannes
Schindelin, Johannes Sixt, John Cai, John Keeping, Josh Soref,
Junio C Hamano, Kristoffer Haugsbakk, Linus Arver, Linus
Torvalds, Martin Ågren, Mathias Krause, Matthew John Cheetham,
M Hickford, Michael J Gruber, Mike Hommey, Oswald Buddenhagen,
Øystein Walle, Patrick Steinhardt, Paul Eggert, Philippe Blain,
Phillip Wood, Randall S. Becker, René Scharfe, Robin Jarry,
Rubén Justo, RyotaK, Sohom Datta, SZEDER Gábor, Tao Klerks,
Taylor Blau, Teng Long, Todd Zullinger, Torsten Bögershausen,
William Sprent, and ZheNing Hu.
[*] We are counting not just the authorship contribution but issue
reporting, mentoring, helping and reviewing that are recorded in
the commit trailers.
----------------------------------------------------------------
Git v2.41 Release Notes (draft)
===============================
UI, Workflows & Features
* Allow information carried on the WWW-Authenticate header to be
passed to the credential helpers.
* A new "fetch.hideRefs" option can be used to exclude specified refs
from "rev-list --objects --stdin --not --all" traversal for
checking object connectivity, most useful when there are many
unrelated histories in a single repository.
* "git push" has been taught to allow deletion of refs with one-level
names to help repairing a repository who acquired such a ref by
mistake. In general, we don't encourage use of such a ref, and
creation or update to such a ref is rejected as before.
* Allow "git bisect reset" to check out the original branch when the
branch is already checked out in a different worktree linked to the
same repository.
* A few subcommands have been taught to stop users from working on a
branch that is being used in another worktree linked to the same
repository.
* "git format-patch" learned to write a log-message only output file
for empty commits.
* "git format-patch" honors the src/dst prefixes set to nonstandard
values with configuration variables like "diff.noprefix", causing
receiving end of the patch that expects the standard -p1 format to
break. "format-patch" has been taught to ignore end-user configuration
and always use the standard prefixes.
This is a backward compatibility breaking change.
* Lift the limitation that colored prompts can only be used with
PROMPT_COMMAND mode.
* "git blame --contents=<file> <rev> -- <path>" used to be forbidden,
but now it finds the origins of lines starting at <file> contents
through the history that leads to <rev>.
* "git pack-redundant" gave a warning when run, as the command has
outlived its usefulness long ago and is nominated for future
removal. Now we escalate to give an error.
* "git clone" from an empty repository learned to propagate the
choice of the hash algorithm from the source repository to the
newly created repository over any one of the v0/v1/v2 protocol.
* "git mergetool" and "git difftool" learns a new configuration
guiDefault to optionally favor configured guitool over non-gui-tool
automatically when $DISPLAY is set.
* "git branch -d origin/master" would say "no such branch", but it is
likely a missed "-r" if refs/remotes/origin/master exists. The
command has been taught to give such a hint in its error message.
* Clean-up of the code path that deals with merge strategy option
handling in "git rebase".
* "git clone --local" stops copying from an original repository that
has symbolic links inside its $GIT_DIR; an error message when that
happens has been updated.
* "git branch --format=..." and "git format-patch --format=..."
learns "--omit-empty" to hide refs that whose formatting result
becomes an empty string from the output.
* The sendemail-validate validate hook learned to pass the total
number of input files and where in the sequence each invocation is
via environment variables.
* When "gc" needs to retain unreachable objects, packing them into
cruft packs (instead of exploding them into loose object files) has
been offered as a more efficient option for some time. Now the use
of cruft packs has been made the default and no longer considered
an experimental feature.
* The output given by "git blame" that attributes a line to contents
taken from the file specified by the "--contents" option shows it
differently from a line attributed to the working tree file.
* "git send-email" learned to give the e-mail headers to the validate
hook by passing an extra argument from the command line.
* The credential subsystem learns to help OAuth framework.
* The titles of manual pages used to be chomped at an unreasonably
short limit, which has been removed.
* Error messages given when working on an unborn branch that is
checked out in another worktree have been improved.
* The documentation was misleading about the interaction between
GIT_DEFAULT_HASH and "git clone", which has been clarified to
stress that the variable is to be ignored by the command.
* "git send-email" learned "--header-cmd=<cmd>" that can inject
arbitrary e-mail header lines to the outgoing messages.
* "git fsck" learned to detect bit-flip breakages in the reachability
bitmap files.
* The "--stdin" option of "git name-rev" has been replaced with
the "--annotate-stdin" option more than a year ago. We stop
advertising it in the "git name-rev -h" output.
* "git push --all" gained an alias "git push --branches".
* "git fetch" learned the "--porcelain" option that emits what it did
in a machine-parseable format.
* "git --attr-source=<tree> cmd $args" is a new way to have any
command to read attributes not from the working tree but from the
given tree object.
Performance, Internal Implementation, Development Support etc.
* Code clean-up to clarify directory traversal API.
* Code clean-up to clarify the rule that "git-compat-util.h" must be
the first to be included.
* More work towards -Wunused.
* Instead of forcing each command to choose to honor GPG related
configuration variables, make the subsystem lazily initialize
itself.
* Remove workaround for ancient versions of DocBook to make it work
correctly with groff, which has not been necessary since docbook
1.76 from 2010.
* Code clean-up to include and/or uninclude parse-options.h file as
needed.
* The code path that reports what "git fetch" did to each ref has
been cleaned up.
* Assorted config API updates.
* A few configuration variables to tell the cURL library that
different types of ssl-cert and ssl-key are in use have been added.
* Split key function and data structure definitions out of cache.h to
new header files and adjust the users.
* "git fetch --all" does not have to download and handle the same
bundleURI over and over, which has been corrected.
* "git sparse-checkout" command learns a debugging aid for the sparse
rule definitions.
* "git write-tree" learns to work better with sparse-index.
* The on-disk reverse index that allows mapping from the pack offset
to the object name for the object stored at the offset has been
enabled by default.
* "git fsck" learned to validate the on-disk pack reverse index files.
* strtok() and strtok_r() are banned in this codebase.
* The detect-compilers script to help auto-tweaking the build system
had trouble working with compilers whose version number has extra
suffixes. The script has been taught that certain suffixes (like
"-win32" in "gcc 10-win32") can be safely stripped as they share
the same features and bugs with the version without the suffix.
* ctype tests have been taught to test EOF, too.
* The implementation of credential helpers used fgets() over fixed
size buffers to read protocol messages, causing the remainder of
the folded long line to trigger unexpected behaviour, which has
been corrected.
* The implementation of the default "negotiator", used to find common
ancestor over the network for object tranfer, used to be recursive;
it was updated to be iterative to conserve stackspace usage.
* Our custom callout formatter is no longer used in the documentation
formatting toolchain, as the upstream default ones give better
output these days.
* The tracing mechanism learned to notice and report when
auto-discovered bare repositories are being used, as allowing so
without explicitly stating the user intends to do so (with setting
GIT_DIR for example) can be used with social engineering as an
attack vector.
* "git diff-files" learned not to expand sparse-index unless needed.
Fixes since v2.40
-----------------
* "git fsck" learned to check the index files in other worktrees,
just like "git gc" honors them as anchoring points.
(merge 8d3e7eac52 jk/fsck-indices-in-worktrees later to maint).
* Fix a segfaulting loop. The function and its caller may need
further clean-up.
(merge c5773dc078 ew/commit-reach-clean-up-flags-fix later to maint).
* "git restore" supports options like "--ours" that are only
meaningful during a conflicted merge, but these options are only
meaningful when updating the working tree files. These options are
marked to be incompatible when both "--staged" and "--worktree" are
in effect.
(merge ee8a88826a ak/restore-both-incompatible-with-conflicts later to maint).
* Simplify UI to control progress meter given by "git bundle" command.
(merge 8b95521edb jk/bundle-progress later to maint).
* "git bundle" learned that "-" is a common way to say that the input
comes from the standard input and/or the output goes to the
standard output. It used to work only for output and only from the
root level of the working tree.
(merge 0bbe10313e jk/bundle-use-dash-for-stdfiles later to maint).
* Once we start running, we assumed that the list of alternate object
databases would never change. Hook into the machinery used to
update the list of packfiles during runtime to update this list as
well.
(merge e2d003dbed ds/reprepare-alternates-when-repreparing-packfiles later to maint).
* The code to parse "git rebase -X<opt>" was not prepared to see an
unparsable option string, which has been corrected.
(merge 15a4cc912e ab/fix-strategy-opts-parsing later to maint).
* "git add -p" while the index is unmerged sometimes failed to parse
the diff output it internally produces and died, which has been
corrected.
(merge 28d1122f9c jk/add-p-unmerged-fix later to maint).
* Fix for a "ls-files --format="%(path)" that produced nonsense
output, which was a bug in 2.38.
(merge cfb62dd006 aj/ls-files-format-fix later to maint).
* "git receive-pack" that responds to "git push" requests failed to
clean a stale lockfile when killed in the middle, which has been
corrected.
(merge c55c30669c ps/receive-pack-unlock-before-die later to maint).
* "git rev-parse --quiet foo@{u}", or anything that asks @{u} to be
parsed with GET_OID_QUIETLY option, did not quietly fail, which has
been corrected.
(merge dfbfdc521d fc/oid-quietly-parse-upstream later to maint).
* Transports that do not support protocol v2 did not correctly fall
back to protocol v0 under certain conditions, which has been
corrected.
(merge eaa0fd6584 jk/fix-proto-downgrade-to-v0 later to maint).
* time(2) on glib 2.31+, especially on Linux, goes out of sync with
higher resolution timers used for gettimeofday(2) and by the
filesystem. Replace all calls to it with a git_time() wrapper and
(merge 370ddcbc89 pe/time-use-gettimeofday later to maint).
* Code clean-up to use designated initializers in parse-options API.
(merge 353e6d4554 sg/parse-options-h-initializers later to maint).
* A recent-ish change to allow unicode character classes to be used
with "grep -P" triggered a JIT bug in older pcre2 libraries.
The problematic change in Git built with these older libraries has
been disabled to work around the bug.
(merge 14b9a04479 mk/workaround-pcre-jit-ucp-bug later to maint).
* The wildmatch library code unlearns exponential behaviour it
acquired some time ago since it was borrowed from rsync.
(merge 3dc0b7f0dc pw/wildmatch-fixes later to maint).
* The index files can become corrupt under certain conditions when
the split-index feature is in use, especially together with
fsmonitor, which have been corrected.
(merge 061dd722dc js/split-index-fixes later to maint).
* Document what the pathname-looking strings in "rev-list --object"
output are for and what they mean.
(merge 15364d2a3c jk/document-rev-list-object-name later to maint).
* Fix unnecessary truncation of generation numbers used in-core.
(merge d3af1c193d ps/ahead-behind-truncation-fix later to maint).
* Code clean-up around the use of the_repository.
(merge 4a93b899c1 ab/remove-implicit-use-of-the-repository later to maint).
* Consistently spell "Message-ID" as such, not "Message-Id".
(merge ba4324c4e1 jc/spell-id-in-both-caps-in-message-id later to maint).
* Correct use of an uninitialized structure member.
(merge dc12ee77ab jx/cap-object-info-uninitialized-fix later to maint).
* Tests had a few places where we ignored PERL_PATH and blindly used
/usr/bin/perl, which have been corrected.
(merge c1917156a0 jk/use-perl-path-consistently later to maint).
* Documentation mark-up fix.
(merge 78b6369e67 la/mfc-markup-fix later to maint).
* Doc toolchain update to remove old workaround for AsciiDoc.
(merge 8806120de6 fc/remove-header-workarounds-for-asciidoc later to maint).
* The userdiff regexp patterns for various filetypes that are built
into the system have been updated to avoid triggering regexp errors
from UTF-8 aware regex engines.
(merge be39144954 rs/userdiff-multibyte-regex later to maint).
* The approxidate() API has been simplified by losing an extra
function that did the same thing as another one.
(merge 8a7f0b666f rs/remove-approxidate-relative later to maint).
* Code clean-up to replace a hardcoded constant with a CPP macro.
(merge c870de6502 rs/get-tar-commit-id-use-defined-const later to maint).
* Doc build simplification.
(merge 9a09ed3229 fc/doc-stop-using-manversion later to maint).
* "git archive" run from a subdirectory mishandled attributes and
paths outside the current directory.
(merge 92b1dd1b9e rs/archive-from-subdirectory-fixes later to maint).
* The code to parse capability list for v0 on-wire protocol fell into
an infinite loop when a capability appears multiple times, which
has been corrected.
* Geometric repacking ("git repack --geometric=<n>") in a repository
that borrows from an alternate object database had various corner
case bugs, which have been corrected.
(merge d85cd18777 ps/fix-geom-repack-with-alternates later to maint).
* The "%GT" placeholder for the "--format" option of "git log" and
friends caused BUG() to trigger on a commit signed with an unknown
key, which has been corrected.
(merge 7891e46585 jk/gpg-trust-level-fix later to maint).
* The completion script used to use bare "read" without the "-r"
option to read the contents of various state files, which risked
getting confused with backslashes in them. This has been
corrected.
(merge 197152098a ek/completion-use-read-r-to-read-literally later to maint).
* A small API fix to the ort merge strategy backend.
(merge 000c4ceca7 en/ort-finalize-after-0-merges-fix later to maint).
* The commit object parser has been taught to be a bit more lenient
to parse timestamps on the author/committer line with a malformed
author/committer ident.
(merge 90ef0f14eb jk/parse-commit-with-malformed-ident later to maint).
* Retitle a test script with an overly narrow name.
(merge 8bb19c14fb ob/t3501-retitle later to maint).
* Doc update to clarify how text and eol attributes interact to
specify the end-of-line conversion.
(merge 6696077ace ah/doc-attributes-text later to maint).
* Gitk updates from GfW project.
(merge 99e70f3077 js/gitk-fixes-from-gfw later to maint).
* "git diff --dirstat" leaked memory, which has been plugged.
(merge 83973981eb jc/dirstat-plug-leaks later to maint).
* "git merge-tree" reads the basic configuration, which can be used
by git forges to disable replace-refs feature.
(merge b6551feadf ds/merge-tree-use-config later to maint).
* Other code cleanup, docfix, build fix, etc.
(merge f7111175df as/doc-markup-fix later to maint).
(merge 90ff7c9898 fc/test-aggregation-clean-up later to maint).
(merge 9b0c7f308a jc/am-doc-refer-to-format-patch later to maint).
(merge b10cbdac4c bb/unicode-width-table-15 later to maint).
(merge 3457b50e8c ab/retire-scripted-add-p later to maint).
(merge d52fcf493b ds/p2000-fix-grep-sparse later to maint).
(merge ec063d2591 ss/hashmap-typofix later to maint).
(merge 1aaed69d11 rs/archive-mtime later to maint).
(merge 2da2cc9b28 ob/rollback-after-commit-lock-failure later to maint).
(merge 54dbd0933b ob/sequencer-save-head-simplify later to maint).
(merge a93cbe8d78 ar/test-cleanup-unused-file-creation later to maint).
(merge cc48ddd937 jk/chainlint-fixes later to maint).
(merge 4833b08426 ow/ref-format-remove-unused-member later to maint).
(merge d0ea2ca1cf dw/doc-submittingpatches-grammofix later to maint).
(merge fd72637423 ar/t2024-checkout-output-fix later to maint).
(merge d45cbe3fe0 ob/sequencer-i18n-fix later to maint).
(merge b734fe49fd ob/messages-capitalize-exception later to maint).
(merge ad353d7e77 ma/gittutorial-fixes later to maint).
(merge a5855fd8d4 ar/test-cleanup-unused-file-creation-part2 later to maint).
(merge 0c5308af30 sd/doc-gitignore-and-rm-cached later to maint).
(merge cbb83daeaf kh/doc-interpret-trailers-updates later to maint).
(merge 3d77fbb664 ar/config-count-tests-updates later to maint).
(merge b7cf25c8f4 jc/t9800-fix-use-of-show-s-raw later to maint).
----------------------------------------------------------------
Changes since v2.40.0 are as follows:
Adam Johnson (1):
ls-files: fix "--format" output of relative paths
Alex Henrie (5):
rebase: add documentation and test for --no-rebase-merges
rebase: deprecate --rebase-merges=""
rebase: add a config option for --rebase-merges
format-patch: correct documentation of --thread without an argument
docs: rewrite the documentation of the text and eol attributes
Andreas Schwab (1):
git-merge-tree.txt: replace spurious HTML entity
Andrei Rybak (19):
t1005: assert output of ls-files
t1006: assert error output of cat-file
t1010: don't create unused files
t1302: don't create unused file
t1400: assert output of update-ref
t1404: don't create unused file
t1507: assert output of rev-parse
t3060: fix mention of function prune_index
t2107: fix mention of the_index.cache_changed
t2024: fix loose/strict local base branch DWIM test
t1300: drop duplicate test
t1300: check stderr for "ignores pairs" tests
t1300: add tests for missing keys
t0300: don't create unused file
t1300: fix config file syntax error descriptions
t1300: don't create unused files
t1450: don't create unused files
t1502: don't create unused files
t2019: don't create unused files
Andy Koppe (1):
restore: fault --staged --worktree with merge opts
Beat Bolli (1):
unicode: update the width tables to Unicode 15
Christian Hesse (1):
imap-send: include strbuf.h
Clement Mabileau (1):
branch: improve error log on branch not found by checking remotes refs
Daniel Watson (1):
SubmittingPatches: clarify MUA discussion with "the"
Derrick Stolee (19):
object-file: reprepare alternates when necessary
for-each-ref: add --stdin option
for-each-ref: explicitly test no matches
commit-graph: refactor compute_topological_levels()
commit-graph: simplify compute_generation_numbers()
commit-graph: return generation from memory
commit-reach: implement ahead_behind() logic
for-each-ref: add ahead-behind format atom
commit-reach: add tips_reachable_from_bases()
p2000: remove stray '--sparse' flag from test
fetch: download bundles once, even with --all
ci: update 'static-analysis' to Ubuntu 22.04
fsck: create scaffolding for rev-index checks
fsck: check rev-index checksums
fsck: check rev-index position values
fsck: validate .rev file header
fsck: verify checksums of all .bitmap files
fsck: use local repository
merge-tree: load default git config
Edwin Kofler (1):
completion: suppress unwanted unescaping of `read`
Elijah Newren (94):
treewide: ensure one of the appropriate headers is sourced first
treewide: remove unnecessary git-compat-util.h includes in headers
treewide: remove unnecessary cache.h includes
treewide: remove unnecessary cache.h includes in source files
alloc.h: move ALLOC_GROW() functions from cache.h
hash.h: move some oid-related declarations from cache.h
hex.h: move some hex-related declarations from cache.h
cache.h: remove dependence on hex.h; make other files include it explicitly
pretty.h: move has_non_ascii() declaration from commit.h
ident.h: move ident-related declarations out of cache.h
object.h: stop depending on cache.h; make cache.h depend on object.h
dir.h: refactor to no longer need to include cache.h
object-store.h: move struct object_info from cache.h
replace-object.h: move read_replace_refs declaration from cache.h to here
treewide: replace cache.h with more direct headers, where possible
Remove unnecessary includes of builtin.h
diff.h: remove unnecessary include of object.h
t2021: fix platform-specific leftover cruft
unpack-trees: heed requests to overwrite ignored files
dir: separate public from internal portion of dir_struct
dir: add a usage note to exclude_per_dir
dir: mark output only fields of dir_struct as such
unpack-trees: clean up some flow control
sparse-checkout: avoid using internal API of unpack-trees
sparse-checkout: avoid using internal API of unpack-trees, take 2
unpack_trees: start splitting internal fields from public API
unpack-trees: mark fields only used internally as internal
unpack-trees: rewrap a few overlong lines from previous patch
unpack-trees: special case read-tree debugging as internal usage
unpack-trees: add usage notices around df_conflict_entry
treewide: remove unnecessary cache.h inclusion from a few headers
treewide: be explicit about dependence on gettext.h
treewide: remove unnecessary inclusion of gettext.h
treewide: remove unnecessary cache.h inclusion from several sources
environment: move comment_line_char from cache.h
abspath.h: move absolute path functions from cache.h
cache.h: remove expand_user_path()
path.h: move function declarations for path.c functions from cache.h
wrapper.h: move declarations for wrapper.c functions from cache.h
treewide: remove unnecessary includes of cache.h
environment.h: move declarations for environment.c functions from cache.h
treewide: remove cache.h inclusion due to environment.h changes
setup.h: move declarations for setup.c functions from cache.h
treewide: remove cache.h inclusion due to setup.h changes
write-or-die.h: move declarations for write-or-die.c functions from cache.h
csum-file.h: remove unnecessary inclusion of cache.h
treewide: be explicit about dependence on trace.h & trace2.h
treewide: be explicit about dependence on advice.h
treewide: be explicit about dependence on convert.h
treewide: be explicit about dependence on pack-revindex.h
treewide: be explicit about dependence on oid-array.h
treewide: be explicit about dependence on mem-pool.h
treewide: remove unnecessary cache.h inclusion
object-name.h: move declarations for object-name.c functions from cache.h
treewide: remove cache.h inclusion due to object-name.h changes
git-zlib: move declarations for git-zlib functions from cache.h
treewide: remove cache.h inclusion due to git-zlib changes
object-file.h: move declarations for object-file.c functions from cache.h
treewide: remove cache.h inclusion due to object-file.h changes
object.h: move some inline functions and defines from cache.h
treewide: remove cache.h inclusion due to object.h changes
editor: move editor-related functions and declarations into common file
treewide: remove cache.h inclusion due to editor.h changes
pager.h: move declarations for pager.c functions from cache.h
treewide: remove cache.h inclusion due to pager.h changes
cache.h: remove unnecessary includes
treewide: remove double forward declaration of read_in_full
treewide: reduce includes of cache.h in other headers
mailmap, quote: move declarations of global vars to correct unit
protocol.h: move definition of DEFAULT_GIT_PORT from cache.h
treewide: be explicit about dependence on strbuf.h
symlinks.h: move declarations for symlinks.c functions from cache.h
packfile.h: move pack_window and pack_entry from cache.h
server-info.h: move declarations for server-info.c functions from cache.h
copy.h: move declarations for copy.c functions from cache.h
base85.h: move declarations for base85.c functions from cache.h
pkt-line.h: move declarations for pkt-line.c functions from cache.h
match-trees.h: move declarations for match-trees.c functions from cache.h
ws.h: move declarations for ws.c functions from cache.h
versioncmp.h: move declarations for versioncmp.c functions from cache.h
dir.h: move DTYPE defines from cache.h
tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
hash-ll.h: split out of hash.h to remove dependency on repository.h
cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
cache,tree: move basic name compare functions from read-cache to tree
treewide: remove cache.h inclusion due to previous changes
cache.h: remove unnecessary headers
fsmonitor: reduce includes of cache.h
commit.h: reduce unnecessary includes
object-store.h: reduce unnecessary includes
diff.h: reduce unnecessary includes
reftable: ensure git-compat-util.h is the first (indirect) include
merge-ort: fix calling merge_finalize() with no intermediate merge
t5583: fix shebang line
Emily Shaffer (1):
mailmap: change primary address for Emily Shaffer
Eric Sunshine (1):
tests: diagnose unclosed here-doc in chainlint.pl
Eric Wong (3):
commit-reach: avoid NULL dereference
fetch: support hideRefs to speed up connectivity checks
fetch: pass --no-write-fetch-head to subprocesses
Fangyi Zhou (1):
rebase: fix capitalisation autoSquash in i18n string
Felipe Contreras (16):
advice: add diverging advice for novices
test: simplify counts aggregation
test: don't print aggregate-results command
object-name: fix quiet @{u} parsing
completion: prompt: use generic colors
doc: remove GNU troff workaround
doc: remove manpage-base-url workaround
doc: asciidoc: remove custom header macro
doc: simplify man version
doc: set actual revdate for manpages
doc: git-checkout: trivial callout cleanup
doc: git-checkout: reorganize examples
doc: remove custom callouts format
doc: manpage: remove maximum title length
doc: doc-diff: specify date
test: rev-parse-upstream: add missing cmp
Glen Choo (10):
config.c: plumb config_source through static fns
config.c: don't assign to "cf_global" directly
config.c: create config_reader and the_reader
config.c: plumb the_reader through callbacks
config.c: remove current_config_kvi
config.c: remove current_parsing_scope
config: report cached filenames in die_bad_number()
config.c: rename "struct config_source cf"
clone: error specifically with --local and symlinked objects
setup: trace bare repository setups
Han Xin (2):
negotiator/default: avoid stack overflow
negotiator/skipping: fix some problems in mark_common()
Jacob Keller (2):
blame: allow --contents to work with non-HEAD commit
blame: use different author name for fake commit generated by --contents
Jeff King (90):
ref-filter: drop unused atom parameter from get_worktree_path()
ls-refs: drop config caching
serve: use repository pointer to get config
serve: mark unused parameters in virtual functions
object-name: mark unused parameters in disambiguate callbacks
http-backend: mark argc/argv unused
http-backend: mark unused parameters in virtual functions
ref-filter: mark unused callback parameters
mark "pointless" data pointers in callbacks
run-command: mark error routine parameters as unused
mark unused parameters in signal handlers
list-objects: mark unused callback parameters
for_each_object: mark unused callback parameters
prio-queue: mark unused parameters in comparison functions
notes: mark unused callback parameters
fetch-pack: mark unused parameter in callback function
rewrite_parents(): mark unused callback parameter
for_each_commit_graft(): mark unused callback parameter
userformat_want_item(): mark unused parameter
run_processes_parallel: mark unused callback parameters
help: mark unused parameter in git_unknown_cmd_config()
fsck: factor out index fsck
fsck: check index files in all worktrees
fsck: mention file path for index errors
fsck: check even zero-entry index files
drop pure pass-through config callbacks
bundle: turn on --all-progress-implied by default
bundle: let "-" mean stdin for reading operations
bundle: document handling of "-" as stdin
parse-options: consistently allocate memory in fix_filename()
parse-options: use prefix_filename_except_for_dash() helper
diff: factor out src/dst prefix setup
t4013: add tests for diff prefix options
diff: add --default-prefix option
format-patch: do not respect diff.noprefix
format-patch: add format.noprefix option
add-patch: handle "* Unmerged path" lines
http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
range-diff: drop useless "offset" variable from read_patches()
http: support CURLOPT_PROTOCOLS_STR
range-diff: handle unterminated lines in read_patches()
range-diff: use ssize_t for parsed "len" in read_patches()
rebase: prefer --default-prefix to --{src,dst}-prefix for format-patch
mailmap: drop debugging code
http: drop unused parameter from start_object_request()
http: mark unused parameter in fill_active_slot() callbacks
transport: mark unused parameters in fetch_refs_from_bundle()
git_connect(): fix corner cases in downgrading v2 to v0
fast-export: drop const when storing anonymized values
fast-export: simplify initialization of anonymized hashmaps
fast-export: factor out anonymized_entry creation
fast-export: de-obfuscate --anonymize-map handling
fast-export: drop data parameter from anonymous generators
fast-export: drop unused parameter from anonymize_commit_message()
Makefile: force -O0 when compiling with SANITIZE=leak
pack-redundant: escalate deprecation warning to an error
docs: document caveats of rev-list's object-name output
fast-import: fix file access when run from subdir
builtins: always pass prefix to parse_options()
builtins: annotate always-empty prefix parameters
builtins: mark unused prefix parameters
mark "argv" as unused when we check argc
t/helper: mark unused argv/argc arguments
parse-options: drop parse_opt_unknown_cb()
pack-redundant: document deprecation
tests: run internal chain-linter under "make test"
tests: replace chainlint subshell with a function
tests: drop here-doc check from internal chain-linter
tests: skip test_eval_ in internal chain-lint
t/lib-httpd: pass PERL_PATH to CGI scripts
v0 protocol: fix infinite loop when parsing multi-valued capabilities
t5512: stop referring to "v1" protocol
v0 protocol: fix sha1/sha256 confusion for capabilities^{}
t5512: add v2 support for "ls-remote --symref" test
t5512: allow any protocol version for filtered symref test
t5512: test "ls-remote --heads --symref" filtering with v0 and v2
v0 protocol: use size_t for capability length/offset
gpg-interface: set trust level of missing key to "undefined"
notes: clean up confusing NULL checks in init_notes()
fetch_bundle_uri(): drop pointless NULL check
t4212: avoid putting git on left-hand side of pipe
parse_commit(): parse timestamp from end of line
parse_commit(): handle broken whitespace-only timestamp
parse_commit(): describe more date-parsing failure modes
doc-diff: drop SOURCE_DATE_EPOCH override
t7001: avoid git on upstream of pipe
t7001: use "ls-files --format" instead of "cut"
t: drop "verbose" helper function
t/lib-httpd: make CGIPassAuth support conditional
Jiang Xin (5):
github-actions: run gcc-8 on ubuntu-20.04 image
ci: remove the pipe after "p4 -V" to catch errors
ci: use the same version of p4 on both Linux and macOS
ci: install python on ubuntu
object-info: init request_info before reading arg
Johannes Schindelin (29):
compat/win32/syslog: fix use-after-realloc
nedmalloc: avoid new compile error
t0033: GETTEXT_POISON fix
t0003: GETTEXT_POISON fix, part 1
t0003: GETTEXT_POISON fix, conclusion
t5619: GETTEXT_POISON fix
t5604: GETTEXT_POISON fix, part 1
t5604: GETTEXT_POISON fix, conclusion
clone.c: avoid "exceeds maximum object size" error with GCC v12.x
split-index & fsmonitor: demonstrate a bug
split-index; stop abusing the `base_oid` to strip the "link" extension
fsmonitor: avoid overriding `cache_changed` bits
unpack-trees: take care to propagate the split-index flag
t3701: we don't need no Perl for `add -i` anymore
t5563: prevent "ambiguous redirect"
apply --reject: overwrite existing `.rej` symlink if it exists
gettext: avoid using gettext if the locale dir is not present
tests: avoid using `test_i18ncmp`
Git 2.31.8
Git 2.32.7
Git 2.33.8
Git 2.34.8
Git 2.35.8
Git 2.36.6
Git 2.37.7
Git 2.38.5
Git 2.39.3
Git 2.40.1
gitk: prevent overly long command lines
John Cai (2):
name-rev: make --stdin hidden
attr: teach "--attr-source=<tree>" global option to "git"
John Keeping (1):
format-patch: output header for empty commits
Josh Soref (1):
subtree: support long global flags
Jouke Witteveen (1):
send-email docs: Remove mention of discontinued gmail feature
Junio C Hamano (33):
gpg-interface: lazily initialize and read the configuration
bundle: don't blindly apply prefix_filename() to "-"
Start the 2.41 cycle
The second batch
am: refer to format-patch in the documentation
The third batch
http.c: clear the 'finished' member once we are done with it
The fourth batch
The fifth batch
The sixth batch
e-mail workflow: Message-ID is spelled with ID in both capital letters
The seventh batch
clone: propagate object-format when cloning from void
The eighth batch
The ninth batch
The tenth batch
The eleventh batch
The twelfth batch
The thirteenth batch
doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
The fourteenth batch
The fifteenth batch
The sixteenth batch
diff: refactor common tail part of dirstat computation
diff: plug leaks in dirstat
t9800: correct misuse of 'show -s --raw' in a test
The seventeenth batch
The eighteenth batch
Git 2.41-rc0
A bit more before -rc1
send-email: clear the $message_id after validation
t9001: mark the script as no longer leak checker clean
Git 2.41-rc1
Kristoffer Haugsbakk (5):
config: tell the user that we expect an ASCII character
doc: interpret-trailers: don’t use heredoc in examples
doc: interpret-trailers: use input redirection
doc: interpret-trailers: don’t use deprecated config
doc: interpret-trailers: fix example
Linus Arver (1):
MyFirstContribution: render literal *
M Hickford (3):
credential/wincred: include wincred.h
credential/wincred: store password_expiry_utc
credential: new attribute oauth_refresh_token
Martin Ågren (2):
gittutorial: drop early mention of origin
gittutorial: wrap literal examples in backticks
Mathias Krause (1):
grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34
Matthew John Cheetham (3):
t5563: add tests for basic and anoymous HTTP access
http: read HTTP WWW-Authenticate response headers
credential: add WWW-Authenticate header to cred requests
Maxim Cournoyer (3):
send-email: extract execute_cmd from recipients_cmd
send-email: add --header-cmd, --no-header-cmd options
send-email: detect empty blank lines in command output
Michael J Gruber (1):
t3070: make chain lint tester happy
Michael Strawbridge (2):
send-email: refactor header generation functions
send-email: expose header information to git-send-email's sendemail-validate hook
Mike Hommey (1):
Handle some compiler versions containing a dash
Nico Rieck (1):
gitk: escape file paths before piping to git log
Oswald Buddenhagen (5):
sequencer: remove pointless rollback_lock_file()
sequencer: rewrite save_head() in terms of write_message()
sequencer: actually translate report in do_exec()
messages: capitalization and punctuation exceptions
t/t3501-revert-cherry-pick.sh: clarify scope of the file
Patrick Steinhardt (27):
receive-pack: fix stale packfile locks when dying
fetch: move reference width calculation into `display_state`
fetch: move output format into `display_state`
fetch: pass the full local reference name to `format_display`
fetch: centralize handling of per-reference format
fetch: centralize logic to print remote URL
fetch: centralize printing of reference updates
commit-graph: fix truncated generation numbers
midx: fix segfault with no packs and invalid preferred pack
repack: fix trying to use preferred pack in alternates
repack: fix generating multi-pack-index with only non-local packs
pack-objects: split out `--stdin-packs` tests into separate file
pack-objects: fix error when packing same pack twice
pack-objects: fix error when same packfile is included and excluded
pack-objects: extend test coverage of `--stdin-packs` with alternates
t/helper: allow chmtime to print verbosely without modifying mtime
repack: honor `-l` when calculating pack geometry
repack: disable writing bitmaps when doing a local repack
fetch: fix `--no-recurse-submodules` with multi-remote fetches
fetch: split out tests for output format
fetch: add a test to exercise invalid output formats
fetch: print left-hand side when fetching HEAD:foo
fetch: refactor calculation of the display table width
fetch: introduce `display_format` enum
fetch: lift up parsing of "fetch.output" config variable
fetch: move option related variables into main function
fetch: introduce machine-parseable "porcelain" output format
Paul Eggert (1):
git-compat-util: use gettimeofday(2) for time(2)
Phillip Wood (8):
wildmatch: fix exponential behavior
wildmatch: avoid undefined behavior
wildmatch: hide internal return values
rebase: stop reading and writing unnecessary strategy state
sequencer: use struct strvec to store merge strategy options
rebase -m: cleanup --strategy-option handling
rebase -m: fix serialization of strategy options
rebase: remove a couple of redundant strategy tests
Raghul Nanth A (1):
describe: enable sparse index for describe
René Scharfe (6):
archive: improve support for running in subdirectory
t5000: use check_mtime()
userdiff: support regexec(3) with multi-byte support
date: remove approxidate_relative()
get-tar-commit-id: use TYPEFLAG_GLOBAL_HEADER instead of magic value
test-ctype: check EOF
Robin Jarry (1):
send-email: export patch counters in validate environment
Rubén Justo (10):
bisect: fix "reset" when branch is checked out elsewhere
worktree: introduce is_shared_symref()
branch: fix die_if_checked_out() when ignore_current_worktree
rebase: refuse to switch to a branch already checked out elsewhere (test)
switch: reject if the branch is already checked out elsewhere (test)
branch: test for failures while renaming branches
branch: use get_worktrees() in copy_or_rename_branch()
branch: description for orphan branch errors
branch: rename orphan branches in any worktree
branch: avoid unnecessary worktrees traversals
SZEDER Gábor (6):
treewide: include parse-options.h in source files
treewide: remove unnecessary inclusions of parse-options.h from headers
parse-options.h: use consistent name for the callback parameters
parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters
parse-options.h: use designated initializers in OPT_* macros
cocci: remove 'unused.cocci'
Shuqi Liang (3):
write-tree: integrate with sparse index
t1092: add tests for `git diff-files`
diff-files: integrate with sparse index
Siddharth Singh (1):
hashmap.h: fix minor typo
Sohom Datta (1):
docs: clarify git rm --cached function in gitignore note
Stanislav Malishevskiy (1):
http: add support for different sslcert and sslkey types.
Tao Klerks (1):
mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
Taylor Blau (37):
commit-graph: introduce `ensure_generations_valid()`
pack-write.c: plug a leak in stage_tmp_packfiles()
t5325: mark as leak-free
pack-revindex: make `load_pack_revindex` take a repository
pack-revindex: introduce GIT_TEST_REV_INDEX_DIE_ON_DISK
pack-revindex: introduce `pack.readReverseIndex`
config: enable `pack.writeReverseIndex` by default
t: invert `GIT_TEST_WRITE_REV_INDEX`
t1300: demonstrate failure when renaming sections with long lines
config: avoid fixed-sized buffer when renaming/deleting a section
config.c: avoid integer truncation in `copy_or_rename_section_in_file()`
config.c: disallow overly-long lines in `copy_or_rename_section_in_file()`
Git 2.30.9
pack-write.c: plug a leak in stage_tmp_packfiles()
builtin/repack.c: fix incorrect reference to '-C'
builtin/gc.c: ignore cruft packs with `--keep-largest-pack`
t/t5304-prune.sh: prepare for `gc --cruft` by default
t/t6501-freshen-objects.sh: prepare for `gc --cruft` by default
t/t6500-gc.sh: refactor cruft pack tests
t/t6500-gc.sh: add additional test cases
t/t9300-fast-import.sh: prepare for `gc --cruft` by default
builtin/gc.c: make `gc.cruftPacks` enabled by default
repository.h: drop unused `gc_cruft_packs`
string-list: multi-delimiter `string_list_split_in_place()`
string-list: introduce `string_list_setlen()`
t/helper/test-hashmap.c: avoid using `strtok()`
t/helper/test-oidmap.c: avoid using `strtok()`
t/helper/test-json-writer.c: avoid using `strtok()`
banned.h: mark `strtok()` and `strtok_r()` as banned
credential.c: store "wwwauth[]" values in `credential_read()`
t/lib-credential.sh: ensure credential helpers handle long headers
contrib/credential: avoid fixed-size buffer in osxkeychain
contrib/credential: remove 'gnome-keyring' credential helper
contrib/credential: .gitignore libsecret build artifacts
contrib/credential: avoid fixed-size buffer in libsecret
contrib/credential: embiggen fixed-size buffer in wincred
run-command.c: fix missing include under `NO_PTHREADS`
Teng Long (1):
push: introduce '--branches' option
William Sprent (2):
builtin/sparse-checkout: remove NEED_WORK_TREE flag
builtin/sparse-checkout: add check-rules command
ZheNing Hu (2):
receive-pack: fix funny ref error messsage
push: allow delete single-level ref
brian m. carlson (1):
upload-pack: advertise capabilities when cloning empty repos
Ævar Arnfjörð Bjarmason (33):
auto-crlf tests: don't lose exit code in loops and outside tests
t/lib-patch-mode.sh: fix ignored exit codes
tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
tests: don't lose "git" exit codes in "! ( git ... | grep )"
tests: don't lose exit status with "test <op> $(git ...)"
tests: don't lose misc "git" exit codes
sequencer.c: fix overflow & segfault in parse_strategy_opts()
cocci: remove dead rule from "the_repository.pending.cocci"
cocci: fix incorrect & verbose "the_repository" rules
cocci: sort "the_repository" rules by header
cocci: add missing "the_repository" macros to "pending"
cocci: apply the "cache.h" part of "the_repository.pending"
cocci: apply the "commit-reach.h" part of "the_repository.pending"
cocci: apply the "commit.h" part of "the_repository.pending"
cocci: apply the "diff.h" part of "the_repository.pending"
cocci: apply the "object-store.h" part of "the_repository.pending"
cocci: apply the "pretty.h" part of "the_repository.pending"
cocci: apply the "packfile.h" part of "the_repository.pending"
cocci: apply the "promisor-remote.h" part of "the_repository.pending"
cocci: apply the "refs.h" part of "the_repository.pending"
cocci: apply the "rerere.h" part of "the_repository.pending"
cocci: apply the "revision.h" part of "the_repository.pending"
post-cocci: adjust comments for recent repo_* migration
libs: use "struct repository *" argument, not "the_repository"
config tests: cover blind spots in git_die_config() tests
config tests: add "NULL" tests for *_get_value_multi()
config API: add and use a "git_config_get()" family of functions
versioncmp.c: refactor config reading next commit
config API: have *_multi() return an "int" and take a "dest"
for-each-repo: error on bad --config
config API users: test for *_get_value_multi() segfaults
config API: add "string" version of *_value_multi(), fix segfaults
for-each-repo: with bad config, don't conflate <path> and <cmd>
Øystein Walle (2):
ref-filter: remove unused ref_format member
branch, for-each-ref, tag: add option to omit empty lines
^ permalink raw reply [relevance 1%]
* What's cooking in git.git (May 2023, #05; Tue, 16)
@ 2023-05-17 0:30 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2023-05-17 0:30 UTC (permalink / raw)
To: git
Here are the topics that have been cooking in my tree. Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a future
release). Commits prefixed with '-' are only in 'seen', and aren't
considered "accepted" at all and may be annotated with an URL to a
message that raises issues but they are no means exhaustive. A
topic without enough support may be discarded after a long period of
no activity.
Git 2.41-rc0 has been tagged. Hopefully we will merge a few more
topics by -rc1 and then go into pre-release feature freeze.
Starting next week, until early June, my availability may be
sporadic, but this time I won't be completely away from the keyboard
to require an interim maintainer.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ar/config-count-tests-updates (2023-04-24) 3 commits
(merged to 'next' on 2023-05-06 at c585a56132)
+ t1300: add tests for missing keys
+ t1300: check stderr for "ignores pairs" tests
+ t1300: drop duplicate test
Test updates.
source: <20230423134649.431783-1-rybak.a.v@gmail.com>
* ar/test-cleanup-unused-file-creation (2023-05-09) 1 commit
(merged to 'next' on 2023-05-09 at 7734f3d690)
+ test: rev-parse-upstream: add missing cmp
Test fix.
source: <20230509000246.1760327-1-felipe.contreras@gmail.com>
* ds/fsck-bitmap (2023-05-02) 2 commits
(merged to 'next' on 2023-05-09 at c2148408a2)
+ fsck: use local repository
+ fsck: verify checksums of all .bitmap files
"git fsck" learned to detect bit-flip breakages in the reachability
bitmap files.
source: <pull.1526.v2.git.1683034042.gitgitgadget@gmail.com>
* ds/merge-tree-use-config (2023-05-10) 1 commit
(merged to 'next' on 2023-05-11 at e0dab53028)
+ merge-tree: load default git config
Allow git forges to disable replace-refs feature while running "git
merge-tree".
source: <pull.1530.git.1683745654800.gitgitgadget@gmail.com>
* fc/doc-use-datestamp-in-commit (2023-05-05) 2 commits
(merged to 'next' on 2023-05-06 at 1eda43b03f)
+ doc-diff: drop SOURCE_DATE_EPOCH override
+ doc: doc-diff: specify date
An earlier change broke "doc-diff", which has been corrected.
source: <20230503232349.59997-1-felipe.contreras@gmail.com>
source: <20230505211610.GA3197168@coredump.intra.peff.net>
* gc/trace-bare-repo-setup (2023-05-01) 1 commit
(merged to 'next' on 2023-05-06 at 72b977d2f9)
+ setup: trace bare repository setups
The tracing mechanism learned to notice and report when
auto-discovered bare repositories are being used, as allowing so
without explicitly stating the user intends to do so (with setting
GIT_DIR for example) can be used with social engineering as an
attack vector.
source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
* jc/dirstat-plug-leaks (2023-05-05) 2 commits
(merged to 'next' on 2023-05-09 at 2df7cf06e4)
+ diff: plug leaks in dirstat
+ diff: refactor common tail part of dirstat computation
(this branch is used by jc/diff-s-with-other-options.)
"git diff --dirstat" leaked memory, which has been plugged.
source: <20230505211917.2746751-1-gitster@pobox.com>
* jc/doc-clarify-git-default-hash-variable (2023-04-26) 1 commit
(merged to 'next' on 2023-05-06 at 7bae4db4cc)
+ doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
The documentation was misleading about the interaction between
GIT_DEFAULT_HASH and "git clone", which has been clarified to
stress that the variable is to be ignored by the command.
source: <xmqqzg6uvfpo.fsf_-_@gitster.g>
* jc/name-rev-deprecate-stdin-further (2023-05-06) 1 commit
(merged to 'next' on 2023-05-09 at 0db4f08e32)
+ name-rev: make --stdin hidden
The "--stdin" option of "git name-rev" has been replaced with
the "--annotate-stdin" option more than a year ago. We stop
advertising it in the "git name-rev -h" output.
source: <pull.1225.v3.git.git.1683346451239.gitgitgadget@gmail.com>
* jc/t9800-fix-use-of-show-s-raw (2023-05-06) 1 commit
(merged to 'next' on 2023-05-09 at f4d7a7d671)
+ t9800: correct misuse of 'show -s --raw' in a test
A test fix.
source: <xmqqild5rvvw.fsf@gitster.g>
* jk/test-verbose-no-more (2023-05-08) 3 commits
(merged to 'next' on 2023-05-09 at 897bfd0a6b)
+ t: drop "verbose" helper function
+ t7001: use "ls-files --format" instead of "cut"
+ t7001: avoid git on upstream of pipe
Retire "verbose" helper function from the test framework.
source: <20230508185953.GA2108869@coredump.intra.peff.net>
* js/gitk-fixes-from-gfw (2023-05-08) 3 commits
(merged to 'next' on 2023-05-08 at adb334deec)
+ Merge gitk changes into js/gitk-fixes-from-gfw
+ gitk: escape file paths before piping to git log
+ gitk: prevent overly long command lines
Gitk updates from GfW project.
source: <pull.1469.git.1674559397.gitgitgadget@gmail.com>
* js/subtree-fully-spelt-quiet-and-debug-options (2023-05-08) 1 commit
(merged to 'next' on 2023-05-10 at 2980db981e)
+ subtree: support long global flags
"git subtree" (in contrib/) update.
source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com>
* kh/doc-interpret-trailers-updates (2023-05-01) 4 commits
(merged to 'next' on 2023-05-06 at 4e9a640131)
+ doc: interpret-trailers: fix example
+ doc: interpret-trailers: don’t use deprecated config
+ doc: interpret-trailers: use input redirection
+ doc: interpret-trailers: don’t use heredoc in examples
Doc update.
source: <cover.1682970213.git.code@khaugsbakk.name>
* mc/send-email-header-cmd (2023-05-01) 3 commits
(merged to 'next' on 2023-05-06 at 04514468b6)
+ send-email: detect empty blank lines in command output
+ send-email: add --header-cmd, --no-header-cmd options
+ send-email: extract execute_cmd from recipients_cmd
"git send-email" learned "--header-cmd=<cmd>" that can inject
arbitrary e-mail header lines to the outgoing messages.
source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
* ps/fetch-output-format (2023-05-10) 9 commits
(merged to 'next' on 2023-05-12 at 4126a008a5)
+ fetch: introduce machine-parseable "porcelain" output format
+ fetch: move option related variables into main function
+ fetch: lift up parsing of "fetch.output" config variable
+ fetch: introduce `display_format` enum
+ fetch: refactor calculation of the display table width
+ fetch: print left-hand side when fetching HEAD:foo
+ fetch: add a test to exercise invalid output formats
+ fetch: split out tests for output format
+ fetch: fix `--no-recurse-submodules` with multi-remote fetches
"git fetch" learned the "--porcelain" option that emits what it did
in a machine-parseable format.
source: <cover.1683721293.git.ps@pks.im>
* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
(merged to 'next' on 2023-05-06 at c61e9b0672)
+ branch: avoid unnecessary worktrees traversals
+ branch: rename orphan branches in any worktree
+ branch: description for orphan branch errors
+ branch: use get_worktrees() in copy_or_rename_branch()
+ branch: test for failures while renaming branches
Error messages given when working on an unborn branch that is
checked out in another worktree have been improved.
source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
* sg/retire-unused-cocci (2023-04-20) 1 commit
(merged to 'next' on 2023-05-12 at 77cc27c837)
+ cocci: remove 'unused.cocci'
Retire a rather expensive-to-run Coccinelle check patch.
source: <20230420205350.600760-1-szeder.dev@gmail.com>
* sl/diff-files-sparse (2023-05-09) 2 commits
(merged to 'next' on 2023-05-12 at 486be95d1b)
+ diff-files: integrate with sparse index
+ t1092: add tests for `git diff-files`
Teach "diff-files" not to expand sparse-index unless needed.
cf. <f51a8d77-c480-f021-38c4-78a9d75cdd11@github.com>
source: <20230509194241.469477-1-cheskaqiqi@gmail.com>
* tl/push-branches-is-an-alias-for-all (2023-05-12) 2 commits
(merged to 'next' on 2023-05-12 at 536aaf0bd9)
+ t5583: fix shebang line
(merged to 'next' on 2023-05-09 at 1d8c3e5dcf)
+ push: introduce '--branches' option
"git push --all" gained an alias "git push --branches".
source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com>
source: <pull.1532.git.1683904156670.gitgitgadget@gmail.com>
--------------------------------------------------
[New Topics]
* cg/doc-http-lowspeed-limit (2023-05-14) 1 commit
- doc/git-config: add unit for http.lowSpeedLimit
Doc update.
Will merge to 'next'.
source: <pull.1507.git.git.1683970203084.gitgitgadget@gmail.com>
* kh/keep-tag-editmsg-upon-failure (2023-05-16) 3 commits
- tag: keep the message file in case ref transaction fails
- t/t7004-tag: add regression test for successful tag creation
- doc: tag: document `TAG_EDITMSG`
"git tag" learned to leave the "$GIT_DIR/TAG_EDITMSG" file when the
command failed, so that the user can salvage what they typed.
Will merge to 'next'.
source: <cover.1684258780.git.code@khaugsbakk.name>
* sa/doc-ls-remote (2023-05-15) 6 commits
- ls-remote doc: document the output format
- ls-remote doc: explain what each example does
- ls-remote doc: show peeled tags in examples
- ls-remote doc: remove redundant --tags example
- show-branch doc: say <ref>, not <reference>
- show-ref doc: update for internal consistency
Doc update.
Expecting a minor and hopefully final reroll.
source: <pull.1471.v3.git.git.1684152793.gitgitgadget@gmail.com>
* tb/refs-exclusion-and-packed-refs (2023-05-15) 16 commits
- ls-refs.c: avoid enumerating hidden refs where possible
- upload-pack.c: avoid enumerating hidden refs where possible
- builtin/receive-pack.c: avoid enumerating hidden references
- refs.h: let `for_each_namespaced_ref()` take excluded patterns
- refs/packed-backend.c: ignore complicated hidden refs rules
- revision.h: store hidden refs in a `strvec`
- refs/packed-backend.c: add trace2 counters for jump list
- refs/packed-backend.c: implement jump lists to avoid excluded pattern(s)
- refs/packed-backend.c: refactor `find_reference_location()`
- refs: plumb `exclude_patterns` argument throughout
- builtin/for-each-ref.c: add `--exclude` option
- ref-filter.c: parameterize match functions over patterns
- ref-filter: add `ref_filter_clear()`
- ref-filter: clear reachable list pointers after freeing
- ref-filter.h: provide `REF_FILTER_INIT`
- refs.c: rename `ref_filter`
Enumerating refs in the packed-refs file, while excluding refs that
match certain patterns, has been optimized.
Will merge to 'next'?
source: <cover.1684178576.git.me@ttaylorr.com>
* zh/ls-files-format-atoms (2023-05-14) 2 commits
- ls-files: add %(objectsize) atom to format option
- ls-files: add %(objecttype) atom to format option
Some atoms that can be used in "--format=<format>" for "git ls-tree"
were not supported by "git ls-files", even though they were relevant
in the context of the latter.
source: <pull.1533.git.1683969100.gitgitgadget@gmail.com>
* jc/do-not-negate-test-helpers (2023-05-16) 3 commits
- test: do not negate test_path_is_* to assert absense
- t2021: do not negate test_path_is_dir
- tests: do not negate test_path_exists
Small fixes.
Will merge to 'next'.
source: <20230516022646.648123-1-gitster@pobox.com>
* tb/run-command-needs-alloc-h (2023-05-16) 1 commit
(merged to 'next' on 2023-05-16 at b87f41e99e)
+ run-command.c: fix missing include under `NO_PTHREADS`
Fix the build problem with NO_PTHREADS defined, a fallout from
recent header file shuffling.
Will merge to 'master'.
source: <ZGP2tw0USsj9oecZ@nand.local>
--------------------------------------------------
[Stalled]
* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
- fsmonitor: handle differences between Windows named pipe functions
Fix fsmonitor on Windows when the filesystem path contains certain
characters.
Expecting a reroll.
cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
* rn/sparse-diff-index (2023-04-10) 1 commit
- diff-index: enable sparse index
"git diff-index" command has been taught to work better with the
sparse index.
Expecting a reroll.
cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>
source: <20230408112342.404318-1-nanth.raghul@gmail.com>
* ja/worktree-orphan (2023-04-17) 8 commits
- worktree add: emit warn when there is a bad HEAD
- worktree add: extend DWIM to infer --orphan
- worktree add: introduce "try --orphan" hint
- worktree add: add --orphan flag
- t2400: add tests to verify --quiet
- t2400: refactor "worktree add" opt exclusion tests
- t2400: print captured git output when finished
- worktree add: include -B in usage docs
'git worktree add' learned how to create a worktree based on an
orphaned branch with `--orphan`.
Expecting a reroll.
cf. <m7crhly2j3k76whydbtdwhvzghvoql436g3lqtst4v3ahv75aa@wq5zjepgrxz5>
source: <20230417093255.31079-1-jacobabel@nullpo.dev>
* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
- usage: clarify --recurse-submodules as a boolean
The "--[no-]recurse-submodules" option of "git checkout" and others
supported an undocumented syntax --recurse-submodules=<value> where
the value can spell a Boolean in various ways. The support for the
syntax is being dropped.
Expecting a reroll.
cf. <ZDSTFwMFO7vbj/du@google.com>
source: <ZDSTFwMFO7vbj/du@google.com>
* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
- pack-bitmap.c: factor out `bitmap_index_seek_commit()`
- pack-bitmap.c: use `bitmap_index_seek()` where possible
- pack-bitmap.c: factor out manual `map_pos` manipulation
- pack-bitmap.c: drop unnecessary 'inline's
- pack-bitmap.c: hide bitmap internals in `read_be32()`
- pack-bitmap.c: hide bitmap internals in `read_u8()`
Clean-up the pack-bitmap codepath.
Kicked back to 'seen' out of 'next'.
There is a BUG() on data errors that needs to be fixed.
source: <cover.1679342296.git.me@ttaylorr.com>
* cb/checkout-same-branch-twice (2023-03-22) 2 commits
- SQUASH??? the test marked to expect failure passes from day one
- checkout/switch: disallow checking out same branch in multiple worktrees
"git checkout -B $branch" failed to protect against checking out
a branch that is checked out elsewhere, unlike "git branch -f" did.
Expecting a hopefully minor and final reroll.
cf. <CAPUEspj_Bh+LgYLnWfeBdcq_uV5Cbou-7H51GLFjzSa5Qzby9w@mail.gmail.com>
source: <20230120113553.24655-1-carenas@gmail.com>
* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
- pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
In an advice message after failed non-ff pull, we used to suggest
setting pull.rebase=true, but these days pull.rebase=merges may be
more inline with the original spirit of "rebuild your side on top
of theirs".
May want to discard.
This is too much of a departure from the existing practice.
cf. <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@mail.gmail.com>
cf. <CABPp-BGqAxKnxDRVN4cYMteLp33hvto07R3=TJBT5WubJT4+Og@mail.gmail.com>
source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
* ab/tag-object-type-errors (2023-05-10) 4 commits
- tag: don't emit potentially incorrect "object is a X, not a Y"
- tag: don't misreport type of tagged objects in errors
- object tests: add test for unexpected objects in tags
- Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
Hardening checks around mismatched object types when one of those
objects is a tag.
source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
- test-lib: allow storing counts with test harnesses
Allow summary results from tests to be written to t/test-results
directory even when a test harness like 'prove' is in use.
Expecting a reroll.
cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
source: <20221224225200.1027806-1-adam@dinwoodie.org>
* so/diff-merges-more (2022-12-18) 5 commits
- diff-merges: improve --diff-merges documentation
- diff-merges: issue warning on lone '-m' option
- diff-merges: support list of values for --diff-merges
- diff-merges: implement log.diffMerges-m-imply-p config
- diff-merges: implement [no-]hide option and log.diffMergesHide config
Assorted updates to "--diff-merges=X" option.
May want to discard.
Breaking compatibility does not seem worth it.
source: <20221217132955.108542-1-sorganov@gmail.com>
* ab/imap-send-requires-curl (2023-02-02) 6 commits
- imap-send: correctly report "host" when using "tunnel"
- imap-send: remove old --no-curl codepath
- imap-send: make --curl no-optional
- imap-send: replace auto-probe libcurl with hard dependency
- imap-send doc: the imap.sslVerify is used with imap.tunnel
- imap-send: note "auth_method", not "host" on auth method failure
Give a hard dependency on cURL library to build "git imap-send",
and remove the code to interact with IMAP server without using cURL.
Expecting a reroll.
The 'tunnel' part is still iffy.
cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com>
source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
* cw/submodule-status-in-parallel (2023-03-02) 6 commits
- diff-lib: parallelize run_diff_files for submodules
- diff-lib: refactor out diff_change logic
- submodule: refactor is_submodule_modified()
- submodule: move status parsing into function
- submodule: rename strbuf variable
- run-command: add on_stderr_output_fn to run_processes_parallel_opts
"git submodule status" learned to run the comparison in submodule
repositories in parallel.
Expecting a reroll.
cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@mail.gmail.com>
cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com>
source: <20230302215237.1473444-1-calvinwan@google.com>
--------------------------------------------------
[Cooking]
* tc/cat-file-z-use-cquote (2023-05-10) 1 commit
- cat-file: quote-format name in error when using -z
"cat-file" in the batch mode that is fed NUL-terminated pathnames
learned to cquote them in its error output (otherwise, a funny
pathname with LF in it would break the lines in the output stream).
Redesign.
source: <20230510190116.795641-2-toon@iotcl.com>
* js/rebase-count-fixes (2023-05-14) 2 commits
- rebase -r: fix the total number shown in the progress
- rebase --update-refs: fix loops
A few bugs in the sequencer machinery that results in miscounting
the steps have been corrected.
Will merge to 'next'.
source: <pull.1531.v2.git.1683965487.gitgitgadget@gmail.com>
* en/header-split-cache-h-part-3 (2023-05-16) 29 commits
- fsmonitor-ll.h: split this header out of fsmonitor.h
- hash-ll, hashmap: move oidhash() to hash-ll
- object-store-ll.h: split this header out of object-store.h
- khash: name the structs that khash declares
- merge-ll: rename from ll-merge
- git-compat-util.h: remove unneccessary include of wildmatch.h
- builtin.h: remove unneccessary includes
- list-objects-filter-options.h: remove unneccessary include
- diff.h: remove unnecessary include of oidset.h
- repository: remove unnecessary include of path.h
- log-tree: replace include of revision.h with simple forward declaration
- cache.h: remove this no-longer-used header
- read-cache*.h: move declarations for read-cache.c functions from cache.h
- repository.h: move declaration of the_index from cache.h
- merge.h: move declarations for merge.c from cache.h
- diff.h: move declaration for global in diff.c from cache.h
- preload-index.h: move declarations for preload-index.c from elsewhere
- sparse-index.h: move declarations for sparse-index.c from cache.h
- name-hash.h: move declarations for name-hash.c from cache.h
- run-command.h: move declarations for run-command.c from cache.h
- statinfo: move stat_{data,validity} functions from cache/read-cache
- read-cache: move shared add/checkout/commit code
- add: modify add_files_to_cache() to avoid globals
- read-cache: move shared commit and ls-files code
- setup: adopt shared init-db & clone code
- init-db, clone: change unnecessary global into passed parameter
- init-db: remove unnecessary global variable
- init-db: document existing bug with core.bare in template config
- Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
Header files cleanup.
source: <pull.1525.v3.git.1684218848.gitgitgadget@gmail.com>
* la/doc-interpret-trailers (2023-05-11) 9 commits
- doc: trailer: add more examples in DESCRIPTION
- doc: trailer: mention 'key' in DESCRIPTION
- doc: trailer.<token>.command: emphasize deprecation
- doc: trailer: use angle brackets for <token> and <value>
- doc: trailer: remove redundant phrasing
- doc: trailer: examples: avoid the word "message" by itself
- doc: trailer: drop "commit message part" phrasing
- doc: trailer: swap verb order
- doc: trailer: fix grammar
Doc update.
On hold. Looking good.
Want to be rebased once kh/doc-interpret-trailers-updates lands.
source: <pull.1506.v2.git.git.1683839975.gitgitgadget@gmail.com>
* cc/git-replay (2023-05-09) 16 commits
- SQUASH???
- replay: stop assuming replayed branches do not diverge
- replay: add --contained to rebase contained branches
- replay: add --advance or 'cherry-pick' mode
- replay: disallow revision specific options and pathspecs
- replay: use standard revision ranges
- replay: make it a minimal server side command
- replay: remove HEAD related sanity check
- replay: remove progress and info output
- replay: add an important FIXME comment about gpg signing
- replay: don't simplify history
- replay: introduce pick_regular_commit()
- replay: die() instead of failing assert()
- replay: start using parse_options API
- replay: introduce new builtin
- t6429: remove switching aspects of fast-rebase
source: <20230509175347.1714141-1-christian.couder@gmail.com>
* jc/pack-ref-exclude-include (2023-05-12) 3 commits
- pack-refs: teach pack-refs --include option
- pack-refs: teach --exclude option to exclude refs from being packed
- docs: clarify git-pack-refs --all will pack all refs
"git pack-refs" learns "--include" and "--exclude" to tweak the ref
hierarchy to be packed using pattern matching.
Will merge to 'next'?
source: <pull.1501.v4.git.git.1683927282.gitgitgadget@gmail.com>
* tb/gc-recent-object-hook (2023-05-15) 2 commits
- gc: introduce `gc.recentObjectsHook`
- reachable.c: extract `obj_is_recent()`
"git pack-objects" learned to invoke a new hook program that
enumerates extra objects to be used as anchoring points to keep
otherwise unreachable objects in cruft packs.
source: <cover.1684196634.git.me@ttaylorr.com>
* jc/diff-s-with-other-options (2023-05-05) 1 commit
- diff: fix interaction between the "-s" option and other options
The "-s" (silent, squelch) option of the "diff" family of commands
did not interact with other options that specify the output format
well. This has been cleaned up so that it will clear all the
formatting options given before.
Will merge to 'next'?
source: <20230505165952.335256-1-gitster@pobox.com>
* ob/revert-of-revert (2023-05-05) 1 commit
- sequencer: beautify subject of reverts of reverts
Instead of "Revert "Revert "original"", give "Reapply "original""
as the title for a revert of a revert.
Expecting a hopefully final reroll.
Looking much better, except for minor cosmetic issues.
source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
* jc/attr-source-tree (2023-05-06) 1 commit
(merged to 'next' on 2023-05-10 at cb94f4fba6)
+ attr: teach "--attr-source=<tree>" global option to "git"
"git --attr-source=<tree> cmd $args" is a new way to have any
command to read attributes not from the working tree but from the
given tree object.
Will merge to 'master'.
source: <pull.1470.v6.git.git.1683346530487.gitgitgadget@gmail.com>
* bc/clone-empty-repo-via-protocol-v0 (2023-05-01) 1 commit
- upload-pack: advertise capabilities when cloning empty repos
Expecting a minor and hopefully final update.
cf. <20230501224038.GA1174291@coredump.intra.peff.net>
source: <20230501170018.1410567-2-sandals@crustytoothpaste.net>
* cw/strbuf-cleanup (2023-05-12) 7 commits
(merged to 'next' on 2023-05-15 at 31d08296f2)
+ strbuf: remove global variable
+ strbuf: clarify dependency
+ path: move related function to path
+ object-name: move related functions to object-name
+ credential-store: move related functions to credential-store file
+ abspath: move related functions to abspath
+ strbuf: clarify API boundary
Move functions that are not about pure string manipulation out of
strbuf.[ch]
Will merge to 'master'.
source: <20230512171429.2202982-1-calvinwan@google.com>
* tl/notes-separator (2023-04-28) 6 commits
(merged to 'next' on 2023-05-06 at 598ed19c9b)
+ notes.c: introduce "--[no-]stripspace" option
+ notes.c: append separator instead of insert by pos
+ notes.c: introduce '--separator=<paragraph-break>' option
+ t3321: add test cases about the notes stripspace behavior
+ notes.c: use designated initializers for clarity
+ notes.c: cleanup 'strbuf_grow' call in 'append_edit'
'git notes append' was taught '--separator' to specify string to insert
between paragraphs.
Will merge to 'master'.
source: <cover.1682671758.git.dyroneteng@gmail.com>
* pw/rebase-i-after-failure (2023-04-21) 6 commits
- rebase -i: fix adding failed command to the todo list
- rebase: fix rewritten list for failed pick
- rebase --continue: refuse to commit after failed command
- sequencer: factor out part of pick_commits()
- rebase -i: remove patch file after conflict resolution
- rebase -i: move unlink() calls
Various fixes to the behaviour of "rebase -i" when the command got
interrupted by conflicting changes.
Expecting a reroll.
cf. <xmqqsfcthrpb.fsf@gitster.g>
cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
* sl/sparse-write-tree-part-2 (2023-05-08) 1 commit
- t1092: update a write-tree test
Fix-up to a topic already graduated to 'master'.
Will merge to 'next'?
source: <20230508202140.464363-1-cheskaqiqi@gmail.com>
* tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits
- pack-bitmap.c: use commit boundary during bitmap traversal
- pack-bitmap.c: extract `fill_in_bitmap()`
- object: add object_array initializer helper function
The object traversal using reachability bitmap done by
"pack-object" has been tweaked to take advantage of the fact that
using "boundary" commits as representative of all the uninteresting
ones can save quite a lot of object enumeration.
source: <cover.1683567065.git.me@ttaylorr.com>
* gc/doc-cocci-updates (2023-04-27) 2 commits
- cocci: codify authoring and reviewing practices
- cocci: add headings to and reword README
Update documentation regarding Coccinelle patches.
Will merge to 'next'?
source: <pull.1495.v2.git.git.1682634143.gitgitgadget@gmail.com>
* pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits
(merged to 'next' on 2023-04-20 at 2728a01622)
+ completion: complete AUTO_MERGE
+ Documentation: document AUTO_MERGE
+ git-merge.txt: modernize word choice in "True merge" section
+ completion: complete REVERT_HEAD and BISECT_HEAD
+ revisions.txt: document more special refs
Document more pseudo-refs and teach the command line completion
machinery to complete AUTO_MERGE.
On hold, waiting for a fix-up.
cf. <a10648d5-8cba-4c7c-a303-b5b0dcdd3310@gmail.com>
source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
* mh/credential-password-expiry-libsecret (2023-05-05) 1 commit
(merged to 'next' on 2023-05-09 at fd898e3756)
+ credential/libsecret: support password_expiry_utc
The libsecret credential helper learns to handle the password
expiry time information.
On hold.
The database gets littered with entries whose expiration dates only differ.
cf. <CAGJzqskMwOJkriH6serqdwAVYi+fftEL8ohJd-suP6v+OxB_bg@mail.gmail.com>
source: <pull.1469.v3.git.git.1683270298313.gitgitgadget@gmail.com>
--------------------------------------------------
[Discarded]
* ed/fsmonitor-inotify (2022-12-13) 6 commits
. fsmonitor: update doc for Linux
. fsmonitor: test updates
. fsmonitor: enable fsmonitor for Linux
. fsmonitor: implement filesystem change listener for Linux
. fsmonitor: determine if filesystem is local or remote
. fsmonitor: prepare to share code between Mac OS and Linux
Bundled fsmonitor for Linux using inotify API.
Seems to break asan job at CI when merged to 'seen'.
cf. <xmqqzg7d8xn2.fsf@gitster.g>
source: <pull.1352.v5.git.git.1670882286.gitgitgadget@gmail.com>
* my/wildmatch-cleanups (2023-02-27) 5 commits
. wildmatch: more cleanups after killing uchar
. wildmatch: use char instead of uchar
. wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring
. wildmatch: remove IS*() macros
. git-compat-util: add isblank() and isgraph()
Code clean-up.
Discarded without prejudice after more than 6 weeks of inactivity.
source: <20230226115021.1681834-1-masahiroy@kernel.org>
* cw/forbid-use-of-gitlink-outside-submodules (2023-02-28) 6 commits
. add: reject nested repositories
. tests: remove duplicate .gitmodules path
. tests: use `git submodule add` and fix expected status
. tests: use `git submodule add` and fix expected diffs
. tests: Use `git submodule add` instead of `git add`
. t4041, t4060: modernize test style
Forbid "git add dir" from adding a gitlink to the index.
Discarded without prejudice after more than 6 weeks of inactivity.
source: <20230228185253.2356546-1-calvinwan@google.com>
* nw/for-each-ref-signature (2023-03-13) 1 commit
. ref-filter: add new "signature" atom
"git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)"
placeholder and friends.
Breaks CI.
cf. <xmqqpm9bosjw.fsf@gitster.g>
source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
* fc/asciidoc-code-block-hack (2023-05-04) 2 commits
. doc: manpage: remove ancient workaround
. doc: git-svn: use listing instead of verse
Documentation toolchain lost an ancient workaround that is no
longer needed.
The contributor is no longer with the project.
source: <20230504035517.329765-1-felipe.contreras@gmail.com>
* fc/doc-revisions-markup-fix (2023-05-04) 2 commits
. doc: revisions: add a bunch of missing quotes
. doc: revisions: fix missing escape
Doc cleanup.
The contributor is no longer with the project.
source: <20230504163421.100400-1-felipe.contreras@gmail.com>
^ permalink raw reply [relevance 1%]
* [ANNOUNCE] Git v2.41.0-rc0
@ 2023-05-16 3:42 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2023-05-16 3:42 UTC (permalink / raw)
To: git; +Cc: Linux Kernel, git-packagers
An early preview release Git v2.41.0-rc0 is now available for
testing at the usual places. It is comprised of 507 non-merge
commits since v2.40.0, contributed by 74 people, 23 of which are
new faces [*].
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.41.0-rc0' tag and the 'master' branch that the tag points at:
url = https://git.kernel.org/pub/scm/git/git
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.40.0 are as follows.
Welcome to the Git development community!
Adam Johnson, André Baptista, Andy Koppe, Clement Mabileau,
Cristian Le, Daniel Watson, D. Ben Knoble, Edwin Kofler, Jonas
Haag, Jouke Witteveen, Matthias Görgens, Maxim Cournoyer,
Michael Henry, Michael Strawbridge, Nico Rieck, Raghul Nanth
A, Rolf Eike Beer, Shuqi Liang, Siddharth Singh, Stanislav
Malishevskiy, Stephane Odul, Vítor Pinho, and Xin Xing.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Ævar Arnfjörð Bjarmason, Alex Henrie, Andreas Schwab, Andrei
Rybak, Beat Bolli, Derrick Stolee, Elijah Newren, Emily Shaffer,
Eric Sunshine, Eric Wong, Fangyi Zhou, Felipe Contreras, Glen
Choo, Han Xin, Jacob Keller, Jeff King, Jiang Xin, Joakim
Petersen, Johannes Schindelin, Johannes Sixt, John Cai, John
Keeping, Josh Soref, Junio C Hamano, Kristoffer Haugsbakk, Linus
Arver, Linus Torvalds, Martin Ågren, Mathias Krause, Matthew
John Cheetham, M Hickford, Michael J Gruber, Mike Hommey, Oswald
Buddenhagen, Øystein Walle, Patrick Steinhardt, Paul Eggert,
Philippe Blain, Phillip Wood, René Scharfe, Robin Jarry,
Rubén Justo, RyotaK, Sohom Datta, SZEDER Gábor, Tao Klerks,
Taylor Blau, Teng Long, Torsten Bögershausen, William Sprent,
and ZheNing Hu.
[*] We are counting not just the authorship contribution but issue
reporting, mentoring, helping and reviewing that are recorded in
the commit trailers.
----------------------------------------------------------------
Git v2.41 Release Notes (draft)
===============================
UI, Workflows & Features
* Allow information carried on the WWW-AUthenticate header to be
passed to the credential helpers.
* A new "fetch.hideRefs" option can be used to exclude specified refs
from "rev-list --objects --stdin --not --all" traversal for
checking object connectivity, most useful when there are many
unrelated histories in a single repository.
* "git push" has been taught to allow deletion of refs with one-level
names to help repairing a repository who acquired such a ref by
mistake. In general, we don't encourage use of such a ref, and
creation or update to such a ref is rejected as before.
* Allow "git bisect reset" to check out the original branch when the
branch is already checked out in a different worktree linked to the
same repository.
* A few subcommands have been taught to stop users from working on a
branch that is being used in another worktree linked to the same
repository.
* "git format-patch" learned to write a log-message only output file
for empty commits.
* "git format-patch" honors the src/dst prefixes set to nonstandard
values with configuration variables like "diff.noprefix", causing
receiving end of the patch that expects the standard -p1 format to
break. "format-patch" has been taught to ignore end-user configuration
and always use the standard prefixes.
This is a backward compatibility breaking change.
* Lift the limitation that colored prompts can only be used with
PROMPT_COMMAND mode.
* "git blame --contents=<file> <rev> -- <path>" used to be forbidden,
but now it finds the origins of lines starting at <file> contents
through the history that leads to <rev>.
* "git pack-redundant" gave a warning when run, as the command has
outlived its usefulness long ago and is nominated for future
removal. Now we escalate to give an error.
* "git clone" from an empty repository learned to propagate the
choice of the hash algorithm from the source repository to the
newly created repository.
* "git mergetool" and "git difftool" learns a new configuration
guiDefault to optionally favor configured guitool over non-gui-tool
automatically when $DISPLAY is set.
* "git branch -d origin/master" would say "no such branch", but it is
likely a missed "-r" if refs/remotes/origin/master exists. The
command has been taught to give such a hint in its error message.
* Clean-up of the code path that deals with merge strategy option
handling in "git rebase".
* "git clone --local" stops copying from an original repository that
has symbolic links inside its $GIT_DIR; an error message when that
happens has been updated.
* "git branch --format=..." and "git format-patch --format=..."
learns "--omit-empty" to hide refs that whose formatting result
becomes an empty string from the output.
* The sendemail-validate validate hook learned to pass the total
number of input files and where in the sequence each invocation is
via environment variables.
* When "gc" needs to retain unreachable objects, packing them into
cruft packs (instead of exploding them into loose object files) has
been offered as a more efficient option for some time. Now the use
of cruft packs has been made the default and no longer considered
an experimental feature.
* The output given by "git blame" that attributes a line to contents
taken from the file specified by the "--contents" option shows it
differently from a line attributed to the working tree file.
* "git send-email" learned to give the e-mail headers to the validate
hook by passing an extra argument from the command line.
* The credential subsystem learns to help OAuth framework.
* The titles of manual pages used to be chomped at an unreasonably
short limit, which has been removed.
* Error messages given when working on an unborn branch that is
checked out in another worktree have been improved.
* The documentation was misleading about the interaction between
GIT_DEFAULT_HASH and "git clone", which has been clarified to
stress that the variable is to be ignored by the command.
* "git send-email" learned "--header-cmd=<cmd>" that can inject
arbitrary e-mail header lines to the outgoing messages.
* "git fsck" learned to detect bit-flip breakages in the reachability
bitmap files.
* The "--stdin" option of "git name-rev" has been replaced with
the "--annotate-stdin" option more than a year ago. We stop
advertising it in the "git name-rev -h" output.
* "git push --all" gained an alias "git push --branches".
* "git fetch" learned the "--porcelain" option that emits what it did
in a machine-parseable format.
Performance, Internal Implementation, Development Support etc.
* Code clean-up to clarify directory traversal API.
* Code clean-up to clarify the rule that "git-compat-util.h" must be
the first to be included.
* More work towards -Wunused.
* Instead of forcing each command to choose to honor GPG related
configuration variables, make the subsystem lazily initialize
itself.
* Remove workaround for ancient versions of DocBook to make it work
correctly with groff, which has not been necessary since docbook
1.76 from 2010.
* Code clean-up to include and/or uninclude parse-options.h file as
needed.
* The code path that reports what "git fetch" did to each ref has
been cleaned up.
* Assorted config API updates.
* A few configuration variables to tell the cURL library that
different types of ssl-cert and ssl-key are in use have been added.
* Split key function and data structure definitions out of cache.h to
new header files and adjust the users.
* "git fetch --all" does not have to download and handle the same
bundleURI over and over, which has been corrected.
* "git sparse-checkout" command learns a debugging aid for the sparse
rule definitions.
* "git write-tree" learns to work better with sparse-index.
* The on-disk reverse index that allows mapping from the pack offset
to the object name for the object stored at the offset has been
enabled by default.
* "git fsck" learned to validate the on-disk pack reverse index files.
* strtok() and strtok_r() are banned in this codebase.
* The detect-compilers script to help auto-tweaking the build system
had trouble working with compilers whose version number has extra
suffixes. The script has been taught that certain suffixes (like
"-win32" in "gcc 10-win32") can be safely stripped as they share
the same features and bugs with the version without the suffix.
* ctype tests have been taught to test EOF, too.
* The implementation of credential helpers used fgets() over fixed
size buffers to read protocol messages, causing the remainder of
the folded long line to trigger unexpected behaviour, which has
been corrected.
* The implementation of the default "negotiator", used to find common
ancestor over the network for object tranfer, used to be recursive;
it was updated to be iterative to conserve stackspace usage.
* Our custom callout formatter is no longer used in the documentation
formatting toolchain, as the upstream default ones give better
output these days.
* The tracing mechanism learned to notice and report when
auto-discovered bare repositories are being used, as allowing so
without explicitly stating the user intends to do so (with setting
GIT_DIR for example) can be used with social engineering as an
attack vector.
* "git diff-files" learned not to expand sparse-index unless needed.
Fixes since v2.40
-----------------
* "git fsck" learned to check the index files in other worktrees,
just like "git gc" honors them as anchoring points.
(merge 8d3e7eac52 jk/fsck-indices-in-worktrees later to maint).
* Fix a segfaulting loop. The function and its caller may need
further clean-up.
(merge c5773dc078 ew/commit-reach-clean-up-flags-fix later to maint).
* "git restore" supports options like "--ours" that are only
meaningful during a conflicted merge, but these options are only
meaningful when updating the working tree files. These options are
marked to be incompatible when both "--staged" and "--worktree" are
in effect.
(merge ee8a88826a ak/restore-both-incompatible-with-conflicts later to maint).
* Simplify UI to control progress meter given by "git bundle" command.
(merge 8b95521edb jk/bundle-progress later to maint).
* "git bundle" learned that "-" is a common way to say that the input
comes from the standard input and/or the output goes to the
standard output. It used to work only for output and only from the
root level of the working tree.
(merge 0bbe10313e jk/bundle-use-dash-for-stdfiles later to maint).
* Once we start running, we assumed that the list of alternate object
databases would never change. Hook into the machinery used to
update the list of packfiles during runtime to update this list as
well.
(merge e2d003dbed ds/reprepare-alternates-when-repreparing-packfiles later to maint).
* The code to parse "git rebase -X<opt>" was not prepared to see an
unparsable option string, which has been corrected.
(merge 15a4cc912e ab/fix-strategy-opts-parsing later to maint).
* "git add -p" while the index is unmerged sometimes failed to parse
the diff output it internally produces and died, which has been
corrected.
(merge 28d1122f9c jk/add-p-unmerged-fix later to maint).
* Fix for a "ls-files --format="%(path)" that produced nonsense
output, which was a bug in 2.38.
(merge cfb62dd006 aj/ls-files-format-fix later to maint).
* "git receive-pack" that responds to "git push" requests failed to
clean a stale lockfile when killed in the middle, which has been
corrected.
(merge c55c30669c ps/receive-pack-unlock-before-die later to maint).
* "git rev-parse --quiet foo@{u}", or anything that asks @{u} to be
parsed with GET_OID_QUIETLY option, did not quietly fail, which has
been corrected.
(merge dfbfdc521d fc/oid-quietly-parse-upstream later to maint).
* Transports that do not support protocol v2 did not correctly fall
back to protocol v0 under certain conditions, which has been
corrected.
(merge eaa0fd6584 jk/fix-proto-downgrade-to-v0 later to maint).
* time(2) on glib 2.31+, especially on Linux, goes out of sync with
higher resolution timers used for gettimeofday(2) and by the
filesystem. Replace all calls to it with a git_time() wrapper and
(merge 370ddcbc89 pe/time-use-gettimeofday later to maint).
* Code clean-up to use designated initializers in parse-options API.
(merge 353e6d4554 sg/parse-options-h-initializers later to maint).
* A recent-ish change to allow unicode character classes to be used
with "grep -P" triggered a JIT bug in older pcre2 libraries.
The problematic change in Git built with these older libraries has
been disabled to work around the bug.
(merge 14b9a04479 mk/workaround-pcre-jit-ucp-bug later to maint).
* The wildmatch library code unlearns exponential behaviour it
acquired some time ago since it was borrowed from rsync.
(merge 3dc0b7f0dc pw/wildmatch-fixes later to maint).
* The index files can become corrupt under certain conditions when
the split-index feature is in use, especially together with
fsmonitor, which have been corrected.
(merge 061dd722dc js/split-index-fixes later to maint).
* Document what the pathname-looking strings in "rev-list --object"
output are for and what they mean.
(merge 15364d2a3c jk/document-rev-list-object-name later to maint).
* Fix unnecessary truncation of generation numbers used in-core.
(merge d3af1c193d ps/ahead-behind-truncation-fix later to maint).
* Code clean-up around the use of the_repository.
(merge 4a93b899c1 ab/remove-implicit-use-of-the-repository later to maint).
* Consistently spell "Message-ID" as such, not "Message-Id".
(merge ba4324c4e1 jc/spell-id-in-both-caps-in-message-id later to maint).
* Correct use of an uninitialized structure member.
(merge dc12ee77ab jx/cap-object-info-uninitialized-fix later to maint).
* Tests had a few places where we ignored PERL_PATH and blindly used
/usr/bin/perl, which have been corrected.
(merge c1917156a0 jk/use-perl-path-consistently later to maint).
* Documentation mark-up fix.
(merge 78b6369e67 la/mfc-markup-fix later to maint).
* Doc toolchain update to remove old workaround for AsciiDoc.
(merge 8806120de6 fc/remove-header-workarounds-for-asciidoc later to maint).
* The userdiff regexp patterns for various filetypes that are built
into the system have been updated to avoid triggering regexp errors
from UTF-8 aware regex engines.
(merge be39144954 rs/userdiff-multibyte-regex later to maint).
* The approxidate() API has been simplified by losing an extra
function that did the same thing as another one.
(merge 8a7f0b666f rs/remove-approxidate-relative later to maint).
* Code clean-up to replace a hardcoded constant with a CPP macro.
(merge c870de6502 rs/get-tar-commit-id-use-defined-const later to maint).
* Doc build simplification.
(merge 9a09ed3229 fc/doc-stop-using-manversion later to maint).
* "git archive" run from a subdirectory mishandled attributes and
paths outside the current directory.
(merge 92b1dd1b9e rs/archive-from-subdirectory-fixes later to maint).
* The code to parse capability list for v0 on-wire protocol fell into
an infinite loop when a capability appears multiple times, which
has been corrected.
* Geometric repacking ("git repack --geometric=<n>") in a repository
that borrows from an alternate object database had various corner
case bugs, which have been corrected.
(merge d85cd18777 ps/fix-geom-repack-with-alternates later to maint).
* The "%GT" placeholder for the "--format" option of "git log" and
friends caused BUG() to trigger on a commit signed with an unknown
key, which has been corrected.
(merge 7891e46585 jk/gpg-trust-level-fix later to maint).
* The completion script used to use bare "read" without the "-r"
option to read the contents of various state files, which risked
getting confused with backslashes in them. This has been
corrected.
(merge 197152098a ek/completion-use-read-r-to-read-literally later to maint).
* A small API fix to the ort merge strategy backend.
(merge 000c4ceca7 en/ort-finalize-after-0-merges-fix later to maint).
* The commit object parser has been taught to be a bit more lenient
to parse timestamps on the author/committer line with a malformed
author/committer ident.
(merge 90ef0f14eb jk/parse-commit-with-malformed-ident later to maint).
* Retitle a test script with an overly narrow name.
(merge 8bb19c14fb ob/t3501-retitle later to maint).
* Doc update to clarify how text and eol attributes interact to
specify the end-of-line conversion.
(merge 6696077ace ah/doc-attributes-text later to maint).
* Gitk updates from GfW project.
(merge 99e70f3077 js/gitk-fixes-from-gfw later to maint).
* "git diff --dirstat" leaked memory, which has been plugged.
(merge 83973981eb jc/dirstat-plug-leaks later to maint).
* "git merge-tree" reads the basic configuration, which can be used
by git forges to disable replace-refs feature.
(merge b6551feadf ds/merge-tree-use-config later to maint).
* Other code cleanup, docfix, build fix, etc.
(merge f7111175df as/doc-markup-fix later to maint).
(merge 90ff7c9898 fc/test-aggregation-clean-up later to maint).
(merge 9b0c7f308a jc/am-doc-refer-to-format-patch later to maint).
(merge b10cbdac4c bb/unicode-width-table-15 later to maint).
(merge 3457b50e8c ab/retire-scripted-add-p later to maint).
(merge d52fcf493b ds/p2000-fix-grep-sparse later to maint).
(merge ec063d2591 ss/hashmap-typofix later to maint).
(merge 1aaed69d11 rs/archive-mtime later to maint).
(merge 2da2cc9b28 ob/rollback-after-commit-lock-failure later to maint).
(merge 54dbd0933b ob/sequencer-save-head-simplify later to maint).
(merge a93cbe8d78 ar/test-cleanup-unused-file-creation later to maint).
(merge cc48ddd937 jk/chainlint-fixes later to maint).
(merge 4833b08426 ow/ref-format-remove-unused-member later to maint).
(merge d0ea2ca1cf dw/doc-submittingpatches-grammofix later to maint).
(merge fd72637423 ar/t2024-checkout-output-fix later to maint).
(merge d45cbe3fe0 ob/sequencer-i18n-fix later to maint).
(merge b734fe49fd ob/messages-capitalize-exception later to maint).
(merge ad353d7e77 ma/gittutorial-fixes later to maint).
(merge a5855fd8d4 ar/test-cleanup-unused-file-creation-part2 later to maint).
(merge 0c5308af30 sd/doc-gitignore-and-rm-cached later to maint).
(merge cbb83daeaf kh/doc-interpret-trailers-updates later to maint).
(merge 3d77fbb664 ar/config-count-tests-updates later to maint).
(merge b7cf25c8f4 jc/t9800-fix-use-of-show-s-raw later to maint).
----------------------------------------------------------------
Changes since v2.40.0 are as follows:
Adam Johnson (1):
ls-files: fix "--format" output of relative paths
Alex Henrie (5):
rebase: add documentation and test for --no-rebase-merges
rebase: deprecate --rebase-merges=""
rebase: add a config option for --rebase-merges
format-patch: correct documentation of --thread without an argument
docs: rewrite the documentation of the text and eol attributes
Andreas Schwab (1):
git-merge-tree.txt: replace spurious HTML entity
Andrei Rybak (19):
t1005: assert output of ls-files
t1006: assert error output of cat-file
t1010: don't create unused files
t1302: don't create unused file
t1400: assert output of update-ref
t1404: don't create unused file
t1507: assert output of rev-parse
t3060: fix mention of function prune_index
t2107: fix mention of the_index.cache_changed
t2024: fix loose/strict local base branch DWIM test
t1300: drop duplicate test
t1300: check stderr for "ignores pairs" tests
t1300: add tests for missing keys
t0300: don't create unused file
t1300: fix config file syntax error descriptions
t1300: don't create unused files
t1450: don't create unused files
t1502: don't create unused files
t2019: don't create unused files
Andy Koppe (1):
restore: fault --staged --worktree with merge opts
Beat Bolli (1):
unicode: update the width tables to Unicode 15
Clement Mabileau (1):
branch: improve error log on branch not found by checking remotes refs
Daniel Watson (1):
SubmittingPatches: clarify MUA discussion with "the"
Derrick Stolee (19):
object-file: reprepare alternates when necessary
for-each-ref: add --stdin option
for-each-ref: explicitly test no matches
commit-graph: refactor compute_topological_levels()
commit-graph: simplify compute_generation_numbers()
commit-graph: return generation from memory
commit-reach: implement ahead_behind() logic
for-each-ref: add ahead-behind format atom
commit-reach: add tips_reachable_from_bases()
p2000: remove stray '--sparse' flag from test
fetch: download bundles once, even with --all
ci: update 'static-analysis' to Ubuntu 22.04
fsck: create scaffolding for rev-index checks
fsck: check rev-index checksums
fsck: check rev-index position values
fsck: validate .rev file header
fsck: verify checksums of all .bitmap files
fsck: use local repository
merge-tree: load default git config
Edwin Kofler (1):
completion: suppress unwanted unescaping of `read`
Elijah Newren (94):
treewide: ensure one of the appropriate headers is sourced first
treewide: remove unnecessary git-compat-util.h includes in headers
treewide: remove unnecessary cache.h includes
treewide: remove unnecessary cache.h includes in source files
alloc.h: move ALLOC_GROW() functions from cache.h
hash.h: move some oid-related declarations from cache.h
hex.h: move some hex-related declarations from cache.h
cache.h: remove dependence on hex.h; make other files include it explicitly
pretty.h: move has_non_ascii() declaration from commit.h
ident.h: move ident-related declarations out of cache.h
object.h: stop depending on cache.h; make cache.h depend on object.h
dir.h: refactor to no longer need to include cache.h
object-store.h: move struct object_info from cache.h
replace-object.h: move read_replace_refs declaration from cache.h to here
treewide: replace cache.h with more direct headers, where possible
Remove unnecessary includes of builtin.h
diff.h: remove unnecessary include of object.h
t2021: fix platform-specific leftover cruft
unpack-trees: heed requests to overwrite ignored files
dir: separate public from internal portion of dir_struct
dir: add a usage note to exclude_per_dir
dir: mark output only fields of dir_struct as such
unpack-trees: clean up some flow control
sparse-checkout: avoid using internal API of unpack-trees
sparse-checkout: avoid using internal API of unpack-trees, take 2
unpack_trees: start splitting internal fields from public API
unpack-trees: mark fields only used internally as internal
unpack-trees: rewrap a few overlong lines from previous patch
unpack-trees: special case read-tree debugging as internal usage
unpack-trees: add usage notices around df_conflict_entry
treewide: remove unnecessary cache.h inclusion from a few headers
treewide: be explicit about dependence on gettext.h
treewide: remove unnecessary inclusion of gettext.h
treewide: remove unnecessary cache.h inclusion from several sources
environment: move comment_line_char from cache.h
abspath.h: move absolute path functions from cache.h
cache.h: remove expand_user_path()
path.h: move function declarations for path.c functions from cache.h
wrapper.h: move declarations for wrapper.c functions from cache.h
treewide: remove unnecessary includes of cache.h
environment.h: move declarations for environment.c functions from cache.h
treewide: remove cache.h inclusion due to environment.h changes
setup.h: move declarations for setup.c functions from cache.h
treewide: remove cache.h inclusion due to setup.h changes
write-or-die.h: move declarations for write-or-die.c functions from cache.h
csum-file.h: remove unnecessary inclusion of cache.h
treewide: be explicit about dependence on trace.h & trace2.h
treewide: be explicit about dependence on advice.h
treewide: be explicit about dependence on convert.h
treewide: be explicit about dependence on pack-revindex.h
treewide: be explicit about dependence on oid-array.h
treewide: be explicit about dependence on mem-pool.h
treewide: remove unnecessary cache.h inclusion
object-name.h: move declarations for object-name.c functions from cache.h
treewide: remove cache.h inclusion due to object-name.h changes
git-zlib: move declarations for git-zlib functions from cache.h
treewide: remove cache.h inclusion due to git-zlib changes
object-file.h: move declarations for object-file.c functions from cache.h
treewide: remove cache.h inclusion due to object-file.h changes
object.h: move some inline functions and defines from cache.h
treewide: remove cache.h inclusion due to object.h changes
editor: move editor-related functions and declarations into common file
treewide: remove cache.h inclusion due to editor.h changes
pager.h: move declarations for pager.c functions from cache.h
treewide: remove cache.h inclusion due to pager.h changes
cache.h: remove unnecessary includes
treewide: remove double forward declaration of read_in_full
treewide: reduce includes of cache.h in other headers
mailmap, quote: move declarations of global vars to correct unit
protocol.h: move definition of DEFAULT_GIT_PORT from cache.h
treewide: be explicit about dependence on strbuf.h
symlinks.h: move declarations for symlinks.c functions from cache.h
packfile.h: move pack_window and pack_entry from cache.h
server-info.h: move declarations for server-info.c functions from cache.h
copy.h: move declarations for copy.c functions from cache.h
base85.h: move declarations for base85.c functions from cache.h
pkt-line.h: move declarations for pkt-line.c functions from cache.h
match-trees.h: move declarations for match-trees.c functions from cache.h
ws.h: move declarations for ws.c functions from cache.h
versioncmp.h: move declarations for versioncmp.c functions from cache.h
dir.h: move DTYPE defines from cache.h
tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
hash-ll.h: split out of hash.h to remove dependency on repository.h
cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
cache,tree: move basic name compare functions from read-cache to tree
treewide: remove cache.h inclusion due to previous changes
cache.h: remove unnecessary headers
fsmonitor: reduce includes of cache.h
commit.h: reduce unnecessary includes
object-store.h: reduce unnecessary includes
diff.h: reduce unnecessary includes
reftable: ensure git-compat-util.h is the first (indirect) include
merge-ort: fix calling merge_finalize() with no intermediate merge
t5583: fix shebang line
Emily Shaffer (1):
mailmap: change primary address for Emily Shaffer
Eric Sunshine (1):
tests: diagnose unclosed here-doc in chainlint.pl
Eric Wong (3):
commit-reach: avoid NULL dereference
fetch: support hideRefs to speed up connectivity checks
fetch: pass --no-write-fetch-head to subprocesses
Fangyi Zhou (1):
rebase: fix capitalisation autoSquash in i18n string
Felipe Contreras (16):
advice: add diverging advice for novices
test: simplify counts aggregation
test: don't print aggregate-results command
object-name: fix quiet @{u} parsing
completion: prompt: use generic colors
doc: remove GNU troff workaround
doc: remove manpage-base-url workaround
doc: asciidoc: remove custom header macro
doc: simplify man version
doc: set actual revdate for manpages
doc: git-checkout: trivial callout cleanup
doc: git-checkout: reorganize examples
doc: remove custom callouts format
doc: manpage: remove maximum title length
doc: doc-diff: specify date
test: rev-parse-upstream: add missing cmp
Glen Choo (10):
config.c: plumb config_source through static fns
config.c: don't assign to "cf_global" directly
config.c: create config_reader and the_reader
config.c: plumb the_reader through callbacks
config.c: remove current_config_kvi
config.c: remove current_parsing_scope
config: report cached filenames in die_bad_number()
config.c: rename "struct config_source cf"
clone: error specifically with --local and symlinked objects
setup: trace bare repository setups
Han Xin (2):
negotiator/default: avoid stack overflow
negotiator/skipping: fix some problems in mark_common()
Jacob Keller (2):
blame: allow --contents to work with non-HEAD commit
blame: use different author name for fake commit generated by --contents
Jeff King (89):
ref-filter: drop unused atom parameter from get_worktree_path()
ls-refs: drop config caching
serve: use repository pointer to get config
serve: mark unused parameters in virtual functions
object-name: mark unused parameters in disambiguate callbacks
http-backend: mark argc/argv unused
http-backend: mark unused parameters in virtual functions
ref-filter: mark unused callback parameters
mark "pointless" data pointers in callbacks
run-command: mark error routine parameters as unused
mark unused parameters in signal handlers
list-objects: mark unused callback parameters
for_each_object: mark unused callback parameters
prio-queue: mark unused parameters in comparison functions
notes: mark unused callback parameters
fetch-pack: mark unused parameter in callback function
rewrite_parents(): mark unused callback parameter
for_each_commit_graft(): mark unused callback parameter
userformat_want_item(): mark unused parameter
run_processes_parallel: mark unused callback parameters
help: mark unused parameter in git_unknown_cmd_config()
fsck: factor out index fsck
fsck: check index files in all worktrees
fsck: mention file path for index errors
fsck: check even zero-entry index files
drop pure pass-through config callbacks
bundle: turn on --all-progress-implied by default
bundle: let "-" mean stdin for reading operations
bundle: document handling of "-" as stdin
parse-options: consistently allocate memory in fix_filename()
parse-options: use prefix_filename_except_for_dash() helper
diff: factor out src/dst prefix setup
t4013: add tests for diff prefix options
diff: add --default-prefix option
format-patch: do not respect diff.noprefix
format-patch: add format.noprefix option
add-patch: handle "* Unmerged path" lines
http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
range-diff: drop useless "offset" variable from read_patches()
http: support CURLOPT_PROTOCOLS_STR
range-diff: handle unterminated lines in read_patches()
range-diff: use ssize_t for parsed "len" in read_patches()
rebase: prefer --default-prefix to --{src,dst}-prefix for format-patch
mailmap: drop debugging code
http: drop unused parameter from start_object_request()
http: mark unused parameter in fill_active_slot() callbacks
transport: mark unused parameters in fetch_refs_from_bundle()
git_connect(): fix corner cases in downgrading v2 to v0
fast-export: drop const when storing anonymized values
fast-export: simplify initialization of anonymized hashmaps
fast-export: factor out anonymized_entry creation
fast-export: de-obfuscate --anonymize-map handling
fast-export: drop data parameter from anonymous generators
fast-export: drop unused parameter from anonymize_commit_message()
Makefile: force -O0 when compiling with SANITIZE=leak
pack-redundant: escalate deprecation warning to an error
docs: document caveats of rev-list's object-name output
fast-import: fix file access when run from subdir
builtins: always pass prefix to parse_options()
builtins: annotate always-empty prefix parameters
builtins: mark unused prefix parameters
mark "argv" as unused when we check argc
t/helper: mark unused argv/argc arguments
parse-options: drop parse_opt_unknown_cb()
pack-redundant: document deprecation
tests: run internal chain-linter under "make test"
tests: replace chainlint subshell with a function
tests: drop here-doc check from internal chain-linter
tests: skip test_eval_ in internal chain-lint
t/lib-httpd: pass PERL_PATH to CGI scripts
v0 protocol: fix infinite loop when parsing multi-valued capabilities
t5512: stop referring to "v1" protocol
v0 protocol: fix sha1/sha256 confusion for capabilities^{}
t5512: add v2 support for "ls-remote --symref" test
t5512: allow any protocol version for filtered symref test
t5512: test "ls-remote --heads --symref" filtering with v0 and v2
v0 protocol: use size_t for capability length/offset
gpg-interface: set trust level of missing key to "undefined"
notes: clean up confusing NULL checks in init_notes()
fetch_bundle_uri(): drop pointless NULL check
t4212: avoid putting git on left-hand side of pipe
parse_commit(): parse timestamp from end of line
parse_commit(): handle broken whitespace-only timestamp
parse_commit(): describe more date-parsing failure modes
doc-diff: drop SOURCE_DATE_EPOCH override
t7001: avoid git on upstream of pipe
t7001: use "ls-files --format" instead of "cut"
t: drop "verbose" helper function
Jiang Xin (5):
github-actions: run gcc-8 on ubuntu-20.04 image
ci: remove the pipe after "p4 -V" to catch errors
ci: use the same version of p4 on both Linux and macOS
ci: install python on ubuntu
object-info: init request_info before reading arg
Johannes Schindelin (29):
compat/win32/syslog: fix use-after-realloc
nedmalloc: avoid new compile error
t0033: GETTEXT_POISON fix
t0003: GETTEXT_POISON fix, part 1
t0003: GETTEXT_POISON fix, conclusion
t5619: GETTEXT_POISON fix
t5604: GETTEXT_POISON fix, part 1
t5604: GETTEXT_POISON fix, conclusion
clone.c: avoid "exceeds maximum object size" error with GCC v12.x
split-index & fsmonitor: demonstrate a bug
split-index; stop abusing the `base_oid` to strip the "link" extension
fsmonitor: avoid overriding `cache_changed` bits
unpack-trees: take care to propagate the split-index flag
t3701: we don't need no Perl for `add -i` anymore
t5563: prevent "ambiguous redirect"
apply --reject: overwrite existing `.rej` symlink if it exists
gettext: avoid using gettext if the locale dir is not present
tests: avoid using `test_i18ncmp`
Git 2.31.8
Git 2.32.7
Git 2.33.8
Git 2.34.8
Git 2.35.8
Git 2.36.6
Git 2.37.7
Git 2.38.5
Git 2.39.3
Git 2.40.1
gitk: prevent overly long command lines
John Cai (1):
name-rev: make --stdin hidden
John Keeping (1):
format-patch: output header for empty commits
Josh Soref (1):
subtree: support long global flags
Jouke Witteveen (1):
send-email docs: Remove mention of discontinued gmail feature
Junio C Hamano (29):
gpg-interface: lazily initialize and read the configuration
bundle: don't blindly apply prefix_filename() to "-"
Start the 2.41 cycle
The second batch
am: refer to format-patch in the documentation
The third batch
http.c: clear the 'finished' member once we are done with it
The fourth batch
The fifth batch
The sixth batch
e-mail workflow: Message-ID is spelled with ID in both capital letters
The seventh batch
clone: propagate object-format when cloning from void
The eighth batch
The ninth batch
The tenth batch
The eleventh batch
The twelfth batch
The thirteenth batch
doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
The fourteenth batch
The fifteenth batch
The sixteenth batch
diff: refactor common tail part of dirstat computation
diff: plug leaks in dirstat
t9800: correct misuse of 'show -s --raw' in a test
The seventeenth batch
The eighteenth batch
Git 2.41-rc0
Kristoffer Haugsbakk (5):
config: tell the user that we expect an ASCII character
doc: interpret-trailers: don’t use heredoc in examples
doc: interpret-trailers: use input redirection
doc: interpret-trailers: don’t use deprecated config
doc: interpret-trailers: fix example
Linus Arver (1):
MyFirstContribution: render literal *
M Hickford (3):
credential/wincred: include wincred.h
credential/wincred: store password_expiry_utc
credential: new attribute oauth_refresh_token
Martin Ågren (2):
gittutorial: drop early mention of origin
gittutorial: wrap literal examples in backticks
Mathias Krause (1):
grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34
Matthew John Cheetham (3):
t5563: add tests for basic and anoymous HTTP access
http: read HTTP WWW-Authenticate response headers
credential: add WWW-Authenticate header to cred requests
Maxim Cournoyer (3):
send-email: extract execute_cmd from recipients_cmd
send-email: add --header-cmd, --no-header-cmd options
send-email: detect empty blank lines in command output
Michael J Gruber (1):
t3070: make chain lint tester happy
Michael Strawbridge (2):
send-email: refactor header generation functions
send-email: expose header information to git-send-email's sendemail-validate hook
Mike Hommey (1):
Handle some compiler versions containing a dash
Nico Rieck (1):
gitk: escape file paths before piping to git log
Oswald Buddenhagen (5):
sequencer: remove pointless rollback_lock_file()
sequencer: rewrite save_head() in terms of write_message()
sequencer: actually translate report in do_exec()
messages: capitalization and punctuation exceptions
t/t3501-revert-cherry-pick.sh: clarify scope of the file
Patrick Steinhardt (27):
receive-pack: fix stale packfile locks when dying
fetch: move reference width calculation into `display_state`
fetch: move output format into `display_state`
fetch: pass the full local reference name to `format_display`
fetch: centralize handling of per-reference format
fetch: centralize logic to print remote URL
fetch: centralize printing of reference updates
commit-graph: fix truncated generation numbers
midx: fix segfault with no packs and invalid preferred pack
repack: fix trying to use preferred pack in alternates
repack: fix generating multi-pack-index with only non-local packs
pack-objects: split out `--stdin-packs` tests into separate file
pack-objects: fix error when packing same pack twice
pack-objects: fix error when same packfile is included and excluded
pack-objects: extend test coverage of `--stdin-packs` with alternates
t/helper: allow chmtime to print verbosely without modifying mtime
repack: honor `-l` when calculating pack geometry
repack: disable writing bitmaps when doing a local repack
fetch: fix `--no-recurse-submodules` with multi-remote fetches
fetch: split out tests for output format
fetch: add a test to exercise invalid output formats
fetch: print left-hand side when fetching HEAD:foo
fetch: refactor calculation of the display table width
fetch: introduce `display_format` enum
fetch: lift up parsing of "fetch.output" config variable
fetch: move option related variables into main function
fetch: introduce machine-parseable "porcelain" output format
Paul Eggert (1):
git-compat-util: use gettimeofday(2) for time(2)
Phillip Wood (8):
wildmatch: fix exponential behavior
wildmatch: avoid undefined behavior
wildmatch: hide internal return values
rebase: stop reading and writing unnecessary strategy state
sequencer: use struct strvec to store merge strategy options
rebase -m: cleanup --strategy-option handling
rebase -m: fix serialization of strategy options
rebase: remove a couple of redundant strategy tests
Raghul Nanth A (1):
describe: enable sparse index for describe
René Scharfe (6):
archive: improve support for running in subdirectory
t5000: use check_mtime()
userdiff: support regexec(3) with multi-byte support
date: remove approxidate_relative()
get-tar-commit-id: use TYPEFLAG_GLOBAL_HEADER instead of magic value
test-ctype: check EOF
Robin Jarry (1):
send-email: export patch counters in validate environment
Rubén Justo (10):
bisect: fix "reset" when branch is checked out elsewhere
worktree: introduce is_shared_symref()
branch: fix die_if_checked_out() when ignore_current_worktree
rebase: refuse to switch to a branch already checked out elsewhere (test)
switch: reject if the branch is already checked out elsewhere (test)
branch: test for failures while renaming branches
branch: use get_worktrees() in copy_or_rename_branch()
branch: description for orphan branch errors
branch: rename orphan branches in any worktree
branch: avoid unnecessary worktrees traversals
SZEDER Gábor (6):
treewide: include parse-options.h in source files
treewide: remove unnecessary inclusions of parse-options.h from headers
parse-options.h: use consistent name for the callback parameters
parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters
parse-options.h: use designated initializers in OPT_* macros
cocci: remove 'unused.cocci'
Shuqi Liang (3):
write-tree: integrate with sparse index
t1092: add tests for `git diff-files`
diff-files: integrate with sparse index
Siddharth Singh (1):
hashmap.h: fix minor typo
Sohom Datta (1):
docs: clarify git rm --cached function in gitignore note
Stanislav Malishevskiy (1):
http: add support for different sslcert and sslkey types.
Tao Klerks (1):
mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
Taylor Blau (36):
commit-graph: introduce `ensure_generations_valid()`
pack-write.c: plug a leak in stage_tmp_packfiles()
t5325: mark as leak-free
pack-revindex: make `load_pack_revindex` take a repository
pack-revindex: introduce GIT_TEST_REV_INDEX_DIE_ON_DISK
pack-revindex: introduce `pack.readReverseIndex`
config: enable `pack.writeReverseIndex` by default
t: invert `GIT_TEST_WRITE_REV_INDEX`
t1300: demonstrate failure when renaming sections with long lines
config: avoid fixed-sized buffer when renaming/deleting a section
config.c: avoid integer truncation in `copy_or_rename_section_in_file()`
config.c: disallow overly-long lines in `copy_or_rename_section_in_file()`
Git 2.30.9
pack-write.c: plug a leak in stage_tmp_packfiles()
builtin/repack.c: fix incorrect reference to '-C'
builtin/gc.c: ignore cruft packs with `--keep-largest-pack`
t/t5304-prune.sh: prepare for `gc --cruft` by default
t/t6501-freshen-objects.sh: prepare for `gc --cruft` by default
t/t6500-gc.sh: refactor cruft pack tests
t/t6500-gc.sh: add additional test cases
t/t9300-fast-import.sh: prepare for `gc --cruft` by default
builtin/gc.c: make `gc.cruftPacks` enabled by default
repository.h: drop unused `gc_cruft_packs`
string-list: multi-delimiter `string_list_split_in_place()`
string-list: introduce `string_list_setlen()`
t/helper/test-hashmap.c: avoid using `strtok()`
t/helper/test-oidmap.c: avoid using `strtok()`
t/helper/test-json-writer.c: avoid using `strtok()`
banned.h: mark `strtok()` and `strtok_r()` as banned
credential.c: store "wwwauth[]" values in `credential_read()`
t/lib-credential.sh: ensure credential helpers handle long headers
contrib/credential: avoid fixed-size buffer in osxkeychain
contrib/credential: remove 'gnome-keyring' credential helper
contrib/credential: .gitignore libsecret build artifacts
contrib/credential: avoid fixed-size buffer in libsecret
contrib/credential: embiggen fixed-size buffer in wincred
Teng Long (1):
push: introduce '--branches' option
William Sprent (2):
builtin/sparse-checkout: remove NEED_WORK_TREE flag
builtin/sparse-checkout: add check-rules command
ZheNing Hu (2):
receive-pack: fix funny ref error messsage
push: allow delete single-level ref
Ævar Arnfjörð Bjarmason (33):
auto-crlf tests: don't lose exit code in loops and outside tests
t/lib-patch-mode.sh: fix ignored exit codes
tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
tests: don't lose "git" exit codes in "! ( git ... | grep )"
tests: don't lose exit status with "test <op> $(git ...)"
tests: don't lose misc "git" exit codes
sequencer.c: fix overflow & segfault in parse_strategy_opts()
cocci: remove dead rule from "the_repository.pending.cocci"
cocci: fix incorrect & verbose "the_repository" rules
cocci: sort "the_repository" rules by header
cocci: add missing "the_repository" macros to "pending"
cocci: apply the "cache.h" part of "the_repository.pending"
cocci: apply the "commit-reach.h" part of "the_repository.pending"
cocci: apply the "commit.h" part of "the_repository.pending"
cocci: apply the "diff.h" part of "the_repository.pending"
cocci: apply the "object-store.h" part of "the_repository.pending"
cocci: apply the "pretty.h" part of "the_repository.pending"
cocci: apply the "packfile.h" part of "the_repository.pending"
cocci: apply the "promisor-remote.h" part of "the_repository.pending"
cocci: apply the "refs.h" part of "the_repository.pending"
cocci: apply the "rerere.h" part of "the_repository.pending"
cocci: apply the "revision.h" part of "the_repository.pending"
post-cocci: adjust comments for recent repo_* migration
libs: use "struct repository *" argument, not "the_repository"
config tests: cover blind spots in git_die_config() tests
config tests: add "NULL" tests for *_get_value_multi()
config API: add and use a "git_config_get()" family of functions
versioncmp.c: refactor config reading next commit
config API: have *_multi() return an "int" and take a "dest"
for-each-repo: error on bad --config
config API users: test for *_get_value_multi() segfaults
config API: add "string" version of *_value_multi(), fix segfaults
for-each-repo: with bad config, don't conflate <path> and <cmd>
Øystein Walle (2):
ref-filter: remove unused ref_format member
branch, for-each-ref, tag: add option to omit empty lines
^ permalink raw reply [relevance 1%]
* What's cooking in git.git (May 2023, #04; Thu, 11)
@ 2023-05-12 0:39 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2023-05-12 0:39 UTC (permalink / raw)
To: git
Here are the topics that have been cooking in my tree. Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a future
release). Commits prefixed with '-' are only in 'seen', and aren't
considered "accepted" at all and may be annotated with an URL to a
message that raises issues but they are no means exhaustive. A
topic without enough support may be discarded after a long period of
no activity.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[New Topics]
* js/rebase-count-fixes (2023-05-10) 2 commits
- rebase -r: fix the total number shown in the progress
- rebase --update-refs: fix loops
A few bugs in the sequencer machinery that results in miscounting
the steps have been corrected.
Waiting for responses to reviews.
cf. <b481d212-89c5-5c8e-c99f-6df3909523c7@gmail.com>
source: <pull.1531.git.1683759338.gitgitgadget@gmail.com>
* ds/merge-tree-use-config (2023-05-10) 1 commit
(merged to 'next' on 2023-05-11 at e0dab53028)
+ merge-tree: load default git config
Allow git forges to disable replace-refs feature while running "git
merge-tree".
Will merge to 'master'.
source: <pull.1530.git.1683745654800.gitgitgadget@gmail.com>
--------------------------------------------------
[Graduated to 'master']
* ah/doc-attributes-text (2023-05-03) 1 commit
(merged to 'next' on 2023-05-04 at 121c97817e)
+ docs: rewrite the documentation of the text and eol attributes
Doc update to clarify how text and eol attributes interact to
specify the end-of-line conversion.
source: <20230503044656.221175-2-alexhenrie24@gmail.com>
* ar/test-cleanup-unused-file-creation-part2 (2023-05-03) 6 commits
(merged to 'next' on 2023-05-03 at 185f0ec195)
+ t2019: don't create unused files
+ t1502: don't create unused files
+ t1450: don't create unused files
+ t1300: don't create unused files
+ t1300: fix config file syntax error descriptions
+ t0300: don't create unused file
Test cleanup.
cf. <CABPp-BFCBPTBc9savP13gNFmBo_WCnZHUv_Z8bWE6T6GZOrs-Q@mail.gmail.com>
source: <20230417191044.909094-1-rybak.a.v@gmail.com>
* fc/doc-drop-custom-callout-format (2023-05-03) 1 commit
(merged to 'next' on 2023-05-04 at c2fd654367)
+ doc: remove custom callouts format
Our custom callout formatter is no longer used in the documentation
formatting toolchain, as the upstream default ones give better
output these days.
source: <20230418011828.47851-1-felipe.contreras@gmail.com>
* fc/doc-man-lift-title-length-limit (2023-05-03) 1 commit
(merged to 'next' on 2023-05-04 at d048eb1ef8)
+ doc: manpage: remove maximum title length
The titles of manual pages used to be chomped at an unreasonably
short limit, which has been removed.
source: <20230503171658.8996-1-felipe.contreras@gmail.com>
* hx/negotiator-non-recursive (2023-04-26) 2 commits
(merged to 'next' on 2023-05-02 at 64f97cc72d)
+ negotiator/skipping: fix some problems in mark_common()
+ negotiator/default: avoid stack overflow
The implementation of the default "negotiator", used to find common
ancestor over the network for object tranfer, used to be recursive;
it was updated to be iterative to conserve stackspace usage.
cf. <9ad5f246-e21f-0a13-1a53-1ae3307c3f0e@github.com>
source: <cover.1682513384.git.hanxin.hx@bytedance.com>
* ma/gittutorial-fixes (2023-04-20) 2 commits
(merged to 'next' on 2023-05-02 at bf96011972)
+ gittutorial: wrap literal examples in backticks
+ gittutorial: drop early mention of origin
Doc fixes.
source: <cover.1681579244.git.martin.agren@gmail.com>
* mh/credential-oauth-refresh-token (2023-04-21) 1 commit
(merged to 'next' on 2023-05-04 at 9ade4aa024)
+ credential: new attribute oauth_refresh_token
The credential subsystem learns to help OAuth framework.
source: <pull.1394.v2.git.1682070479816.gitgitgadget@gmail.com>
* mh/credential-password-expiry-wincred (2023-04-03) 1 commit
(merged to 'next' on 2023-05-06 at 51aae61f60)
+ credential/wincred: store password_expiry_utc
Teach the recently invented "password expiry time" trait to the
wincred credential helper.
cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com>
* mh/use-wincred-from-system (2023-03-27) 1 commit
(merged to 'next' on 2023-05-06 at a545c5d4aa)
+ credential/wincred: include wincred.h
Code clean-up.
cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de>
cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
* ms/send-email-feed-header-to-validate-hook (2023-04-19) 2 commits
(merged to 'next' on 2023-05-03 at ba7079bcd4)
+ send-email: expose header information to git-send-email's sendemail-validate hook
+ send-email: refactor header generation functions
"git send-email" learned to give the e-mail headers to the validate
hook by passing an extra argument from the command line.
source: <20230419202703.2911836-1-michael.strawbridge@amd.com>
* rs/test-ctype-eof (2023-05-02) 1 commit
(merged to 'next' on 2023-05-02 at a19201a6a9)
+ test-ctype: check EOF
ctype tests have been taught to test EOF, too.
source: <1dbbd7ce-2b3f-6f88-f902-1d4ffe62e259@web.de>
* sd/doc-gitignore-and-rm-cached (2023-05-03) 1 commit
(merged to 'next' on 2023-05-04 at a4b1b128d6)
+ docs: clarify git rm --cached function in gitignore note
Doc update.
source: <pull.862.v3.git.git.1683150400953.gitgitgadget@gmail.com>
* tb/credential-long-lines (2023-05-01) 7 commits
(merged to 'next' on 2023-05-02 at f027002b92)
+ contrib/credential: embiggen fixed-size buffer in wincred
+ contrib/credential: avoid fixed-size buffer in libsecret
+ contrib/credential: .gitignore libsecret build artifacts
+ contrib/credential: remove 'gnome-keyring' credential helper
+ contrib/credential: avoid fixed-size buffer in osxkeychain
+ t/lib-credential.sh: ensure credential helpers handle long headers
+ credential.c: store "wwwauth[]" values in `credential_read()`
The implementation of credential helpers used fgets() over fixed
size buffers to read protocol messages, causing the remainder of
the folded long line to trigger unexpected behaviour, which has
been corrected.
source: <cover.1682956419.git.me@ttaylorr.com>
--------------------------------------------------
[Stalled]
* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
- fsmonitor: handle differences between Windows named pipe functions
Fix fsmonitor on Windows when the filesystem path contains certain
characters.
Expecting a reroll.
cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
* rn/sparse-diff-index (2023-04-10) 1 commit
- diff-index: enable sparse index
"git diff-index" command has been taught to work better with the
sparse index.
Expecting a reroll.
cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>
source: <20230408112342.404318-1-nanth.raghul@gmail.com>
* ja/worktree-orphan (2023-04-17) 8 commits
- worktree add: emit warn when there is a bad HEAD
- worktree add: extend DWIM to infer --orphan
- worktree add: introduce "try --orphan" hint
- worktree add: add --orphan flag
- t2400: add tests to verify --quiet
- t2400: refactor "worktree add" opt exclusion tests
- t2400: print captured git output when finished
- worktree add: include -B in usage docs
'git worktree add' learned how to create a worktree based on an
orphaned branch with `--orphan`.
Expecting a reroll.
cf. <m7crhly2j3k76whydbtdwhvzghvoql436g3lqtst4v3ahv75aa@wq5zjepgrxz5>
source: <20230417093255.31079-1-jacobabel@nullpo.dev>
* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
- usage: clarify --recurse-submodules as a boolean
The "--[no-]recurse-submodules" option of "git checkout" and others
supported an undocumented syntax --recurse-submodules=<value> where
the value can spell a Boolean in various ways. The support for the
syntax is being dropped.
Expecting a reroll.
cf. <ZDSTFwMFO7vbj/du@google.com>
source: <ZDSTFwMFO7vbj/du@google.com>
* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
- pack-bitmap.c: factor out `bitmap_index_seek_commit()`
- pack-bitmap.c: use `bitmap_index_seek()` where possible
- pack-bitmap.c: factor out manual `map_pos` manipulation
- pack-bitmap.c: drop unnecessary 'inline's
- pack-bitmap.c: hide bitmap internals in `read_be32()`
- pack-bitmap.c: hide bitmap internals in `read_u8()`
Clean-up the pack-bitmap codepath.
Kicked back to 'seen' out of 'next'.
There is a BUG() on data errors that needs to be fixed.
source: <cover.1679342296.git.me@ttaylorr.com>
* cb/checkout-same-branch-twice (2023-03-22) 2 commits
- SQUASH??? the test marked to expect failure passes from day one
- checkout/switch: disallow checking out same branch in multiple worktrees
"git checkout -B $branch" failed to protect against checking out
a branch that is checked out elsewhere, unlike "git branch -f" did.
Expecting a hopefully minor and final reroll.
cf. <CAPUEspj_Bh+LgYLnWfeBdcq_uV5Cbou-7H51GLFjzSa5Qzby9w@mail.gmail.com>
source: <20230120113553.24655-1-carenas@gmail.com>
* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
- pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
In an advice message after failed non-ff pull, we used to suggest
setting pull.rebase=true, but these days pull.rebase=merges may be
more inline with the original spirit of "rebuild your side on top
of theirs".
May want to discard.
This is too much of a departure from the existing practice.
cf. <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@mail.gmail.com>
cf. <CABPp-BGqAxKnxDRVN4cYMteLp33hvto07R3=TJBT5WubJT4+Og@mail.gmail.com>
source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
* ab/tag-object-type-errors (2023-05-10) 4 commits
- tag: don't emit potentially incorrect "object is a X, not a Y"
- tag: don't misreport type of tagged objects in errors
- object tests: add test for unexpected objects in tags
- Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
Hardening checks around mismatched object types when one of those
objects is a tag.
source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com>
* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
- test-lib: allow storing counts with test harnesses
Allow summary results from tests to be written to t/test-results
directory even when a test harness like 'prove' is in use.
Expecting a reroll.
cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
source: <20221224225200.1027806-1-adam@dinwoodie.org>
* so/diff-merges-more (2022-12-18) 5 commits
- diff-merges: improve --diff-merges documentation
- diff-merges: issue warning on lone '-m' option
- diff-merges: support list of values for --diff-merges
- diff-merges: implement log.diffMerges-m-imply-p config
- diff-merges: implement [no-]hide option and log.diffMergesHide config
Assorted updates to "--diff-merges=X" option.
May want to discard.
Breaking compatibility does not seem worth it.
source: <20221217132955.108542-1-sorganov@gmail.com>
* ab/imap-send-requires-curl (2023-02-02) 6 commits
- imap-send: correctly report "host" when using "tunnel"
- imap-send: remove old --no-curl codepath
- imap-send: make --curl no-optional
- imap-send: replace auto-probe libcurl with hard dependency
- imap-send doc: the imap.sslVerify is used with imap.tunnel
- imap-send: note "auth_method", not "host" on auth method failure
Give a hard dependency on cURL library to build "git imap-send",
and remove the code to interact with IMAP server without using cURL.
Expecting a reroll.
The 'tunnel' part is still iffy.
cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com>
source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
* tc/cat-file-z-use-cquote (2023-05-10) 1 commit
- cat-file: quote-format name in error when using -z
"cat-file" in the batch mode that is fed NUL-terminated pathnames
learned to cquote them in its error output (otherwise, a funny
pathname with LF in it would break the lines in the output stream).
Will merge to 'next'?
source: <20230510190116.795641-2-toon@iotcl.com>
* cw/submodule-status-in-parallel (2023-03-02) 6 commits
- diff-lib: parallelize run_diff_files for submodules
- diff-lib: refactor out diff_change logic
- submodule: refactor is_submodule_modified()
- submodule: move status parsing into function
- submodule: rename strbuf variable
- run-command: add on_stderr_output_fn to run_processes_parallel_opts
"git submodule status" learned to run the comparison in submodule
repositories in parallel.
Expecting a reroll.
cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@mail.gmail.com>
cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com>
source: <20230302215237.1473444-1-calvinwan@google.com>
--------------------------------------------------
[Cooking]
* jc/t9800-fix-use-of-show-s-raw (2023-05-06) 1 commit
(merged to 'next' on 2023-05-09 at f4d7a7d671)
+ t9800: correct misuse of 'show -s --raw' in a test
A test fix.
Will merge to 'master'.
source: <xmqqild5rvvw.fsf@gitster.g>
* tl/push-branches-is-an-alias-for-all (2023-05-06) 1 commit
(merged to 'next' on 2023-05-09 at 1d8c3e5dcf)
+ push: introduce '--branches' option
"git push --all" gained an alias "git push --branches".
Will merge to 'master'.
source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com>
* en/header-split-cache-h-part-3 (2023-05-08) 25 commits
- fsmonitor-ll.h: split this header out of fsmonitor.h
- hash-ll, hashmap: move oidhash() to hash-ll
- git-compat-util.h: remove unneccessary include of wildmatch.h
- builtin.h: remove unneccessary includes
- list-objects-filter-options.h: remove unneccessary include
- diff.h: remove unnecessary include of oidset.h
- repository: remove unnecessary include of path.h
- log-tree: replace include of revision.h with simple forward declaration
- cache.h: remove this no-longer-used header
- read-cache*.h: move declarations for read-cache.c functions from cache.h
- repository.h: move declaration of the_index from cache.h
- merge.h: move declarations for merge.c from cache.h
- diff.h: move declaration for global in diff.c from cache.h
- preload-index.h: move declarations for preload-index.c from elsewhere
- sparse-index.h: move declarations for sparse-index.c from cache.h
- name-hash.h: move declarations for name-hash.c from cache.h
- run-command.h: move declarations for run-command.c from cache.h
- statinfo: move stat_{data,validity} functions from cache/read-cache
- read-cache: move shared add/checkout/commit code
- add: modify add_files_to_cache() to avoid globals
- read-cache: move shared commit and ls-files code
- setup: adopt shared init-db & clone code
- init-db, clone: change unnecessary global into passed parameter
- init-db: remove unnecessary global variable & document existing bug
- Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
Header files cleanup.
Needs review.
source: <pull.1525.git.1683431149.gitgitgadget@gmail.com>
* js/subtree-fully-spelt-quiet-and-debug-options (2023-05-08) 1 commit
(merged to 'next' on 2023-05-10 at 2980db981e)
+ subtree: support long global flags
"git subtree" (in contrib/) update.
Will merge to 'master'.
source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com>
* js/gitk-fixes-from-gfw (2023-05-08) 3 commits
(merged to 'next' on 2023-05-08 at adb334deec)
+ Merge gitk changes into js/gitk-fixes-from-gfw
+ gitk: escape file paths before piping to git log
+ gitk: prevent overly long command lines
Gitk updates from GfW project.
Will merge to 'master'.
source: <pull.1469.git.1674559397.gitgitgadget@gmail.com>
* la/doc-interpret-trailers (2023-05-11) 9 commits
- doc: trailer: add more examples in DESCRIPTION
- doc: trailer: mention 'key' in DESCRIPTION
- doc: trailer.<token>.command: emphasize deprecation
- doc: trailer: use angle brackets for <token> and <value>
- doc: trailer: remove redundant phrasing
- doc: trailer: examples: avoid the word "message" by itself
- doc: trailer: drop "commit message part" phrasing
- doc: trailer: swap verb order
- doc: trailer: fix grammar
Doc update.
On hold. Looking good.
Want to be rebased once kh/doc-interpret-trailers-updates lands.
source: <pull.1506.v2.git.git.1683839975.gitgitgadget@gmail.com>
* ar/test-cleanup-unused-file-creation (2023-05-09) 1 commit
(merged to 'next' on 2023-05-09 at 7734f3d690)
+ test: rev-parse-upstream: add missing cmp
Test fix.
Will merge to 'master'.
source: <20230509000246.1760327-1-felipe.contreras@gmail.com>
* cc/git-replay (2023-05-09) 16 commits
- SQUASH???
- replay: stop assuming replayed branches do not diverge
- replay: add --contained to rebase contained branches
- replay: add --advance or 'cherry-pick' mode
- replay: disallow revision specific options and pathspecs
- replay: use standard revision ranges
- replay: make it a minimal server side command
- replay: remove HEAD related sanity check
- replay: remove progress and info output
- replay: add an important FIXME comment about gpg signing
- replay: don't simplify history
- replay: introduce pick_regular_commit()
- replay: die() instead of failing assert()
- replay: start using parse_options API
- replay: introduce new builtin
- t6429: remove switching aspects of fast-rebase
source: <20230509175347.1714141-1-christian.couder@gmail.com>
* jc/pack-ref-exclude-include (2023-05-11) 4 commits
- pack-refs: teach pack-refs --include option
- revision: modify ref_exclusions to handle inclusions
- pack-refs: teach --exclude option to exclude refs from being packed
- docs: clarify git-pack-refs --all will pack all refs
"git pack-refs" learns "--include" and "--exclude" to tweak the ref
hierarchy to be packed using pattern matching.
Needs review.
source: <pull.1501.v3.git.git.1683828635.gitgitgadget@gmail.com>
* jk/test-verbose-no-more (2023-05-08) 3 commits
(merged to 'next' on 2023-05-09 at 897bfd0a6b)
+ t: drop "verbose" helper function
+ t7001: use "ls-files --format" instead of "cut"
+ t7001: avoid git on upstream of pipe
Retire "verbose" helper function from the test framework.
Will merge to 'master'.
source: <20230508185953.GA2108869@coredump.intra.peff.net>
* tb/pack-extra-cruft-tips (2023-05-03) 1 commit
- builtin/pack-objects.c: introduce `pack.extraCruftTips`
"git pack-objects" learned to invoke a new hook program that
enumerates extra objects to be used as anchoring points to keep
otherwise unreachable objects in cruft packs.
Under discussion
cf. <20230505221921.GE3321533@coredump.intra.peff.net>
source: <27a7f16aab35b5cac391d9831aadb0f2e2146313.1683151485.git.me@ttaylorr.com>
* jc/diff-s-with-other-options (2023-05-05) 1 commit
- diff: fix interaction between the "-s" option and other options
(this branch uses jc/dirstat-plug-leaks.)
The "-s" (silent, squelch) option of the "diff" family of commands
did not interact with other options that specify the output format
well. This has been cleaned up so that it will clear all the
formatting options given before.
Will merge to 'next'?
source: <20230505165952.335256-1-gitster@pobox.com>
* fc/asciidoc-code-block-hack (2023-05-04) 2 commits
- doc: manpage: remove ancient workaround
- doc: git-svn: use listing instead of verse
Documentation toolchain lost an ancient workaround that is no
longer needed.
Needs review.
source: <20230504035517.329765-1-felipe.contreras@gmail.com>
* fc/doc-revisions-markup-fix (2023-05-04) 2 commits
- doc: revisions: add a bunch of missing quotes
- doc: revisions: fix missing escape
Doc cleanup.
Needs review.
source: <20230504163421.100400-1-felipe.contreras@gmail.com>
* fc/doc-use-datestamp-in-commit (2023-05-05) 2 commits
(merged to 'next' on 2023-05-06 at 1eda43b03f)
+ doc-diff: drop SOURCE_DATE_EPOCH override
+ doc: doc-diff: specify date
An earlier change broke "doc-diff", which has been corrected.
Will merge to 'master'.
source: <20230503232349.59997-1-felipe.contreras@gmail.com>
source: <20230505211610.GA3197168@coredump.intra.peff.net>
* jc/dirstat-plug-leaks (2023-05-05) 2 commits
(merged to 'next' on 2023-05-09 at 2df7cf06e4)
+ diff: plug leaks in dirstat
+ diff: refactor common tail part of dirstat computation
(this branch is used by jc/diff-s-with-other-options.)
"git diff --dirstat" leaked memory, which has been plugged.
Will merge to 'master'.
source: <20230505211917.2746751-1-gitster@pobox.com>
* jc/name-rev-deprecate-stdin-further (2023-05-06) 1 commit
(merged to 'next' on 2023-05-09 at 0db4f08e32)
+ name-rev: make --stdin hidden
The "--stdin" option of "git name-rev" has been replaced with
the "--annotate-stdin" option more than a year ago. We stop
advertising it in the "git name-rev -h" output.
Will merge to 'master'.
source: <pull.1225.v3.git.git.1683346451239.gitgitgadget@gmail.com>
* ob/revert-of-revert (2023-05-05) 1 commit
- sequencer: beautify subject of reverts of reverts
Instead of "Revert "Revert "original"", give "Reapply "original""
as the title for a revert of a revert.
Expecting a hopefully final reroll.
Looking much better, except for minor cosmetic issues.
source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
* jc/attr-source-tree (2023-05-06) 1 commit
(merged to 'next' on 2023-05-10 at cb94f4fba6)
+ attr: teach "--attr-source=<tree>" global option to "git"
"git --attr-source=<tree> cmd $args" is a new way to have any
command to read attributes not from the working tree but from the
given tree object.
Will merge to 'master'.
source: <pull.1470.v6.git.git.1683346530487.gitgitgadget@gmail.com>
* mc/send-email-header-cmd (2023-05-01) 3 commits
(merged to 'next' on 2023-05-06 at 04514468b6)
+ send-email: detect empty blank lines in command output
+ send-email: add --header-cmd, --no-header-cmd options
+ send-email: extract execute_cmd from recipients_cmd
"git send-email" learned "--header-cmd=<cmd>" that can inject
arbitrary e-mail header lines to the outgoing messages.
Will merge to 'master'.
source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
* bc/clone-empty-repo-via-protocol-v0 (2023-05-01) 1 commit
- upload-pack: advertise capabilities when cloning empty repos
Expecting a minor and hopefully final update.
cf. <20230501224038.GA1174291@coredump.intra.peff.net>
source: <20230501170018.1410567-2-sandals@crustytoothpaste.net>
* ds/fsck-bitmap (2023-05-02) 2 commits
(merged to 'next' on 2023-05-09 at c2148408a2)
+ fsck: use local repository
+ fsck: verify checksums of all .bitmap files
"git fsck" learned to detect bit-flip breakages in the reachability
bitmap files.
Will merge to 'master'.
source: <pull.1526.v2.git.1683034042.gitgitgadget@gmail.com>
* gc/trace-bare-repo-setup (2023-05-01) 1 commit
(merged to 'next' on 2023-05-06 at 72b977d2f9)
+ setup: trace bare repository setups
The tracing mechanism learned to notice and report when
auto-discovered bare repositories are being used, as allowing so
without explicitly stating the user intends to do so (with setting
GIT_DIR for example) can be used with social engineering as an
attack vector.
Will merge to 'master'.
source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
* cw/strbuf-cleanup (2023-05-11) 7 commits
- strbuf: remove global variable
- strbuf: clarify dependency
- path: move related function to path
- object-name: move related functions to object-name
- credential-store: move related functions to credential-store file
- abspath: move related functions to abspath
- strbuf: clarify API boundary
Move functions that are not about pure string manipulation out of
strbuf.[ch]
Will merge to 'next'?
source: <20230511194446.1492907-1-calvinwan@google.com>
* jc/doc-clarify-git-default-hash-variable (2023-04-26) 1 commit
(merged to 'next' on 2023-05-06 at 7bae4db4cc)
+ doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
The documentation was misleading about the interaction between
GIT_DEFAULT_HASH and "git clone", which has been clarified to
stress that the variable is to be ignored by the command.
Will merge to 'master'.
source: <xmqqzg6uvfpo.fsf_-_@gitster.g>
* tl/notes-separator (2023-04-28) 6 commits
(merged to 'next' on 2023-05-06 at 598ed19c9b)
+ notes.c: introduce "--[no-]stripspace" option
+ notes.c: append separator instead of insert by pos
+ notes.c: introduce '--separator=<paragraph-break>' option
+ t3321: add test cases about the notes stripspace behavior
+ notes.c: use designated initializers for clarity
+ notes.c: cleanup 'strbuf_grow' call in 'append_edit'
'git notes append' was taught '--separator' to specify string to insert
between paragraphs.
Will merge to 'master'.
source: <cover.1682671758.git.dyroneteng@gmail.com>
* pw/rebase-i-after-failure (2023-04-21) 6 commits
- rebase -i: fix adding failed command to the todo list
- rebase: fix rewritten list for failed pick
- rebase --continue: refuse to commit after failed command
- sequencer: factor out part of pick_commits()
- rebase -i: remove patch file after conflict resolution
- rebase -i: move unlink() calls
Various fixes to the behaviour of "rebase -i" when the command got
interrupted by conflicting changes.
Expecting a reroll.
cf. <xmqqsfcthrpb.fsf@gitster.g>
cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
* sl/sparse-write-tree-part-2 (2023-05-08) 1 commit
- t1092: update a write-tree test
Fix-up to a topic already graduated to 'master'.
Will merge to 'next'?
source: <20230508202140.464363-1-cheskaqiqi@gmail.com>
* tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits
- pack-bitmap.c: use commit boundary during bitmap traversal
- pack-bitmap.c: extract `fill_in_bitmap()`
- object: add object_array initializer helper function
The object traversal using reachability bitmap done by
"pack-object" has been tweaked to take advantage of the fact that
using "boundary" commits as representative of all the uninteresting
ones can save quite a lot of object enumeration.
source: <cover.1683567065.git.me@ttaylorr.com>
* ar/config-count-tests-updates (2023-04-24) 3 commits
(merged to 'next' on 2023-05-06 at c585a56132)
+ t1300: add tests for missing keys
+ t1300: check stderr for "ignores pairs" tests
+ t1300: drop duplicate test
Test updates.
Will merge to 'master'.
source: <20230423134649.431783-1-rybak.a.v@gmail.com>
* ps/fetch-output-format (2023-05-10) 9 commits
- fetch: introduce machine-parseable "porcelain" output format
- fetch: move option related variables into main function
- fetch: lift up parsing of "fetch.output" config variable
- fetch: introduce `display_format` enum
- fetch: refactor calculation of the display table width
- fetch: print left-hand side when fetching HEAD:foo
- fetch: add a test to exercise invalid output formats
- fetch: split out tests for output format
- fetch: fix `--no-recurse-submodules` with multi-remote fetches
"git fetch" learned the "--porcelain" option that emits what it did
in a machine-parseable format.
Will merge to 'next'?
source: <cover.1683721293.git.ps@pks.im>
* sg/retire-unused-cocci (2023-04-20) 1 commit
- cocci: remove 'unused.cocci'
Retire a rather expensive-to-run Coccinelle check patch.
Will merge to 'next'.
source: <20230420205350.600760-1-szeder.dev@gmail.com>
* gc/doc-cocci-updates (2023-04-27) 2 commits
- cocci: codify authoring and reviewing practices
- cocci: add headings to and reword README
Update documentation regarding Coccinelle patches.
Will merge to 'next'?
source: <pull.1495.v2.git.git.1682634143.gitgitgadget@gmail.com>
* kh/doc-interpret-trailers-updates (2023-05-01) 4 commits
(merged to 'next' on 2023-05-06 at 4e9a640131)
+ doc: interpret-trailers: fix example
+ doc: interpret-trailers: don’t use deprecated config
+ doc: interpret-trailers: use input redirection
+ doc: interpret-trailers: don’t use heredoc in examples
Doc update.
Will merge to 'master'.
source: <cover.1682970213.git.code@khaugsbakk.name>
* pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits
(merged to 'next' on 2023-04-20 at 2728a01622)
+ completion: complete AUTO_MERGE
+ Documentation: document AUTO_MERGE
+ git-merge.txt: modernize word choice in "True merge" section
+ completion: complete REVERT_HEAD and BISECT_HEAD
+ revisions.txt: document more special refs
Document more pseudo-refs and teach the command line completion
machinery to complete AUTO_MERGE.
On hold, waiting for a fix-up.
cf. <a10648d5-8cba-4c7c-a303-b5b0dcdd3310@gmail.com>
source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
* mh/credential-password-expiry-libsecret (2023-05-05) 1 commit
(merged to 'next' on 2023-05-09 at fd898e3756)
+ credential/libsecret: support password_expiry_utc
The libsecret credential helper learns to handle the password
expiry time information.
Will merge to 'master'.
source: <pull.1469.v3.git.git.1683270298313.gitgitgadget@gmail.com>
* sl/diff-files-sparse (2023-05-09) 2 commits
- diff-files: integrate with sparse index
- t1092: add tests for `git diff-files`
Teach "diff-files" not to expand sparse-index unless needed.
Will merge to 'next'.
cf. <f51a8d77-c480-f021-38c4-78a9d75cdd11@github.com>
source: <20230509194241.469477-1-cheskaqiqi@gmail.com>
* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
(merged to 'next' on 2023-05-06 at c61e9b0672)
+ branch: avoid unnecessary worktrees traversals
+ branch: rename orphan branches in any worktree
+ branch: description for orphan branch errors
+ branch: use get_worktrees() in copy_or_rename_branch()
+ branch: test for failures while renaming branches
Error messages given when working on an unborn branch that is
checked out in another worktree have been improved.
Will merge to 'master'.
source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
--------------------------------------------------
[Discarded]
* ed/fsmonitor-inotify (2022-12-13) 6 commits
. fsmonitor: update doc for Linux
. fsmonitor: test updates
. fsmonitor: enable fsmonitor for Linux
. fsmonitor: implement filesystem change listener for Linux
. fsmonitor: determine if filesystem is local or remote
. fsmonitor: prepare to share code between Mac OS and Linux
Bundled fsmonitor for Linux using inotify API.
Seems to break asan job at CI when merged to 'seen'.
cf. <xmqqzg7d8xn2.fsf@gitster.g>
source: <pull.1352.v5.git.git.1670882286.gitgitgadget@gmail.com>
* my/wildmatch-cleanups (2023-02-27) 5 commits
. wildmatch: more cleanups after killing uchar
. wildmatch: use char instead of uchar
. wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring
. wildmatch: remove IS*() macros
. git-compat-util: add isblank() and isgraph()
Code clean-up.
Discarded without prejudice after more than 6 weeks of inactivity.
source: <20230226115021.1681834-1-masahiroy@kernel.org>
* cw/forbid-use-of-gitlink-outside-submodules (2023-02-28) 6 commits
. add: reject nested repositories
. tests: remove duplicate .gitmodules path
. tests: use `git submodule add` and fix expected status
. tests: use `git submodule add` and fix expected diffs
. tests: Use `git submodule add` instead of `git add`
. t4041, t4060: modernize test style
Forbid "git add dir" from adding a gitlink to the index.
Discarded without prejudice after more than 6 weeks of inactivity.
source: <20230228185253.2356546-1-calvinwan@google.com>
* nw/for-each-ref-signature (2023-03-13) 1 commit
. ref-filter: add new "signature" atom
"git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)"
placeholder and friends.
Breaks CI.
cf. <xmqqpm9bosjw.fsf@gitster.g>
source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
^ permalink raw reply [relevance 1%]
* What's cooking in git.git (May 2023, #03; Tue, 9)
@ 2023-05-10 1:56 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2023-05-10 1:56 UTC (permalink / raw)
To: git
Here are the topics that have been cooking in my tree. Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a future
release). Commits prefixed with '-' are only in 'seen', and aren't
considered "accepted" at all and may be annotated with an URL to a
message that raises issues but they are no means exhaustive. A
topic without enough support may be discarded after a long period of
no activity.
We are getting closer to pre-release freeze. As I prefer to have
any non-trivial topics cook for 7 calendar days in 'next', anything
not in 'next' by Friday this week are unlikely to be in -rc1 for the
next release.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* en/header-split-cache-h-part-2 (2023-04-24) 22 commits
(merged to 'next' on 2023-05-01 at 722c412915)
+ reftable: ensure git-compat-util.h is the first (indirect) include
+ diff.h: reduce unnecessary includes
+ object-store.h: reduce unnecessary includes
+ commit.h: reduce unnecessary includes
+ fsmonitor: reduce includes of cache.h
+ cache.h: remove unnecessary headers
+ treewide: remove cache.h inclusion due to previous changes
+ cache,tree: move basic name compare functions from read-cache to tree
+ cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c
+ hash-ll.h: split out of hash.h to remove dependency on repository.h
+ tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h
+ dir.h: move DTYPE defines from cache.h
+ versioncmp.h: move declarations for versioncmp.c functions from cache.h
+ ws.h: move declarations for ws.c functions from cache.h
+ match-trees.h: move declarations for match-trees.c functions from cache.h
+ pkt-line.h: move declarations for pkt-line.c functions from cache.h
+ base85.h: move declarations for base85.c functions from cache.h
+ copy.h: move declarations for copy.c functions from cache.h
+ server-info.h: move declarations for server-info.c functions from cache.h
+ packfile.h: move pack_window and pack_entry from cache.h
+ symlinks.h: move declarations for symlinks.c functions from cache.h
+ treewide: be explicit about dependence on strbuf.h
(this branch is used by en/header-split-cache-h-part-3.)
More header clean-up.
source: <pull.1517.v2.git.1682194649.gitgitgadget@gmail.com>
* jk/parse-commit-with-malformed-ident (2023-04-27) 4 commits
(merged to 'next' on 2023-04-28 at cb6ea0412a)
+ parse_commit(): describe more date-parsing failure modes
+ parse_commit(): handle broken whitespace-only timestamp
+ parse_commit(): parse timestamp from end of line
+ t4212: avoid putting git on left-hand side of pipe
The commit object parser has been taught to be a bit more lenient
to parse timestamps on the author/committer line with a malformed
author/committer ident.
source: <20230427081330.GA1461786@coredump.intra.peff.net>
* jw/send-email-update-gmail-insn (2023-04-28) 1 commit
(merged to 'next' on 2023-05-01 at cb5d83ee92)
+ send-email docs: Remove mention of discontinued gmail feature
Doc update to drop use of deprecated app-specific password against
gmail.
source: <20221001104609.18453-1-j.witteveen@gmail.com>
* mh/fix-detect-compilers-with-nondigit-versions (2023-04-26) 1 commit
(merged to 'next' on 2023-04-28 at c0c54291c2)
+ Handle some compiler versions containing a dash
The detect-compilers script to help auto-tweaking the build system
had trouble working with compilers whose version number has extra
suffixes. The script has been taught that certain suffixes (like
"-win32" in "gcc 10-win32") can be safely stripped as they share
the same features and bugs with the version without the suffix.
source: <20230426004843.3391826-1-mh@glandium.org>
* ob/messages-capitalize-exception (2023-04-28) 1 commit
(merged to 'next' on 2023-05-01 at db0ef42b3a)
+ messages: capitalization and punctuation exceptions
(this branch uses ob/sequencer-i18n-fix.)
Message update.
source: <20230428125649.1719796-1-oswald.buddenhagen@gmx.de>
* ob/sequencer-i18n-fix (2023-04-28) 1 commit
(merged to 'next' on 2023-05-01 at 242ca8ce15)
+ sequencer: actually translate report in do_exec()
(this branch is used by ob/messages-capitalize-exception.)
Message update.
source: <20230428125649.1719796-2-oswald.buddenhagen@gmx.de>
* ob/t3501-retitle (2023-05-01) 1 commit
(merged to 'next' on 2023-05-01 at 52730fcaaa)
+ t/t3501-revert-cherry-pick.sh: clarify scope of the file
Retitle a test script with an overly narrow name.
source: <20230430100034.1889796-1-oswald.buddenhagen@gmx.de>
--------------------------------------------------
[New Topics]
* jc/t9800-fix-use-of-show-s-raw (2023-05-06) 1 commit
(merged to 'next' on 2023-05-09 at f4d7a7d671)
+ t9800: correct misuse of 'show -s --raw' in a test
A test fix.
Will merge to 'master'.
source: <xmqqild5rvvw.fsf@gitster.g>
* tl/push-branches-is-an-alias-for-all (2023-05-06) 1 commit
(merged to 'next' on 2023-05-09 at 1d8c3e5dcf)
+ push: introduce '--branches' option
"git push --all" gained an alias "git push --branches".
Will merge to 'master'.
source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com>
* en/header-split-cache-h-part-3 (2023-05-08) 25 commits
- fsmonitor-ll.h: split this header out of fsmonitor.h
- hash-ll, hashmap: move oidhash() to hash-ll
- git-compat-util.h: remove unneccessary include of wildmatch.h
- builtin.h: remove unneccessary includes
- list-objects-filter-options.h: remove unneccessary include
- diff.h: remove unnecessary include of oidset.h
- repository: remove unnecessary include of path.h
- log-tree: replace include of revision.h with simple forward declaration
- cache.h: remove this no-longer-used header
- read-cache*.h: move declarations for read-cache.c functions from cache.h
- repository.h: move declaration of the_index from cache.h
- merge.h: move declarations for merge.c from cache.h
- diff.h: move declaration for global in diff.c from cache.h
- preload-index.h: move declarations for preload-index.c from elsewhere
- sparse-index.h: move declarations for sparse-index.c from cache.h
- name-hash.h: move declarations for name-hash.c from cache.h
- run-command.h: move declarations for run-command.c from cache.h
- statinfo: move stat_{data,validity} functions from cache/read-cache
- read-cache: move shared add/checkout/commit code
- add: modify add_files_to_cache() to avoid globals
- read-cache: move shared commit and ls-files code
- setup: adopt shared init-db & clone code
- init-db, clone: change unnecessary global into passed parameter
- init-db: remove unnecessary global variable & document existing bug
- Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3
source: <pull.1525.git.1683431149.gitgitgadget@gmail.com>
* js/subtree-fully-spelt-quiet-and-debug-options (2023-05-08) 1 commit
- subtree: support long global flags
"git subtree" (in contrib/) update.
Will merge to 'next'.
source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com>
* js/gitk-fixes-from-gfw (2023-05-08) 3 commits
(merged to 'next' on 2023-05-08 at adb334deec)
+ Merge gitk changes into js/gitk-fixes-from-gfw
+ gitk: escape file paths before piping to git log
+ gitk: prevent overly long command lines
Gitk updates from GfW project.
Will merge to 'master'.
source: <pull.1469.git.1674559397.gitgitgadget@gmail.com>
* la/doc-interpret-trailers (2023-05-08) 11 commits
- doc: trailer: add more examples in DESCRIPTION
- doc: trailer: mention 'key' in DESCRIPTION
- doc: trailer.<token>.command: emphasize deprecation
- doc: trailer.<token>.command: refer to existing example
- doc: trailer: trailer.<token>.cmd: add missing verb phrase
- doc: trailer: use angle brackets for <token> and <value>
- doc: trailer: explain "commit mesage part" on first usage
- doc: trailer: remove redundant phrasing
- doc: trailer: --no-divider: more precise language
- doc: trailer: swap verb order
- doc: trailer: fix grammar
Doc update.
Needs review.
source: <pull.1506.git.git.1683566870.gitgitgadget@gmail.com>
* ar/test-cleanup-unused-file-creation (2023-05-09) 1 commit
(merged to 'next' on 2023-05-09 at 7734f3d690)
+ test: rev-parse-upstream: add missing cmp
Test fix.
Will merge to 'master'.
source: <20230509000246.1760327-1-felipe.contreras@gmail.com>
* cc/git-replay (2023-05-09) 16 commits
- SQUASH???
- replay: stop assuming replayed branches do not diverge
- replay: add --contained to rebase contained branches
- replay: add --advance or 'cherry-pick' mode
- replay: disallow revision specific options and pathspecs
- replay: use standard revision ranges
- replay: make it a minimal server side command
- replay: remove HEAD related sanity check
- replay: remove progress and info output
- replay: add an important FIXME comment about gpg signing
- replay: don't simplify history
- replay: introduce pick_regular_commit()
- replay: die() instead of failing assert()
- replay: start using parse_options API
- replay: introduce new builtin
- t6429: remove switching aspects of fast-rebase
source: <20230509175347.1714141-1-christian.couder@gmail.com>
* jc/pack-ref-exclude-include (2023-05-09) 3 commits
- pack-refs: teach pack-refs --include option
- pack-refs: teach --exclude option to exclude refs from being packed
- docs: clarify git-pack-refs --all will pack all refs
"git pack-refs" learns "--include" and "--exclude" to tweak the ref
hierarchy to be packed using pattern matching.
source: <pull.1501.v2.git.git.1683659931.gitgitgadget@gmail.com>
* jk/test-verbose-no-more (2023-05-08) 3 commits
(merged to 'next' on 2023-05-09 at 897bfd0a6b)
+ t: drop "verbose" helper function
+ t7001: use "ls-files --format" instead of "cut"
+ t7001: avoid git on upstream of pipe
Retire "verbose" helper function from the test framework.
Will merge to 'master'.
source: <20230508185953.GA2108869@coredump.intra.peff.net>
--------------------------------------------------
[Stalled]
* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
- fsmonitor: handle differences between Windows named pipe functions
Fix fsmonitor on Windows when the filesystem path contains certain
characters.
Expecting a reroll.
cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
* rn/sparse-diff-index (2023-04-10) 1 commit
- diff-index: enable sparse index
"git diff-index" command has been taught to work better with the
sparse index.
Expecting a reroll.
cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>
source: <20230408112342.404318-1-nanth.raghul@gmail.com>
* ja/worktree-orphan (2023-04-17) 8 commits
- worktree add: emit warn when there is a bad HEAD
- worktree add: extend DWIM to infer --orphan
- worktree add: introduce "try --orphan" hint
- worktree add: add --orphan flag
- t2400: add tests to verify --quiet
- t2400: refactor "worktree add" opt exclusion tests
- t2400: print captured git output when finished
- worktree add: include -B in usage docs
'git worktree add' learned how to create a worktree based on an
orphaned branch with `--orphan`.
Expecting a reroll.
cf. <m7crhly2j3k76whydbtdwhvzghvoql436g3lqtst4v3ahv75aa@wq5zjepgrxz5>
source: <20230417093255.31079-1-jacobabel@nullpo.dev>
* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
- usage: clarify --recurse-submodules as a boolean
The "--[no-]recurse-submodules" option of "git checkout" and others
supported an undocumented syntax --recurse-submodules=<value> where
the value can spell a Boolean in various ways. The support for the
syntax is being dropped.
Expecting a reroll.
cf. <ZDSTFwMFO7vbj/du@google.com>
source: <ZDSTFwMFO7vbj/du@google.com>
* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
- pack-bitmap.c: factor out `bitmap_index_seek_commit()`
- pack-bitmap.c: use `bitmap_index_seek()` where possible
- pack-bitmap.c: factor out manual `map_pos` manipulation
- pack-bitmap.c: drop unnecessary 'inline's
- pack-bitmap.c: hide bitmap internals in `read_be32()`
- pack-bitmap.c: hide bitmap internals in `read_u8()`
Clean-up the pack-bitmap codepath.
Kicked back to 'seen' out of 'next'.
There is a BUG() on data errors that needs to be fixed.
source: <cover.1679342296.git.me@ttaylorr.com>
* cb/checkout-same-branch-twice (2023-03-22) 2 commits
- SQUASH??? the test marked to expect failure passes from day one
- checkout/switch: disallow checking out same branch in multiple worktrees
"git checkout -B $branch" failed to protect against checking out
a branch that is checked out elsewhere, unlike "git branch -f" did.
Expecting a hopefully minor and final reroll.
cf. <CAPUEspj_Bh+LgYLnWfeBdcq_uV5Cbou-7H51GLFjzSa5Qzby9w@mail.gmail.com>
source: <20230120113553.24655-1-carenas@gmail.com>
* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
- pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
In an advice message after failed non-ff pull, we used to suggest
setting pull.rebase=true, but these days pull.rebase=merges may be
more inline with the original spirit of "rebuild your side on top
of theirs".
May want to discard.
This is too much of a departure from the existing practice.
cf. <CAMMLpeTPEoKVTbfc17w+Y9qn7jOGmQi_Ux0Y3sFW5QTgGWJ=SA@mail.gmail.com>
cf. <CABPp-BGqAxKnxDRVN4cYMteLp33hvto07R3=TJBT5WubJT4+Og@mail.gmail.com>
source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com>
* ab/tag-object-type-errors (2022-11-22) 5 commits
- tag: don't emit potentially incorrect "object is a X, not a Y"
- tag: don't misreport type of tagged objects in errors
- object tests: add test for unexpected objects in tags
- object-file.c: free the "t.tag" in check_tag()
- Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors
Hardening checks around mismatched object types when one of those
objects is a tag.
Expecting a reroll.
cf. <xmqqzgb5jz5c.fsf@gitster.g>
cf. <xmqqsfgxjugi.fsf@gitster.g>
source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>
* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
- test-lib: allow storing counts with test harnesses
Allow summary results from tests to be written to t/test-results
directory even when a test harness like 'prove' is in use.
Expecting a reroll.
cf. <CABPp-BGoPuGCZw+9wCgdYyRR4Zf4y9Kun27GrQhtMdYWpOUsYQ@mail.gmail.com>
source: <20221224225200.1027806-1-adam@dinwoodie.org>
* so/diff-merges-more (2022-12-18) 5 commits
- diff-merges: improve --diff-merges documentation
- diff-merges: issue warning on lone '-m' option
- diff-merges: support list of values for --diff-merges
- diff-merges: implement log.diffMerges-m-imply-p config
- diff-merges: implement [no-]hide option and log.diffMergesHide config
Assorted updates to "--diff-merges=X" option.
May want to discard.
Breaking compatibility does not seem worth it.
source: <20221217132955.108542-1-sorganov@gmail.com>
* ab/imap-send-requires-curl (2023-02-02) 6 commits
- imap-send: correctly report "host" when using "tunnel"
- imap-send: remove old --no-curl codepath
- imap-send: make --curl no-optional
- imap-send: replace auto-probe libcurl with hard dependency
- imap-send doc: the imap.sslVerify is used with imap.tunnel
- imap-send: note "auth_method", not "host" on auth method failure
Give a hard dependency on cURL library to build "git imap-send",
and remove the code to interact with IMAP server without using cURL.
Expecting a reroll.
The 'tunnel' part is still iffy.
cf. <230203.86bkmabfjr.gmgdl@evledraar.gmail.com>
source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
* tc/cat-file-z-use-cquote (2023-03-03) 2 commits
. cat-file: quote-format name in error when using -z
. cat-file: extract printing batch error message into function
"cat-file" in the batch mode that is fed NUL-terminated pathnames
learned to cquote them in its error output (otherwise, a funny
pathname with LF in it would break the lines in the output stream).
Breaks "cat-file --batch-all-objects --batch-check".
cf. <xmqqilfhctrr.fsf@gitster.g>
source: <20230303191708.77894-1-toon@iotcl.com>
* cw/submodule-status-in-parallel (2023-03-02) 6 commits
- diff-lib: parallelize run_diff_files for submodules
- diff-lib: refactor out diff_change logic
- submodule: refactor is_submodule_modified()
- submodule: move status parsing into function
- submodule: rename strbuf variable
- run-command: add on_stderr_output_fn to run_processes_parallel_opts
"git submodule status" learned to run the comparison in submodule
repositories in parallel.
Expecting a reroll.
cf. <CAFySSZDk05m6gU5-V1R+y3YnQ5PPduVW54+_gjBwD0rmacsLsw@mail.gmail.com>
cf. <230307.865ybc273g.gmgdl@evledraar.gmail.com>
source: <20230302215237.1473444-1-calvinwan@google.com>
--------------------------------------------------
[Cooking]
* fc/doc-drop-custom-callout-format (2023-05-03) 1 commit
(merged to 'next' on 2023-05-04 at c2fd654367)
+ doc: remove custom callouts format
Our custom callout formatter is no longer used in the documentation
formatting toolchain, as the upstream default ones give better
output these days.
Will merge to 'master'.
source: <20230418011828.47851-1-felipe.contreras@gmail.com>
* fc/doc-man-lift-title-length-limit (2023-05-03) 1 commit
(merged to 'next' on 2023-05-04 at d048eb1ef8)
+ doc: manpage: remove maximum title length
The titles of manual pages (formatted with AsciiDoc) used to be
chomped at unreasonably short limit, which has been removed; this
makes the formatted output match that of asciidoctor.
Will merge to 'master'.
source: <20230503171658.8996-1-felipe.contreras@gmail.com>
* sd/doc-gitignore-and-rm-cached (2023-05-03) 1 commit
(merged to 'next' on 2023-05-04 at a4b1b128d6)
+ docs: clarify git rm --cached function in gitignore note
Doc update.
Will merge to 'master'.
source: <pull.862.v3.git.git.1683150400953.gitgitgadget@gmail.com>
* tb/pack-extra-cruft-tips (2023-05-03) 1 commit
- builtin/pack-objects.c: introduce `pack.extraCruftTips`
"git pack-objects" learned to invoke a new hook program that
enumerates extra objects to be used as anchoring points to keep
otherwise unreachable objects in cruft packs.
Under discussion
cf. <20230505221921.GE3321533@coredump.intra.peff.net>
source: <27a7f16aab35b5cac391d9831aadb0f2e2146313.1683151485.git.me@ttaylorr.com>
* jc/diff-s-with-other-options (2023-05-05) 1 commit
- diff: fix interaction between the "-s" option and other options
(this branch uses jc/dirstat-plug-leaks.)
The "-s" (silent, squelch) option of the "diff" family of commands
did not interact with other options that specify the output format
well. This has been cleaned up so that it will clear all the
formatting options given before.
Will merge to 'next'?
source: <20230505165952.335256-1-gitster@pobox.com>
* fc/asciidoc-code-block-hack (2023-05-04) 2 commits
- doc: manpage: remove ancient workaround
- doc: git-svn: use listing instead of verse
Documentation toolchain lost an ancient workaround that is no
longer needed.
Needs review.
source: <20230504035517.329765-1-felipe.contreras@gmail.com>
* fc/doc-revisions-markup-fix (2023-05-04) 2 commits
- doc: revisions: add a bunch of missing quotes
- doc: revisions: fix missing escape
Doc cleanup.
Needs review.
source: <20230504163421.100400-1-felipe.contreras@gmail.com>
* fc/doc-use-datestamp-in-commit (2023-05-05) 2 commits
(merged to 'next' on 2023-05-06 at 1eda43b03f)
+ doc-diff: drop SOURCE_DATE_EPOCH override
+ doc: doc-diff: specify date
An earlier change broke "doc-diff", which has been corrected.
Will merge to 'master'.
source: <20230503232349.59997-1-felipe.contreras@gmail.com>
source: <20230505211610.GA3197168@coredump.intra.peff.net>
* jc/dirstat-plug-leaks (2023-05-05) 2 commits
(merged to 'next' on 2023-05-09 at 2df7cf06e4)
+ diff: plug leaks in dirstat
+ diff: refactor common tail part of dirstat computation
(this branch is used by jc/diff-s-with-other-options.)
"git diff --dirstat" leaked memory, which has been plugged.
Will merge to 'master'.
source: <20230505211917.2746751-1-gitster@pobox.com>
* jc/name-rev-deprecate-stdin-further (2023-05-06) 1 commit
(merged to 'next' on 2023-05-09 at 0db4f08e32)
+ name-rev: make --stdin hidden
The "--stdin" option of "git name-rev" has been replaced with
the "--annotate-stdin" option more than a year ago. We stop
advertising it in the "git name-rev -h" output.
Will merge to 'master'.
source: <pull.1225.v3.git.git.1683346451239.gitgitgadget@gmail.com>
* ob/revert-of-revert (2023-05-05) 1 commit
- sequencer: beautify subject of reverts of reverts
Instead of "Revert "Revert "original"", give "Reapply "original""
as the title for a revert of a revert.
Expecting a hopefully final reroll.
Looking much better, except for minor cosmetic issues.
source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
* mh/use-wincred-from-system (2023-03-27) 1 commit
(merged to 'next' on 2023-05-06 at a545c5d4aa)
+ credential/wincred: include wincred.h
Code clean-up.
Will merge to 'master'.
cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de>
cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com>
* jc/attr-source-tree (2023-05-06) 1 commit
- attr: teach "--attr-source=<tree>" global option to "git"
"git --attr-source=<tree> cmd $args" is a new way to have any
command to read attributes not from the working tree but from the
given tree object.
Will merge to 'next'.
source: <pull.1470.v6.git.git.1683346530487.gitgitgadget@gmail.com>
* mc/send-email-header-cmd (2023-05-01) 3 commits
(merged to 'next' on 2023-05-06 at 04514468b6)
+ send-email: detect empty blank lines in command output
+ send-email: add --header-cmd, --no-header-cmd options
+ send-email: extract execute_cmd from recipients_cmd
"git send-email" learned "--header-cmd=<cmd>" that can inject
arbitrary e-mail header lines to the outgoing messages.
Will merge to 'master'.
source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
* rs/test-ctype-eof (2023-05-02) 1 commit
(merged to 'next' on 2023-05-02 at a19201a6a9)
+ test-ctype: check EOF
ctype tests have been taught to test EOF, too.
Will merge to 'master'.
source: <1dbbd7ce-2b3f-6f88-f902-1d4ffe62e259@web.de>
* tb/credential-long-lines (2023-05-01) 7 commits
(merged to 'next' on 2023-05-02 at f027002b92)
+ contrib/credential: embiggen fixed-size buffer in wincred
+ contrib/credential: avoid fixed-size buffer in libsecret
+ contrib/credential: .gitignore libsecret build artifacts
+ contrib/credential: remove 'gnome-keyring' credential helper
+ contrib/credential: avoid fixed-size buffer in osxkeychain
+ t/lib-credential.sh: ensure credential helpers handle long headers
+ credential.c: store "wwwauth[]" values in `credential_read()`
The implementation of credential helpers used fgets() over fixed
size buffers to read protocol messages, causing the remainder of
the folded long line to trigger unexpected behaviour, which has
been corrected.
Will merge to 'master'.
source: <cover.1682956419.git.me@ttaylorr.com>
* bc/clone-empty-repo-via-protocol-v0 (2023-05-01) 1 commit
- upload-pack: advertise capabilities when cloning empty repos
Expecting a minor and hopefully final update.
cf. <20230501224038.GA1174291@coredump.intra.peff.net>
source: <20230501170018.1410567-2-sandals@crustytoothpaste.net>
* ds/fsck-bitmap (2023-05-02) 2 commits
(merged to 'next' on 2023-05-09 at c2148408a2)
+ fsck: use local repository
+ fsck: verify checksums of all .bitmap files
"git fsck" learned to detect bit-flip breakages in the reachability
bitmap files.
Will merge to 'master'.
source: <pull.1526.v2.git.1683034042.gitgitgadget@gmail.com>
* gc/trace-bare-repo-setup (2023-05-01) 1 commit
(merged to 'next' on 2023-05-06 at 72b977d2f9)
+ setup: trace bare repository setups
The tracing mechanism learned to notice and report when
auto-discovered bare repositories are being used, as allowing so
without explicitly stating the user intends to do so (with setting
GIT_DIR for example) can be used with social engineering as an
attack vector.
Will merge to 'master'.
source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
* cw/strbuf-cleanup (2023-05-08) 7 commits
- strbuf: remove global variable
- strbuf: clarify dependency
- path: move related function to path
- object-name: move related functions to object-name
- credential-store: move related functions to credential-store file
- abspath: move related functions to abspath
- strbuf: clarify API boundary
Move functions that are not about pure string manipulation out of
strbuf.[ch]
Comments?
source: <20230508165728.525603-1-calvinwan@google.com>
* ah/doc-attributes-text (2023-05-03) 1 commit
(merged to 'next' on 2023-05-04 at 121c97817e)
+ docs: rewrite the documentation of the text and eol attributes
Doc update to clarify how text and eol attributes interact to
specify the end-of-line conversion.
Will merge to 'master'.
source: <20230503044656.221175-2-alexhenrie24@gmail.com>
* hx/negotiator-non-recursive (2023-04-26) 2 commits
(merged to 'next' on 2023-05-02 at 64f97cc72d)
+ negotiator/skipping: fix some problems in mark_common()
+ negotiator/default: avoid stack overflow
The implementation of the default "negotiator", used to find common
ancestor over the network for object tranfer, used to be recursive;
it was updated to be iterative to conserve stackspace usage.
Will merge to 'master'.
cf. <9ad5f246-e21f-0a13-1a53-1ae3307c3f0e@github.com>
source: <cover.1682513384.git.hanxin.hx@bytedance.com>
* jc/doc-clarify-git-default-hash-variable (2023-04-26) 1 commit
(merged to 'next' on 2023-05-06 at 7bae4db4cc)
+ doc: GIT_DEFAULT_HASH is and will be ignored during "clone"
The documentation was misleading about the interaction between
GIT_DEFAULT_HASH and "git clone", which has been clarified to
stress that the variable is to be ignored by the command.
Will merge to 'master'.
source: <xmqqzg6uvfpo.fsf_-_@gitster.g>
* tl/notes-separator (2023-04-28) 6 commits
(merged to 'next' on 2023-05-06 at 598ed19c9b)
+ notes.c: introduce "--[no-]stripspace" option
+ notes.c: append separator instead of insert by pos
+ notes.c: introduce '--separator=<paragraph-break>' option
+ t3321: add test cases about the notes stripspace behavior
+ notes.c: use designated initializers for clarity
+ notes.c: cleanup 'strbuf_grow' call in 'append_edit'
'git notes append' was taught '--separator' to specify string to insert
between paragraphs.
Will merge to 'master'.
source: <cover.1682671758.git.dyroneteng@gmail.com>
* pw/rebase-i-after-failure (2023-04-21) 6 commits
- rebase -i: fix adding failed command to the todo list
- rebase: fix rewritten list for failed pick
- rebase --continue: refuse to commit after failed command
- sequencer: factor out part of pick_commits()
- rebase -i: remove patch file after conflict resolution
- rebase -i: move unlink() calls
Various fixes to the behaviour of "rebase -i" when the command got
interrupted by conflicting changes.
Expecting a reroll.
cf. <xmqqsfcthrpb.fsf@gitster.g>
cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
* sl/sparse-write-tree-part-2 (2023-05-08) 1 commit
- t1092: update a write-tree test
Fix-up to a topic already graduated to 'master'.
Will merge to 'next'?
source: <20230508202140.464363-1-cheskaqiqi@gmail.com>
* tb/pack-bitmap-traversal-with-boundary (2023-05-08) 3 commits
- pack-bitmap.c: use commit boundary during bitmap traversal
- pack-bitmap.c: extract `fill_in_bitmap()`
- object: add object_array initializer helper function
The object traversal using reachability bitmap done by
"pack-object" has been tweaked to take advantage of the fact that
using "boundary" commits as representative of all the uninteresting
ones can save quite a lot of object enumeration.
source: <cover.1683567065.git.me@ttaylorr.com>
* ar/config-count-tests-updates (2023-04-24) 3 commits
(merged to 'next' on 2023-05-06 at c585a56132)
+ t1300: add tests for missing keys
+ t1300: check stderr for "ignores pairs" tests
+ t1300: drop duplicate test
Test updates.
Will merge to 'master'.
source: <20230423134649.431783-1-rybak.a.v@gmail.com>
* ps/fetch-output-format (2023-05-09) 8 commits
- fetch: introduce machine-parseable "porcelain" output format
- fetch: move option related variables into main function
- fetch: move display format parsing into main function
- fetch: introduce `display_format` enum
- fetch: fix missing from-reference when fetching HEAD:foo
- fetch: add a test to exercise invalid output formats
- fetch: split out tests for output format
- fetch: fix `--no-recurse-submodules` with multi-remote fetches
"git fetch" learned the "--porcelain" option that emits what it did
in a machine-parseable format.
Getting there.
source: <cover.1683636885.git.ps@pks.im>
* ma/gittutorial-fixes (2023-04-20) 2 commits
(merged to 'next' on 2023-05-02 at bf96011972)
+ gittutorial: wrap literal examples in backticks
+ gittutorial: drop early mention of origin
Doc fixes.
Will merge to 'master'.
source: <cover.1681579244.git.martin.agren@gmail.com>
* sg/retire-unused-cocci (2023-04-20) 1 commit
- cocci: remove 'unused.cocci'
Retire a rather expensive-to-run Coccinelle check patch.
source: <20230420205350.600760-1-szeder.dev@gmail.com>
* ms/send-email-feed-header-to-validate-hook (2023-04-19) 2 commits
(merged to 'next' on 2023-05-03 at ba7079bcd4)
+ send-email: expose header information to git-send-email's sendemail-validate hook
+ send-email: refactor header generation functions
"git send-email" learned to give the e-mail headers to the validate
hook by passing an extra argument from the command line.
Will merge to 'master'.
source: <20230419202703.2911836-1-michael.strawbridge@amd.com>
* gc/doc-cocci-updates (2023-04-27) 2 commits
- cocci: codify authoring and reviewing practices
- cocci: add headings to and reword README
Update documentation regarding Coccinelle patches.
Will merge to 'next'?
source: <pull.1495.v2.git.git.1682634143.gitgitgadget@gmail.com>
* kh/doc-interpret-trailers-updates (2023-05-01) 4 commits
(merged to 'next' on 2023-05-06 at 4e9a640131)
+ doc: interpret-trailers: fix example
+ doc: interpret-trailers: don’t use deprecated config
+ doc: interpret-trailers: use input redirection
+ doc: interpret-trailers: don’t use heredoc in examples
Doc update.
Will merge to 'master'.
source: <cover.1682970213.git.code@khaugsbakk.name>
* pb/complete-and-document-auto-merge-and-friends (2023-04-14) 5 commits
(merged to 'next' on 2023-04-20 at 2728a01622)
+ completion: complete AUTO_MERGE
+ Documentation: document AUTO_MERGE
+ git-merge.txt: modernize word choice in "True merge" section
+ completion: complete REVERT_HEAD and BISECT_HEAD
+ revisions.txt: document more special refs
Document more pseudo-refs and teach the command line completion
machinery to complete AUTO_MERGE.
On hold, waiting for a fix-up.
cf. <a10648d5-8cba-4c7c-a303-b5b0dcdd3310@gmail.com>
source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
* ar/test-cleanup-unused-file-creation-part2 (2023-05-03) 6 commits
(merged to 'next' on 2023-05-03 at 185f0ec195)
+ t2019: don't create unused files
+ t1502: don't create unused files
+ t1450: don't create unused files
+ t1300: don't create unused files
+ t1300: fix config file syntax error descriptions
+ t0300: don't create unused file
Test cleanup.
Will merge to 'master'.
cf. <CABPp-BFCBPTBc9savP13gNFmBo_WCnZHUv_Z8bWE6T6GZOrs-Q@mail.gmail.com>
source: <20230417191044.909094-1-rybak.a.v@gmail.com>
* mh/credential-password-expiry-wincred (2023-04-03) 1 commit
(merged to 'next' on 2023-05-06 at 51aae61f60)
+ credential/wincred: store password_expiry_utc
Teach the recently invented "password expiry time" trait to the
wincred credential helper.
Will merge to 'master'.
cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com>
* mh/credential-oauth-refresh-token (2023-04-21) 1 commit
(merged to 'next' on 2023-05-04 at 9ade4aa024)
+ credential: new attribute oauth_refresh_token
The credential subsystem learns to help OAuth framework.
Will merge to 'master'.
source: <pull.1394.v2.git.1682070479816.gitgitgadget@gmail.com>
* mh/credential-password-expiry-libsecret (2023-05-05) 1 commit
(merged to 'next' on 2023-05-09 at fd898e3756)
+ credential/libsecret: support password_expiry_utc
The libsecret credential helper learns to handle the password
expiry time information.
Will merge to 'master'.
source: <pull.1469.v3.git.git.1683270298313.gitgitgadget@gmail.com>
* sl/diff-files-sparse (2023-05-09) 2 commits
- diff-files: integrate with sparse index
- t1092: add tests for `git diff-files`
Teach "diff-files" not to expand sparse-index unless needed.
Will merge to 'next'?
source: <20230509194241.469477-1-cheskaqiqi@gmail.com>
* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
(merged to 'next' on 2023-05-06 at c61e9b0672)
+ branch: avoid unnecessary worktrees traversals
+ branch: rename orphan branches in any worktree
+ branch: description for orphan branch errors
+ branch: use get_worktrees() in copy_or_rename_branch()
+ branch: test for failures while renaming branches
Error messages given when working on an unborn branch that is
checked out in another worktree have been improved.
Will merge to 'master'.
source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
--------------------------------------------------
[Discarded]
* ed/fsmonitor-inotify (2022-12-13) 6 commits
. fsmonitor: update doc for Linux
. fsmonitor: test updates
. fsmonitor: enable fsmonitor for Linux
. fsmonitor: implement filesystem change listener for Linux
. fsmonitor: determine if filesystem is local or remote
. fsmonitor: prepare to share code between Mac OS and Linux
Bundled fsmonitor for Linux using inotify API.
Seems to break asan job at CI when merged to 'seen'.
cf. <xmqqzg7d8xn2.fsf@gitster.g>
source: <pull.1352.v5.git.git.1670882286.gitgitgadget@gmail.com>
* my/wildmatch-cleanups (2023-02-27) 5 commits
. wildmatch: more cleanups after killing uchar
. wildmatch: use char instead of uchar
. wildmatch: remove NEGATE_CLASS(2) macros with trivial refactoring
. wildmatch: remove IS*() macros
. git-compat-util: add isblank() and isgraph()
Code clean-up.
Discarded without prejudice after more than 6 weeks of inactivity.
source: <20230226115021.1681834-1-masahiroy@kernel.org>
* cw/forbid-use-of-gitlink-outside-submodules (2023-02-28) 6 commits
. add: reject nested repositories
. tests: remove duplicate .gitmodules path
. tests: use `git submodule add` and fix expected status
. tests: use `git submodule add` and fix expected diffs
. tests: Use `git submodule add` instead of `git add`
. t4041, t4060: modernize test style
Forbid "git add dir" from adding a gitlink to the index.
Discarded without prejudice after more than 6 weeks of inactivity.
source: <20230228185253.2356546-1-calvinwan@google.com>
* nw/for-each-ref-signature (2023-03-13) 1 commit
. ref-filter: add new "signature" atom
"git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)"
placeholder and friends.
Breaks CI.
cf. <xmqqpm9bosjw.fsf@gitster.g>
source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
^ permalink raw reply [relevance 1%]
* Re: [PATCH 0/3] dropping "verbose" test helper function
2023-05-08 18:59 7% [PATCH 0/3] dropping "verbose" test helper function Jeff King
` (2 preceding siblings ...)
2023-05-08 19:04 6% ` [PATCH 3/3] t: drop "verbose" helper function Jeff King
@ 2023-05-08 22:26 0% ` Taylor Blau
3 siblings, 0 replies; 200+ results
From: Taylor Blau @ 2023-05-08 22:26 UTC (permalink / raw)
To: Jeff King; +Cc: git
On Mon, May 08, 2023 at 02:59:53PM -0400, Jeff King wrote:
> I happened across an instance of the "verbose" helper function in a
> test recently. I think it's clear we prefer the "-x" tracing to it these
> days, and we've been slowly removing instances. This series gets rid of
> the last few.
>
> The actual change (and rationale) is in patch 3. Patch 1 just fixes pipe
> problems on lines we'll be touching patch 3, and patch 2 is a cute
> optimization enabled by patch 1. I don't think any of it should be very
> controversial, but it can all be split up if need be.
>
> [1/3]: t7001: avoid git on upstream of pipe
> [2/3]: t7001: use "ls-files --format" instead of "cut"
> [3/3]: t: drop "verbose" helper function
All look good to me, I'd be happy to see this get picked up.
Thanks,
Taylor
^ permalink raw reply [relevance 0%]
* Re: [PATCH 3/3] t: drop "verbose" helper function
2023-05-08 19:04 6% ` [PATCH 3/3] t: drop "verbose" helper function Jeff King
@ 2023-05-08 22:26 0% ` Taylor Blau
0 siblings, 0 replies; 200+ results
From: Taylor Blau @ 2023-05-08 22:26 UTC (permalink / raw)
To: Jeff King; +Cc: git
On Mon, May 08, 2023 at 03:04:57PM -0400, Jeff King wrote:
> Let's consider the "verbose" function a failed experiment and remove the
> last few callers (which are all many years old, and have been dwindling
> as we remove them from scripts we touch for other reasons). It will be
> one less thing for new test writers to see and wonder if they should be
> using themselves.
Well put.
> I think this should be all calls. Most tests will fail after removing
> the function, of course, but it's possible one could be hiding in an
> expect_failure or something. I didn't see any after grepping for
> '[^-]verbose' in t/, which is not too long to look through.
>
> t/t0020-crlf.sh | 38 +++++++++++++++++++-------------------
> t/t1301-shared-repo.sh | 4 ++--
> t/t3427-rebase-subtree.sh | 12 ++++++------
> t/t4022-diff-rewrite.sh | 2 +-
> t/t4062-diff-pickaxe.sh | 2 +-
> t/t5304-prune.sh | 16 ++++++++--------
> t/t6006-rev-list-format.sh | 2 +-
> t/t6501-freshen-objects.sh | 2 +-
> t/t7001-mv.sh | 2 +-
> t/t7300-clean.sh | 4 ++--
> t/t9902-completion.sh | 30 +++++++++++++++---------------
> t/test-lib-functions.sh | 9 ---------
> 12 files changed, 57 insertions(+), 66 deletions(-)
I applied these myself and grepped around myself, and also could not
find any stragglers. So I'd be happy to drop the implementation of
verbose() in this series, too, to avoid the appearance of it continuing
to be a blessed path.
Thanks,
Taylor
^ permalink raw reply [relevance 0%]
* [PATCH 3/3] t: drop "verbose" helper function
2023-05-08 18:59 7% [PATCH 0/3] dropping "verbose" test helper function Jeff King
2023-05-08 19:01 13% ` [PATCH 1/3] t7001: avoid git on upstream of pipe Jeff King
2023-05-08 19:01 19% ` [PATCH 2/3] t7001: use "ls-files --format" instead of "cut" Jeff King
@ 2023-05-08 19:04 6% ` Jeff King
2023-05-08 22:26 0% ` Taylor Blau
2023-05-08 22:26 0% ` [PATCH 0/3] dropping "verbose" test " Taylor Blau
3 siblings, 1 reply; 200+ results
From: Jeff King @ 2023-05-08 19:04 UTC (permalink / raw)
To: git
We have a small helper function called "verbose", with the idea that you
can write:
verbose foo
to get a message to stderr when the "foo" command fails, even if it does
not produce any output itself. This goes back to 8ad1652418 (t5304: use
helper to report failure of "test foo = bar", 2014-10-10). It does work,
but overall it has not been a big success for two reasons:
1. Test writers have to remember to put it there (and the resulting
test code is longer as a result).
2. It doesn't handle the opposite case (we expect "foo" to fail, but
it succeeds), leading to inconsistencies in tests (which you can
see in many hunks of this patch, e.g. ones involving "has_cr").
Most importantly, we added a136f6d8ff (test-lib.sh: support -x option
for shell-tracing, 2014-10-10) at the same time, and it does roughly the
same thing. The output is not quite as succinct as "verbose", and you
have to watch out for stray shell-traces ending up in stderr. But it
solves both of the problems above, and has clearly become the preferred
tool.
Let's consider the "verbose" function a failed experiment and remove the
last few callers (which are all many years old, and have been dwindling
as we remove them from scripts we touch for other reasons). It will be
one less thing for new test writers to see and wonder if they should be
using themselves.
Signed-off-by: Jeff King <peff@peff.net>
---
I think this should be all calls. Most tests will fail after removing
the function, of course, but it's possible one could be hiding in an
expect_failure or something. I didn't see any after grepping for
'[^-]verbose' in t/, which is not too long to look through.
t/t0020-crlf.sh | 38 +++++++++++++++++++-------------------
t/t1301-shared-repo.sh | 4 ++--
t/t3427-rebase-subtree.sh | 12 ++++++------
t/t4022-diff-rewrite.sh | 2 +-
t/t4062-diff-pickaxe.sh | 2 +-
t/t5304-prune.sh | 16 ++++++++--------
t/t6006-rev-list-format.sh | 2 +-
t/t6501-freshen-objects.sh | 2 +-
t/t7001-mv.sh | 2 +-
t/t7300-clean.sh | 4 ++--
t/t9902-completion.sh | 30 +++++++++++++++---------------
t/test-lib-functions.sh | 9 ---------
12 files changed, 57 insertions(+), 66 deletions(-)
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 35cc8c3b39..81946e87cc 100755
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -125,7 +125,7 @@ test_expect_success 'update with autocrlf=input' '
munge_cr append dir/two &&
git update-index -- one dir/two &&
differs=$(git diff-index --cached HEAD) &&
- verbose test -z "$differs"
+ test -z "$differs"
'
@@ -138,7 +138,7 @@ test_expect_success 'update with autocrlf=true' '
munge_cr append dir/two &&
git update-index -- one dir/two &&
differs=$(git diff-index --cached HEAD) &&
- verbose test -z "$differs"
+ test -z "$differs"
'
@@ -153,7 +153,7 @@ test_expect_success 'checkout with autocrlf=true' '
test "$one" = $(git hash-object --stdin <one) &&
test "$two" = $(git hash-object --stdin <dir/two) &&
differs=$(git diff-index --cached HEAD) &&
- verbose test -z "$differs"
+ test -z "$differs"
'
test_expect_success 'checkout with autocrlf=input' '
@@ -167,7 +167,7 @@ test_expect_success 'checkout with autocrlf=input' '
test "$one" = $(git hash-object --stdin <one) &&
test "$two" = $(git hash-object --stdin <dir/two) &&
differs=$(git diff-index --cached HEAD) &&
- verbose test -z "$differs"
+ test -z "$differs"
'
test_expect_success 'apply patch (autocrlf=input)' '
@@ -177,7 +177,7 @@ test_expect_success 'apply patch (autocrlf=input)' '
git read-tree --reset -u HEAD &&
git apply patch.file &&
- verbose test "$patched" = "$(git hash-object --stdin <one)"
+ test "$patched" = "$(git hash-object --stdin <one)"
'
test_expect_success 'apply patch --cached (autocrlf=input)' '
@@ -187,7 +187,7 @@ test_expect_success 'apply patch --cached (autocrlf=input)' '
git read-tree --reset -u HEAD &&
git apply --cached patch.file &&
- verbose test "$patched" = $(git rev-parse :one)
+ test "$patched" = $(git rev-parse :one)
'
test_expect_success 'apply patch --index (autocrlf=input)' '
@@ -197,8 +197,8 @@ test_expect_success 'apply patch --index (autocrlf=input)' '
git read-tree --reset -u HEAD &&
git apply --index patch.file &&
- verbose test "$patched" = $(git rev-parse :one) &&
- verbose test "$patched" = $(git hash-object --stdin <one)
+ test "$patched" = $(git rev-parse :one) &&
+ test "$patched" = $(git hash-object --stdin <one)
'
test_expect_success 'apply patch (autocrlf=true)' '
@@ -208,7 +208,7 @@ test_expect_success 'apply patch (autocrlf=true)' '
git read-tree --reset -u HEAD &&
git apply patch.file &&
- verbose test "$patched" = "$(remove_cr <one | git hash-object --stdin)"
+ test "$patched" = "$(remove_cr <one | git hash-object --stdin)"
'
test_expect_success 'apply patch --cached (autocrlf=true)' '
@@ -218,7 +218,7 @@ test_expect_success 'apply patch --cached (autocrlf=true)' '
git read-tree --reset -u HEAD &&
git apply --cached patch.file &&
- verbose test "$patched" = $(git rev-parse :one)
+ test "$patched" = $(git rev-parse :one)
'
test_expect_success 'apply patch --index (autocrlf=true)' '
@@ -228,8 +228,8 @@ test_expect_success 'apply patch --index (autocrlf=true)' '
git read-tree --reset -u HEAD &&
git apply --index patch.file &&
- verbose test "$patched" = $(git rev-parse :one) &&
- verbose test "$patched" = "$(remove_cr <one | git hash-object --stdin)"
+ test "$patched" = $(git rev-parse :one) &&
+ test "$patched" = "$(remove_cr <one | git hash-object --stdin)"
'
test_expect_success '.gitattributes says two is binary' '
@@ -240,7 +240,7 @@ test_expect_success '.gitattributes says two is binary' '
git read-tree --reset -u HEAD &&
! has_cr dir/two &&
- verbose has_cr one &&
+ has_cr one &&
! has_cr three
'
@@ -259,8 +259,8 @@ test_expect_success '.gitattributes says two and three are text' '
echo "t* crlf" >.gitattributes &&
git read-tree --reset -u HEAD &&
- verbose has_cr dir/two &&
- verbose has_cr three
+ has_cr dir/two &&
+ has_cr three
'
test_expect_success 'in-tree .gitattributes (1)' '
@@ -273,7 +273,7 @@ test_expect_success 'in-tree .gitattributes (1)' '
git read-tree --reset -u HEAD &&
! has_cr one &&
- verbose has_cr three
+ has_cr three
'
test_expect_success 'in-tree .gitattributes (2)' '
@@ -283,7 +283,7 @@ test_expect_success 'in-tree .gitattributes (2)' '
git checkout-index -f -q -u -a &&
! has_cr one &&
- verbose has_cr three
+ has_cr three
'
test_expect_success 'in-tree .gitattributes (3)' '
@@ -294,7 +294,7 @@ test_expect_success 'in-tree .gitattributes (3)' '
git checkout-index -u one dir/two three &&
! has_cr one &&
- verbose has_cr three
+ has_cr three
'
test_expect_success 'in-tree .gitattributes (4)' '
@@ -305,7 +305,7 @@ test_expect_success 'in-tree .gitattributes (4)' '
git checkout-index -u .gitattributes &&
! has_cr one &&
- verbose has_cr three
+ has_cr three
'
test_expect_success 'checkout with existing .gitattributes' '
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh
index 1b6437ec07..ae5cd3f5a0 100755
--- a/t/t1301-shared-repo.sh
+++ b/t/t1301-shared-repo.sh
@@ -89,7 +89,7 @@ do
rm -f .git/info/refs &&
git update-server-info &&
actual="$(test_modebits .git/info/refs)" &&
- verbose test "x$actual" = "x-$y"
+ test "x$actual" = "x-$y"
'
@@ -99,7 +99,7 @@ do
rm -f .git/info/refs &&
git update-server-info &&
actual="$(test_modebits .git/info/refs)" &&
- verbose test "x$actual" = "x-$x"
+ test "x$actual" = "x-$x"
'
diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index 48b76f8232..1b3e97c875 100755
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -74,9 +74,9 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-main main &&
: first pick results in no changes &&
git rebase --skip &&
- verbose test "$(commit_message HEAD~2)" = "topic_4" &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
- verbose test "$(commit_message HEAD)" = "Empty commit"
+ test "$(commit_message HEAD~2)" = "topic_4" &&
+ test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
+ test "$(commit_message HEAD)" = "Empty commit"
'
test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' '
@@ -85,9 +85,9 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit'
test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-main --root &&
: first pick results in no changes &&
git rebase --skip &&
- verbose test "$(commit_message HEAD~2)" = "topic_4" &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
- verbose test "$(commit_message HEAD)" = "Empty commit"
+ test "$(commit_message HEAD~2)" = "topic_4" &&
+ test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
+ test "$(commit_message HEAD)" = "Empty commit"
'
test_done
diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
index 1c89050a97..6fed993ea0 100755
--- a/t/t4022-diff-rewrite.sh
+++ b/t/t4022-diff-rewrite.sh
@@ -24,7 +24,7 @@ test_expect_success setup '
test_expect_success 'detect rewrite' '
actual=$(git diff-files -B --summary test) &&
- verbose expr "$actual" : " rewrite test ([0-9]*%)$"
+ expr "$actual" : " rewrite test ([0-9]*%)$"
'
diff --git a/t/t4062-diff-pickaxe.sh b/t/t4062-diff-pickaxe.sh
index 9aaa068ed9..a90b46b678 100755
--- a/t/t4062-diff-pickaxe.sh
+++ b/t/t4062-diff-pickaxe.sh
@@ -24,7 +24,7 @@ test_expect_success '-G matches' '
test_expect_success '-S --pickaxe-regex' '
git diff --name-only -S0 --pickaxe-regex HEAD^ >out &&
- verbose test 4096-zeroes.txt = "$(cat out)"
+ test 4096-zeroes.txt = "$(cat out)"
'
test_done
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 662ae9b152..f367327441 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -16,7 +16,7 @@ add_blob() {
before=$(git count-objects | sed "s/ .*//") &&
BLOB=$(echo aleph_0 | git hash-object -w --stdin) &&
BLOB_FILE=.git/objects/$(echo $BLOB | sed "s/^../&\//") &&
- verbose test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
+ test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
test_path_is_file $BLOB_FILE &&
test-tool chmtime =+0 $BLOB_FILE
}
@@ -51,23 +51,23 @@ test_expect_success 'prune stale packs' '
test_expect_success 'prune --expire' '
add_blob &&
git prune --expire=1.hour.ago &&
- verbose test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
+ test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
test_path_is_file $BLOB_FILE &&
test-tool chmtime =-86500 $BLOB_FILE &&
git prune --expire 1.day &&
- verbose test $before = $(git count-objects | sed "s/ .*//") &&
+ test $before = $(git count-objects | sed "s/ .*//") &&
test_path_is_missing $BLOB_FILE
'
test_expect_success 'gc: implicit prune --expire' '
add_blob &&
test-tool chmtime =-$((2*$week-30)) $BLOB_FILE &&
git gc --no-cruft &&
- verbose test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
+ test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
test_path_is_file $BLOB_FILE &&
test-tool chmtime =-$((2*$week+1)) $BLOB_FILE &&
git gc --no-cruft &&
- verbose test $before = $(git count-objects | sed "s/ .*//") &&
+ test $before = $(git count-objects | sed "s/ .*//") &&
test_path_is_missing $BLOB_FILE
'
@@ -138,7 +138,7 @@ test_expect_success 'gc --no-prune' '
test-tool chmtime =-$((5001*$day)) $BLOB_FILE &&
git config gc.pruneExpire 2.days.ago &&
git gc --no-prune --no-cruft &&
- verbose test 1 = $(git count-objects | sed "s/ .*//") &&
+ test 1 = $(git count-objects | sed "s/ .*//") &&
test_path_is_file $BLOB_FILE
'
@@ -192,10 +192,10 @@ test_expect_success 'gc: prune old objects after local clone' '
git clone --no-hardlinks . aclone &&
(
cd aclone &&
- verbose test 1 = $(git count-objects | sed "s/ .*//") &&
+ test 1 = $(git count-objects | sed "s/ .*//") &&
test_path_is_file $BLOB_FILE &&
git gc --prune --no-cruft &&
- verbose test 0 = $(git count-objects | sed "s/ .*//") &&
+ test 0 = $(git count-objects | sed "s/ .*//") &&
test_path_is_missing $BLOB_FILE
)
'
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 41d0ca00b1..573eb97a0f 100755
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -493,7 +493,7 @@ test_expect_success 'empty email' '
test_tick &&
C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
- verbose test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
+ test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
'
test_expect_success 'del LF before empty (1)' '
diff --git a/t/t6501-freshen-objects.sh b/t/t6501-freshen-objects.sh
index dbfa8a4d4c..4521508b83 100755
--- a/t/t6501-freshen-objects.sh
+++ b/t/t6501-freshen-objects.sh
@@ -152,7 +152,7 @@ test_expect_success 'do not complain about existing broken links (commit)' '
EOF
commit=$(git hash-object -t commit -w broken-commit) &&
git gc --no-cruft -q 2>stderr &&
- verbose git cat-file -e $commit &&
+ git cat-file -e $commit &&
test_must_be_empty stderr
'
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 2e6a3c0a54..898a920532 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -192,7 +192,7 @@ test_expect_success "Michael Cassar's test case" '
T=$(git write-tree) &&
git ls-tree -r $T >out &&
- verbose grep partA/outline.txt out
+ grep partA/outline.txt out
'
rm -fr papers partA path?
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index c975eb54d2..0ef7b78457 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -120,7 +120,7 @@ test_expect_success 'git clean with relative prefix' '
grep part3 |
sed -n -e "s|^Would remove ||p"
) &&
- verbose test "$would_clean" = ../src/part3.c
+ test "$would_clean" = ../src/part3.c
'
test_expect_success 'git clean with absolute path' '
@@ -133,7 +133,7 @@ test_expect_success 'git clean with absolute path' '
grep part3 |
sed -n -e "s|^Would remove ||p"
) &&
- verbose test "$would_clean" = ../src/part3.c
+ test "$would_clean" = ../src/part3.c
'
test_expect_success 'git clean with out of work tree relative path' '
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index d6c0478d98..8835e16e81 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -405,40 +405,40 @@ test_expect_success '__gitdir - remote as argument' '
test_expect_success '__git_dequote - plain unquoted word' '
__git_dequote unquoted-word &&
- verbose test unquoted-word = "$dequoted_word"
+ test unquoted-word = "$dequoted_word"
'
# input: b\a\c\k\'\\\"s\l\a\s\h\es
# expected: back'\"slashes
test_expect_success '__git_dequote - backslash escaped' '
__git_dequote "b\a\c\k\\'\''\\\\\\\"s\l\a\s\h\es" &&
- verbose test "back'\''\\\"slashes" = "$dequoted_word"
+ test "back'\''\\\"slashes" = "$dequoted_word"
'
# input: sin'gle\' '"quo'ted
# expected: single\ "quoted
test_expect_success '__git_dequote - single quoted' '
__git_dequote "'"sin'gle\\\\' '\\\"quo'ted"'" &&
- verbose test '\''single\ "quoted'\'' = "$dequoted_word"
+ test '\''single\ "quoted'\'' = "$dequoted_word"
'
# input: dou"ble\\" "\"\quot"ed
# expected: double\ "\quoted
test_expect_success '__git_dequote - double quoted' '
__git_dequote '\''dou"ble\\" "\"\quot"ed'\'' &&
- verbose test '\''double\ "\quoted'\'' = "$dequoted_word"
+ test '\''double\ "\quoted'\'' = "$dequoted_word"
'
# input: 'open single quote
test_expect_success '__git_dequote - open single quote' '
__git_dequote "'\''open single quote" &&
- verbose test "open single quote" = "$dequoted_word"
+ test "open single quote" = "$dequoted_word"
'
# input: "open double quote
test_expect_success '__git_dequote - open double quote' '
__git_dequote "\"open double quote" &&
- verbose test "open double quote" = "$dequoted_word"
+ test "open double quote" = "$dequoted_word"
'
@@ -616,7 +616,7 @@ test_expect_success '__git_is_configured_remote' '
test_when_finished "git remote remove remote_2" &&
git remote add remote_2 git://remote_2 &&
(
- verbose __git_is_configured_remote remote_2 &&
+ __git_is_configured_remote remote_2 &&
test_must_fail __git_is_configured_remote non-existent
)
'
@@ -2596,30 +2596,30 @@ test_expect_success 'options with value' '
test_expect_success 'sourcing the completion script clears cached commands' '
(
__git_compute_all_commands &&
- verbose test -n "$__git_all_commands" &&
+ test -n "$__git_all_commands" &&
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
- verbose test -z "$__git_all_commands"
+ test -z "$__git_all_commands"
)
'
test_expect_success 'sourcing the completion script clears cached merge strategies' '
(
__git_compute_merge_strategies &&
- verbose test -n "$__git_merge_strategies" &&
+ test -n "$__git_merge_strategies" &&
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
- verbose test -z "$__git_merge_strategies"
+ test -z "$__git_merge_strategies"
)
'
test_expect_success 'sourcing the completion script clears cached --options' '
(
__gitcomp_builtin checkout &&
- verbose test -n "$__gitcomp_builtin_checkout" &&
+ test -n "$__gitcomp_builtin_checkout" &&
__gitcomp_builtin notes_edit &&
- verbose test -n "$__gitcomp_builtin_notes_edit" &&
+ test -n "$__gitcomp_builtin_notes_edit" &&
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
- verbose test -z "$__gitcomp_builtin_checkout" &&
- verbose test -z "$__gitcomp_builtin_notes_edit"
+ test -z "$__gitcomp_builtin_checkout" &&
+ test -z "$__gitcomp_builtin_notes_edit"
)
'
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 999d46fafe..6e19ebc922 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -1227,15 +1227,6 @@ test_i18ngrep () {
return 1
}
-# Call any command "$@" but be more verbose about its
-# failure. This is handy for commands like "test" which do
-# not output anything when they fail.
-verbose () {
- "$@" && return 0
- echo >&4 "command failed: $(git rev-parse --sq-quote "$@")"
- return 1
-}
-
# Check if the file expected to be empty is indeed empty, and barfs
# otherwise.
--
2.40.1.802.gdef2a8734a
^ permalink raw reply related [relevance 6%]
* [PATCH 2/3] t7001: use "ls-files --format" instead of "cut"
2023-05-08 18:59 7% [PATCH 0/3] dropping "verbose" test helper function Jeff King
2023-05-08 19:01 13% ` [PATCH 1/3] t7001: avoid git on upstream of pipe Jeff King
@ 2023-05-08 19:01 19% ` Jeff King
2023-05-08 19:04 6% ` [PATCH 3/3] t: drop "verbose" helper function Jeff King
2023-05-08 22:26 0% ` [PATCH 0/3] dropping "verbose" test " Taylor Blau
3 siblings, 0 replies; 200+ results
From: Jeff King @ 2023-05-08 19:01 UTC (permalink / raw)
To: git
Since ls-files recently learned a "--format" option, we can use that
rather than asking for all of "--stage" and then pulling out the bits we
want with "cut". That's simpler and avoids two extra processes (one for
cut, and one for the subshell to hold the intermediate result).
Signed-off-by: Jeff King <peff@peff.net>
---
t/t7001-mv.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index ea70419928..2e6a3c0a54 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -5,8 +5,7 @@ test_description='git mv in subdirs'
. "$TEST_DIRECTORY"/lib-diff-data.sh
index_at_path () {
- entry=$(git ls-files --stage "$@") &&
- echo "$entry" | cut -f 1
+ git ls-files --format='%(objectmode) %(objectname) %(stage)' "$@"
}
test_expect_success 'mv -f refreshes updated index entry' '
--
2.40.1.802.gdef2a8734a
^ permalink raw reply related [relevance 19%]
* [PATCH 1/3] t7001: avoid git on upstream of pipe
2023-05-08 18:59 7% [PATCH 0/3] dropping "verbose" test helper function Jeff King
@ 2023-05-08 19:01 13% ` Jeff King
2023-05-08 19:01 19% ` [PATCH 2/3] t7001: use "ls-files --format" instead of "cut" Jeff King
` (2 subsequent siblings)
3 siblings, 0 replies; 200+ results
From: Jeff King @ 2023-05-08 19:01 UTC (permalink / raw)
To: git
We generally avoid git on the left-hand side of a pipe, because it loses
the exit code of the command (and thus we'd miss things like segfaults
or unexpected failures). In the cases in t7001, we wouldn't expect
failures (they are just inspecting the repository state, and are not the
main point of the test), but it doesn't hurt to be careful.
In all but one case here we're piping "ls-files --stage" to cut off the
pathname (since we compare entries before and after moving). Let's pull
that into a helper function to avoid repeating the slightly awkward
replacement.
Signed-off-by: Jeff King <peff@peff.net>
---
t/t7001-mv.sh | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index d72cef8826..ea70419928 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -4,6 +4,11 @@ test_description='git mv in subdirs'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff-data.sh
+index_at_path () {
+ entry=$(git ls-files --stage "$@") &&
+ echo "$entry" | cut -f 1
+}
+
test_expect_success 'mv -f refreshes updated index entry' '
echo test >bar &&
git add bar &&
@@ -187,7 +192,8 @@ test_expect_success "Michael Cassar's test case" '
git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
T=$(git write-tree) &&
- git ls-tree -r $T | verbose grep partA/outline.txt
+ git ls-tree -r $T >out &&
+ verbose grep partA/outline.txt out
'
rm -fr papers partA path?
@@ -260,12 +266,12 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
git init &&
echo 1 >dirty &&
git add dirty &&
- entry="$(git ls-files --stage dirty | cut -f 1)" &&
+ entry="$(index_at_path dirty)" &&
git mv dirty dirty2 &&
- test "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" &&
+ test "$entry" = "$(index_at_path dirty2)" &&
echo 2 >dirty2 &&
git mv dirty2 dirty &&
- test "$entry" = "$(git ls-files --stage dirty | cut -f 1)"
+ test "$entry" = "$(index_at_path dirty)"
'
rm -f dirty dirty2
@@ -342,7 +348,7 @@ test_expect_success 'git mv cannot move a submodule in a file' '
'
test_expect_success 'git mv moves a submodule with a .git directory and no .gitmodules' '
- entry="$(git ls-files --stage sub | cut -f 1)" &&
+ entry="$(index_at_path sub)" &&
git rm .gitmodules &&
(
cd sub &&
@@ -353,7 +359,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
mkdir mod &&
git mv sub mod/sub &&
test_path_is_missing sub &&
- test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ test "$entry" = "$(index_at_path mod/sub)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -363,7 +369,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
rm -rf mod &&
git reset --hard &&
git submodule update &&
- entry="$(git ls-files --stage sub | cut -f 1)" &&
+ entry="$(index_at_path sub)" &&
(
cd sub &&
rm -f .git &&
@@ -373,7 +379,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
mkdir mod &&
git mv sub mod/sub &&
test_path_is_missing sub &&
- test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ test "$entry" = "$(index_at_path mod/sub)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
@@ -386,11 +392,11 @@ test_expect_success 'git mv moves a submodule with gitfile' '
rm -rf mod &&
git reset --hard &&
git submodule update &&
- entry="$(git ls-files --stage sub | cut -f 1)" &&
+ entry="$(index_at_path sub)" &&
mkdir mod &&
git -C mod mv ../sub/ . &&
test_path_is_missing sub &&
- test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ test "$entry" = "$(index_at_path mod/sub)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
@@ -404,12 +410,12 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
git reset --hard &&
git submodule update &&
git rm .gitmodules &&
- entry="$(git ls-files --stage sub | cut -f 1)" &&
+ entry="$(index_at_path sub)" &&
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
test_path_is_missing sub &&
- test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ test "$entry" = "$(index_at_path mod/sub)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -420,7 +426,7 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
git reset --hard &&
git submodule update &&
git config -f .gitmodules foo.bar true &&
- entry="$(git ls-files --stage sub | cut -f 1)" &&
+ entry="$(index_at_path sub)" &&
mkdir mod &&
test_must_fail git mv sub mod/sub 2>actual.err &&
test_file_not_empty actual.err &&
@@ -430,7 +436,7 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
test_path_is_missing sub &&
- test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ test "$entry" = "$(index_at_path mod/sub)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -442,13 +448,13 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
git submodule update &&
git config -f .gitmodules --remove-section submodule.sub &&
git add .gitmodules &&
- entry="$(git ls-files --stage sub | cut -f 1)" &&
+ entry="$(index_at_path sub)" &&
echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
test_cmp expect.err actual.err &&
test_path_is_missing sub &&
- test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ test "$entry" = "$(index_at_path mod/sub)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
--
2.40.1.802.gdef2a8734a
^ permalink raw reply related [relevance 13%]
* [PATCH 0/3] dropping "verbose" test helper function
@ 2023-05-08 18:59 7% Jeff King
2023-05-08 19:01 13% ` [PATCH 1/3] t7001: avoid git on upstream of pipe Jeff King
` (3 more replies)
0 siblings, 4 replies; 200+ results
From: Jeff King @ 2023-05-08 18:59 UTC (permalink / raw)
To: git
I happened across an instance of the "verbose" helper function in a
test recently. I think it's clear we prefer the "-x" tracing to it these
days, and we've been slowly removing instances. This series gets rid of
the last few.
The actual change (and rationale) is in patch 3. Patch 1 just fixes pipe
problems on lines we'll be touching patch 3, and patch 2 is a cute
optimization enabled by patch 1. I don't think any of it should be very
controversial, but it can all be split up if need be.
[1/3]: t7001: avoid git on upstream of pipe
[2/3]: t7001: use "ls-files --format" instead of "cut"
[3/3]: t: drop "verbose" helper function
t/t0020-crlf.sh | 38 +++++++++++++++++++-------------------
t/t1301-shared-repo.sh | 4 ++--
t/t3427-rebase-subtree.sh | 12 ++++++------
t/t4022-diff-rewrite.sh | 2 +-
t/t4062-diff-pickaxe.sh | 2 +-
t/t5304-prune.sh | 16 ++++++++--------
t/t6006-rev-list-format.sh | 2 +-
t/t6501-freshen-objects.sh | 2 +-
t/t7001-mv.sh | 37 +++++++++++++++++++++----------------
t/t7300-clean.sh | 4 ++--
t/t9902-completion.sh | 30 +++++++++++++++---------------
t/test-lib-functions.sh | 9 ---------
12 files changed, 77 insertions(+), 81 deletions(-)
-Peff
^ permalink raw reply [relevance 7%]
* [ANNOUNCE] Git v2.39.0
@ 2022-12-12 13:43 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2022-12-12 13:43 UTC (permalink / raw)
To: git; +Cc: Linux Kernel, git-packagers
The latest feature release Git v2.39.0 is now available at the
usual places. It is comprised of 483 non-merge commits since
v2.38.0, contributed by 86 people, 31 of which are new faces [*].
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.39.0'
tag and the 'master' branch that the tag points at:
url = https://git.kernel.org/pub/scm/git/git
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.38.0 are as follows.
Welcome to the Git development community!
Alexander Kanavin, Alexander Meshcheryakov, Andreas Hasenack,
Anh Le, Arthur Chan, Daniel Sonbolian, Debra Obondo, Diomidis
Spinellis, Erik Cervin Edin, Hank Leininger, herr.kaste, John
A. Leuenhagen, Julia Ramer, Kevin Backhouse, Kousik Sanagavarapu,
Lukáš Doktor, Martin Englund, M Hickford, Michael V. Scovetta,
Noah Betzen, Nsengiyumva Wilberforce, orygaw, Oscar Dominguez,
Ronan Pigott, Rubén Justo, Sotir Danailov, srz_zumix, Stefano
Rivera, Tim Jaacks, Vincent Bernat, and Vlad-Stefan Harbuz.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
정재우, Ævar Arnfjörð Bjarmason, Alejandro R. Sedeño,
Alexander Shopov, Alex Henrie, Bagas Sanjaya, Derrick Stolee,
Đoàn Trần Công Danh, Elijah Newren, Emily Shaffer, Emir
SARI, Eric DeCosta, Eric Sunshine, Eric Wong, Fangyi Zhou,
Glen Choo, Han-Wen Nienhuys, Jan Pokorný, Jean-Noël Avila,
Jeff Hostetler, Jeff King, Jerry Zhang, Jiang Xin, Johannes
Altmanninger, Johannes Schindelin, John Cai, Jonathan Tan,
Jordi Mas, Julien Moutinho, Junio C Hamano, Kyle Meyer, Martin
Ågren, Martin von Zweigbergk, Matheus Tavares, Matthew John
Cheetham, Matthias Rüster, Michael J Gruber, Michael McClimon,
Patrick Steinhardt, Paul Smith, Peter Krefting, Philip Oakley,
Philippe Blain, Phillip Wood, Ralf Thielow, Randall S. Becker,
René Scharfe, Sergey Organov, Shaoxuan Yuan, SZEDER Gábor,
Taylor Blau, Torsten Bögershausen, Victoria Dye, Yi-Jyun Pan,
and 依云.
[*] We are counting not just the authorship contribution but issue
reporting, mentoring, helping and reviewing that are recorded in
the commit trailers.
----------------------------------------------------------------
Git v2.39 Release Notes
=======================
UI, Workflows & Features
------------------------
* "git grep" learned to expand the sparse-index more lazily and on
demand in a sparse checkout.
* By default, use of fsmonitor on a repository on networked
filesystem is disabled. Add knobs to make it workable on macOS.
* After checking out a "branch" that is a symbolic-ref that points at
another branch, "git symbolic-ref HEAD" reports the underlying
branch, not the symbolic-ref the user gave checkout as argument.
The command learned the "--no-recurse" option to stop after
dereferencing a symbolic-ref only once.
* "git branch --edit-description @{-1}" is now a way to edit branch
description of the branch you were on before switching to the
current branch.
* "git merge-tree --stdin" is a new way to request a series of merges
and report the merge results.
* "git shortlog" learned to group by the "format" string.
* A new "--include-whitespace" option is added to "git patch-id", and
existing bugs in the internal patch-id logic that did not match
what "git patch-id" produces have been corrected.
* Enable gc.cruftpacks by default for those who opt into
feature.experimental setting.
* "git repack" learns to send cruft objects out of the way into
packfiles outside the repository.
* 'scalar reconfigure -a' is taught to automatically remove
scalar.repo entires which no longer exist.
* Redact headers from cURL's h2h3 module in GIT_CURL_VERBOSE and
others.
* 'git maintenance register' is taught to write configuration to an
arbitrary path, and 'git for-each-repo' is taught to expand tilde
characters in paths.
* When creating new notes, the template used to get a stray empty
newline, which has been removed.
* "git receive-pack" used to use all the local refs as the boundary for
checking connectivity of the data "git push" sent, but now it uses
only the refs that it advertised to the pusher. In a repository with
the .hideRefs configuration, this reduces the resources needed to
perform the check.
* With '--recurse-submodules=on-demand', all submodules are
recursively pushed.
Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------
* With a bit of header twiddling, use the native regexp library on
macOS instead of the compat/ one.
* Prepare for GNU [ef]grep that throw warning of their uses.
* Sources related to fuzz testing have been moved down to their own
directory.
* Most credential helpers ignored unknown entries in a credential
description, but a few died upon seeing them. The latter were
taught to ignore them, too
* "scalar unregister" in a repository that is already been
unregistered reported an error.
* Remove error detection from a function that fetches from promisor
remotes, and make it die when such a fetch fails to bring all the
requested objects, to give an early failure to various operations.
* Update CodingGuidelines to clarify what features to use and avoid
in C99.
* Avoid false-positive from LSan whose assumption may be broken with
higher optimization levels.
* Enable address and undefined sanitizer tasks at GitHub Actions CI.
* More UNUSED annotation to help using -Wunused option with the
compiler.
(merge 4b992f0a24 jk/unused-anno-more later to maint).
* Rewrite a deep recursion in the skipping negotiator to use a loop
with on-heap prio queue to avoid stack wastage.
* Add documentation for message IDs in fsck error messages.
* Define the logical elements of a "bundle list", data structure to
store them in-core, format to transfer them, and code to parse
them.
* The role the security mailing list plays in an embargoed release
has been documented.
* Two new facilities, "timer" and "counter", are introduced to the
trace2 API.
* Code simplification by using strvec_pushf() instead of building an
argument in a separate strbuf.
* Make sure generated dependency file is stably sorted to help
developers debugging their build issues.
* The glossary entries for "commit-graph file" and "reachability
bitmap" have been added.
* Various tests exercising the transfer.credentialsInUrl
configuration are taught to avoid making requests which require
resolving localhost to reduce CI-flakiness.
* A redundant diagnostic message is dropped from test_path_is_missing().
* Simplify the run-command API.
* Update the actions/github-script dependency in CI to avoid a
deprecation warning.
* Progress on being able to initialize a rev_info struct with a
macro.
* Add trace2 counters to the region to clear skip worktree bits in a
sparse checkout.
* Modernize test script to avoid "test -f" and friends.
* Avoid calling 'cache_tree_update()' when doing so would be
redundant.
* Update the credential-cache documentation to provide a more
realistic example.
* Makefile comments updates and reordering to clarify knobs used to
choose SHA implementations.
* A design document for sparse-checkout's future directions has been
added.
* Teach chainlint.pl to annotate the original test definition instead
of the token stream.
* "make coccicheck" is time consuming. It has been made to run more
incrementally.
* `parse_object()` has been hardened to check for the existence of a
suspected blob object.
* The build procedure has been adjusted to GNUmake version 4.4, which
made some changes to how pattern rule with multiple targets are
handled.
Fixes since v2.38
-----------------
* The codepath that reads from the index v4 had unaligned memory
accesses, which has been corrected.
* Fix messages incorrectly marked for translation.
* "git fsck" failed to release contents of tree objects already used
from the memory, which has been fixed.
* "git clone" did not like to see the "--bare" and the "--origin"
options used together without a good reason.
* "git remote rename" failed to rename a remote without fetch
refspec, which has been corrected.
* Documentation on various Boolean GIT_* environment variables have
been clarified.
* "git rebase -i" can mistakenly attempt to apply a fixup to a commit
itself, which has been corrected.
* "git multi-pack-index repack/expire" used to repack unreachable
cruft into a new pack, which have been corrected.
* In read-only repositories, "git merge-tree" tried to come up with a
merge result tree object, which it failed (which is not wrong) and
led to a segfault (which is bad), which has been corrected.
* Force C locale while running tests around httpd to make sure we can
find expected error messages in the log.
* Fix a logic in "mailinfo -b" that miscomputed the length of a
substring, which lead to an out-of-bounds access.
* The codepath to sign learned to report errors when it fails to read
from "ssh-keygen".
* Code clean-up that results in plugging a leak.
* "GIT_EDITOR=: git branch --edit-description" resulted in failure,
which has been corrected.
* The code to clean temporary object directories (used for
quarantine) tried to remove them inside its signal handler, which
was a no-no.
* Update comment in the Makefile about the RUNTIME_PREFIX config knob.
* Clarify that "the sentence after <area>: prefix does not begin with
a capital letter" rule applies only to the commit title.
* "git branch --edit-description" on an unborn branch misleadingly
said that no such branch exists, which has been corrected.
* Work around older clang that warns against C99 zero initialization
syntax for struct.
* Giving "--invert-grep" and "--all-match" without "--grep" to the
"git log" command resulted in an attempt to access grep pattern
expression structure that has not been allocated, which has been
corrected.
(merge db84376f98 ab/grep-simplify-extended-expression later to maint).
* "git diff rev^!" did not show combined diff to go to the rev from
its parents.
(merge a79c6b6081 rs/diff-caret-bang-with-parents later to maint).
* Allow configuration files in "protected" scopes to include other
configuration files.
(merge ecec57b3c9 gc/bare-repo-discovery later to maint).
* Give a bit more diversity to macOS CI by using sha1dc in one of the
jobs (the other one tests Apple Common Crypto).
(merge 1ad5c3df35 jc/ci-osx-with-sha1dc later to maint).
* A bugfix with tracing support in midx codepath
(merge e9c3839944 tb/midx-bitmap-selection-fix later to maint).
* When geometric repacking feature is in use together with the
--pack-kept-objects option, we lost packs marked with .keep files.
(merge 197443e80a tb/save-keep-pack-during-geometric-repack later to maint).
* Move a global variable added as a hack during regression fixes to
its proper place in the API.
(merge 0b0ab95f17 ab/run-hook-api-cleanup later to maint).
* Update to build procedure with VS using CMake/CTest.
(merge c858750b41 js/cmake-updates later to maint).
* The short-help text shown by "git cmd -h" and the synopsis text
shown at the beginning of "git help cmd" have been made more
consistent.
* When creating a multi-pack bitmap, remove per-pack bitmap files
unconditionally as they will never be consulted.
(merge 55d902cd61 tb/remove-unused-pack-bitmap later to maint).
* Fix a longstanding syntax error in Git.pm error codepath.
* "git diff --stat" etc. were invented back when everything was ASCII
and strlen() was a way to measure the display width of a string;
adjust them to compute the display width assuming UTF-8 pathnames.
(merge ce8529b2bb tb/diffstat-with-utf8-strwidth later to maint).
* "git branch --edit-description" can exit with status -1 which is
not a good practice; it learned to use 1 as everybody else instead.
* "git apply" limits its input to a bit less than 1 GiB.
* Merging a branch with directory renames into a branch that changes
the directory to a symlink was mishandled by the ort merge
strategy, which has been corrected.
* A bugfix to "git subtree" in its split and merge features.
* Fix some bugs in the reflog messages when rebasing and changes the
reflog messages of "rebase --apply" to match "rebase --merge" with
the aim of making the reflog easier to parse.
* "git rebase --keep-base" used to discard the commits that are
already cherry-picked to the upstream, even when "keep-base" meant
that the base, on top of which the history is being rebuilt, does
not yet include these cherry-picked commits. The --keep-base
option now implies --reapply-cherry-picks and --no-fork-point
options.
* The way "git repack" created temporary files when it received a
signal was prone to deadlocking, which has been corrected.
* Various tests exercising the transfer.credentialsInUrl
configuration are taught to avoid making requests which require
resolving localhost to reduce CI-flakiness.
* The adjust_shared_perm() helper function learned to refrain from
setting the "g+s" bit on directories when it is not necessary.
* "git archive" mistakenly complained twice about a missing
executable, which has been corrected.
* Fix a bug where `git branch -d` did not work on an orphaned HEAD.
* `git rebase --update-refs` would delete references when all
`update-ref` commands in the sequencer were removed, which has been
corrected.
* Fix a regression in the bisect-helper which mistakenly treats
arguments to the command given to 'git bisect run' as arguments to
the helper.
* Correct an error where `git rebase` would mistakenly use a branch or
tag named "refs/rewritten/xyz" when missing a rebase label.
* Assorted fixes of parsing end-user input as integers.
(merge 14770cf0de pw/config-int-parse-fixes later to maint).
* "git prune" may try to iterate over .git/objects/pack for trash
files to remove in it, and loudly fail when the directory is
missing, which is not necessary. The command has been taught to
ignore such a failure.
(merge 6974765352 ew/prune-with-missing-objects-pack later to maint).
* Add one more candidate directory that may house httpd modules while
running tests.
(merge 1c7dc23d41 es/locate-httpd-module-location-in-test later to maint).
* A handful of leaks in the line-log machinery have been plugged.
* The format of a line in /proc/cpuinfo that describes a CPU on s390x
looked different from everybody else, and the code in chainlint.pl
failed to parse it.
(merge 1f51b77f4f ah/chainlint-cpuinfo-parse-fix later to maint).
* Adjust the GitHub CI to newer ubuntu release.
(merge 0d3507f3e7 jx/ci-ubuntu-fix later to maint).
* Other code cleanup, docfix, build fix, etc.
(merge 413bc6d20a ds/cmd-main-reorder later to maint).
(merge 8d2863e4ed nw/t1002-cleanup later to maint).
(merge 7c2dc122f9 rs/list-objects-filter-leakfix later to maint).
(merge 288fcb1c94 zk/push-use-bitmaps later to maint).
(merge 42db324c0f km/merge-recursive-typofix later to maint).
----------------------------------------------------------------
Changes since v2.38.0 are as follows:
Alejandro R. Sedeño (1):
git-compat-util.h: GCC deprecated message arg only in GCC 4.5+
Alex Henrie (2):
fsmonitor--daemon: don't translate literal commands
push: improve grammar of branch.autoSetupMerge advice
Alexander Shopov (1):
l10n: bg.po: Updated Bulgarian translation (5501t)
Andreas Hasenack (1):
chainlint.pl: fix /proc/cpuinfo regexp
Anh Le (2):
index: add trace2 region for clear skip worktree
index: raise a bug if the index is materialised more than once
Arthur Chan (1):
fuzz: reorganise the path for existing oss-fuzz fuzzers
Bagas Sanjaya (1):
l10n: po-id for 2.39 (round 1)
Daniel Sonbolian (1):
git.c: improve code readability in cmd_main()
Debra Obondo (1):
t7001-mv.sh: modernizing test script using functions
Derrick Stolee (15):
maintenance: add 'unregister --force'
scalar: make 'unregister' idempotent
gc: replace config subprocesses with API calls
string-list: document iterator behavior on NULL input
bundle-uri: fix technical doc issues
bundle-uri: use plain string in find_temp_filename()
bundle-uri: create bundle_list struct and helpers
bundle-uri: create base key-value pair parsing
bundle-uri: parse bundle list in config format
bundle-uri: limit recursion depth for bundle lists
bundle: properly clear all revision flags
bundle-uri: fetch a list of bundles
bundle: add flags to verify_bundle()
bundle-uri: quiet failed unbundlings
bundle-uri: suppress stderr from remote-https
Diomidis Spinellis (1):
grep: fix multibyte regex handling under macOS
Elijah Newren (4):
merge-ort: fix bug with dir rename vs change dir to symlink
merge-tree: update documentation for differences in -z output
merge-tree: support multiple batched merges with --stdin
sparse-checkout.txt: new document with sparse-checkout directions
Emily Shaffer (2):
gc: add tests for --cruft and friends
config: let feature.experimental imply gc.cruftPacks=true
Emir SARI (1):
l10n: tr: v2.39.0 updates
Eric DeCosta (6):
fsmonitor: refactor filesystem checks to common interface
fsmonitor: relocate socket file if .git directory is remote
fsmonitor: avoid socket location check if using hook
fsmonitor: deal with synthetic firmlinks on macOS
fsmonitor: check for compatability before communicating with fsmonitor
fsmonitor: add documentation for allowRemote and socketDir options
Eric Sunshine (9):
check-non-portable-shell: detect obsolescent egrep/fgrep
chainlint: add explanatory comments
chainlint: tighten accuracy when consuming input stream
chainlint: latch start/end position of each token
chainlint: annotate original test definition rather than token stream
chainlint: sidestep impoverished macOS "terminfo"
chainlint: latch line numbers at which each token starts and ends
chainlint: prefix annotated test definition with line numbers
lib-httpd: extend module location auto-detection
Eric Wong (2):
delta-islands: free island-related data after use
prune: quiet ENOENT on missing directories
Fangyi Zhou (1):
l10n: zh_CN v2.39.0 round 1
Glen Choo (3):
config: respect includes in protected config
http: redact curl h2h3 headers in info
object-file: use real paths when adding alternates
Han-Wen Nienhuys (1):
refs: unify parse_worktree_ref() and ref_type()
Jean-Noël Avila (2):
i18n: fix command template placeholder format
l10n: fr: v2.39 rnd 1
Jeff Hostetler (9):
config.mak.dev: disable suggest braces error on old clang versions
trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
tr2tls: clarify TLS terminology
api-trace2.txt: elminate section describing the public trace2 API
trace2: rename the thread_name argument to trace2_thread_start
trace2: improve thread-name documentation in the thread-context
trace2: convert ctx.thread_name from strbuf to pointer
trace2: add stopwatch timers
trace2: add global counter mechanism
Jeff King (43):
fsck: free tree buffers after walking unreachable objects
fsck: turn off save_commit_buffer
parse_object_buffer(): respect save_commit_buffer
clone: allow "--bare" with "-o"
remote: handle rename of remote without fetch refspec
shell: add basic tests
shell: limit size of interactive commands
sequencer: detect author name errors in read_author_script()
test-submodule: inline resolve_relative_url() function
multi-pack-index: avoid writing to global in option callback
commit: avoid writing to global in option callback
attr: drop DEBUG_ATTR code
dir: use fspathncmp() in pl_hashmap_cmp()
fsmonitor: fix leak of warning message
diffstat_consume(): assert non-zero length
submodule--helper: drop unused argc from module_list_compute()
update-index: drop unused argc from do_reupdate()
mark unused parameters in trivial compat functions
object-file: mark unused parameters in hash_unknown functions
string-list: mark unused callback parameters
date: mark unused parameters in handler functions
apply: mark unused parameters in handlers
apply: mark unused parameters in noop error/warning routine
convert: mark unused parameter in null stream filter
diffcore-pickaxe: mark unused parameters in pickaxe functions
ll-merge: mark unused parameters in callbacks
Makefile: force -O0 when compiling with SANITIZE=leak
repack: convert "names" util bitfield to array
repack: populate extension bits incrementally
repack: expand error message for missing pack files
repack: use tempfiles for signal cleanup
repack: drop remove_temporary_files()
Git.pm: trust rev-parse to find bare repositories
t7700: annotate cruft-pack failure with ok=sigpipe
shortlog: accept `--date`-related options
Makefile: force -O0 when compiling with SANITIZE=leak
t5516: move plaintext-password tests from t5601 and t5516
ref-filter: fix parsing of signatures without blank lines
ref-filter: fix parsing of signatures with CRLF and no body
branch: gracefully handle '-d' on orphan HEAD
t: run t5551 tests with both HTTP and HTTP/2
parse_object(): drop extra "has" check before checking object type
parse_object(): check on-disk type of suspected blob
Jerry Zhang (6):
patch-id: fix stable patch id for binary / header-only
patch-id: use stable patch-id for rebases
builtin: patch-id: fix patch-id with binary diffs
patch-id: fix patch-id for mode changes
builtin: patch-id: add --verbatim as a command mode
builtin: patch-id: remove unused diff-tree prefix
Jiang Xin (5):
t5516: fail to run in verbose mode
github-actions: run gcc-8 on ubuntu-20.04 image
ci: remove the pipe after "p4 -V" to catch errors
ci: use the same version of p4 on both Linux and macOS
ci: install python on ubuntu
Johannes Altmanninger (1):
sequencer: avoid dropping fixup commit that targets self via commit-ish
Johannes Schindelin (14):
merge-ort: fix segmentation fault in read-only repositories
merge-ort: return early when failing to write a blob
cmake: make it easier to diagnose regressions in CTest runs
cmake: copy the merge tools for testing
add -p: avoid ambiguous signed/unsigned comparison
cmake: avoid editing t/test-lib.sh
cmake: increase time-out for a long-running test
t5516/t5601: be less strict about the number of credential warnings
scalar reconfigure -a: remove stale `scalar.repo` entries
ci: use a newer `github-script` version
tests(scalar): tighten the stale `scalar.repo` test some
ci: avoid using deprecated {up,down}load-artifacts Action
RelNotes: a couple of typofixes
ci: use a newer `github-script` version
John Cai (3):
tmp-objdir: skip clean up when handling a signal
fsck: remove the unused BAD_TAG_OBJECT
fsck: document msg-id
Jonathan Tan (4):
promisor-remote: remove a return value
promisor-remote: die upon failing fetch
negotiator/skipping: avoid stack overflow
Doc: document push.recurseSubmodules=only
Jordi Mas (1):
l10n: Update Catalan translation
Julia Ramer (1):
embargoed releases: also describe the git-security list and the process
Junio C Hamano (32):
environ: document GIT_SSL_NO_VERIFY
environ: explain Boolean environment variables
environ: GIT_FLUSH should be made a usual Boolean
environ: simplify description of GIT_INDEX_FILE
environ: GIT_INDEX_VERSION affects not just a new repository
branch: do not fail a no-op --edit-desc
SubmittingPatches: use usual capitalization in the log message body
Start 2.39 cycle
symbolic-ref: teach "--[no-]recurse" option
The (real) first batch for 2.39
The second batch
The third batch
The fourth batch
ci: add address and undefined sanitizer tasks
ci: use DC_SHA1=YesPlease on osx-clang job for CI
The fifth batch
diff: leave NEEDWORK notes in show_stats() function
fsck: remove the unused MISSING_TREE_OBJECT
Documentation: add lint-fsck-msgids
Downmerge a handful of topics for 2.38.2
The sixth batch
Downmerge a bit more for 2.38.2
The seventh batch
The eighth batch
adjust_shared_perm(): leave g+s alone when the group does not matter
Git 2.39-rc0
Another batch before -rc1
A bit more before -rc1
Git 2.39-rc1
Git 2.39-rc2
Git 2.38.2
Git 2.39
Kevin Backhouse (1):
alias.c: reject too-long cmdline strings in split_cmdline()
Kousik Sanagavarapu (1):
repository-version.txt: partialClone casing change
Kyle Meyer (1):
merge-recursive: fix variable typo in error message
M Hickford (4):
Documentation/gitcredentials.txt: mention password alternatives
Documentation: increase example cache timeout to 1 hour
docs: clarify that credential discards unrecognised attributes
Docs: describe how a credential-generating helper works
Martin Ågren (1):
test-lib-functions: drop redundant diagnostic print
Matheus Tavares (1):
mailmap: update email address of Matheus Tavares
Matthew John Cheetham (3):
wincred: ignore unknown lines (do not die)
netrc: ignore unknown lines (do not die)
osxkeychain: clarify that we ignore unknown lines
Michael J Gruber (1):
notes: avoid empty line in template
Michael McClimon (1):
Git.pm: add semicolon after catch statement
Noah Betzen (1):
mergetool.txt: typofix 'overwriten' -> 'overwritten'
Nsengiyumva Wilberforce (1):
t1002: modernize outdated conditional
Oscar Dominguez (1):
ci(main): upgrade actions/checkout to v3
Patrick Steinhardt (7):
refs: fix memory leak when parsing hideRefs config
refs: get rid of global list of hidden refs
revision: move together exclusion-related functions
revision: introduce struct to handle exclusions
revision: add new parameter to exclude hidden refs
rev-parse: add `--exclude-hidden=` option
receive-pack: only use visible refs for connectivity check
Paul Smith (1):
Makefile: avoid multiple patterns when recipes generate one file
Peter Krefting (1):
l10n: sv.po: Update Swedish translation (5501t0f0)
Philip Oakley (4):
doc: use "commit-graph" hyphenation consistently
doc: use 'object database' not ODB or abbreviation
glossary: add "commit graph" description
glossary: add reachability bitmap description
Philippe Blain (9):
test-lib-functions: mark 'test_commit' variables as 'local'
subtree: use 'git rev-parse --verify [--quiet]' for better error messages
subtree: add 'die_incompatible_opt' function to reduce duplication
subtree: prefix die messages with 'fatal'
subtree: define a variable before its first use in 'find_latest_squash'
subtree: use named variables instead of "$@" in cmd_pull
subtree: process 'git-subtree-split' trailer in separate function
subtree: fix squash merging after annotated tag was squashed merged
subtree: fix split after annotated tag was squashed merged
Phillip Wood (26):
mailinfo -b: fix an out of bounds access
ssh signing: return an error when signature cannot be read
t3435: remove redundant test case
t3416: tighten two tests
t3416: set $EDITOR in subshell
rebase: be stricter when reading state files containing oids
rebase: store orig_head as a commit
rebase: rename merge_base to branch_base
rebase: factor out branch_base calculation
rebase --keep-base: imply --reapply-cherry-picks
rebase --keep-base: imply --no-fork-point
rebase --apply: remove duplicated code
t3406: rework rebase reflog tests
rebase --merge: fix reflog when continuing
rebase --merge: fix reflog message after skipping
rebase --apply: respect GIT_REFLOG_ACTION
rebase --apply: make reflog messages match rebase --merge
rebase --abort: improve reflog message
rebase: cleanup action handling
sequencer: stop exporting GIT_REFLOG_ACTION
rebase: stop exporting GIT_REFLOG_ACTION
git_parse_unsigned: reject negative values
config: require at least one digit when parsing numbers
git_parse_signed(): avoid integer overflow
sequencer: unify label lookup
sequencer: tighten label lookups
Ralf Thielow (1):
l10n: de.po: update German translation
René Scharfe (21):
revision: use strtol_i() for exclude_parent
revisions.txt: unspecify order of resolved parts of ^!
diff: support ^! for merges
gc: simplify maintenance_task_pack_refs()
t/lib-httpd: pass LANG and LC_ALL to Apache
bisect--helper: plug strvec leak
archive: deduplicate verbose printing
submodule: use strvec_pushf() for --super-prefix
run-command: fix return value comment
am: simplify building "show" argument list
bisect: simplify building "checkout" argument list
bisect--helper: factor out do_bisect_run()
sequencer: simplify building argument list in do_exec()
use child_process member "args" instead of string array variable
use child_process members "args" and "env" directly
replace and remove run_command_v_opt_cd_env()
replace and remove run_command_v_opt_tr2()
replace and remove run_command_v_opt_cd_env_tr2()
replace and remove run_command_v_opt()
archive-tar: report filter start error only once
list-objects-filter: plug combine_filter_data leak
Ronan Pigott (2):
for-each-repo: interpolate repo path arguments
maintenance: add option to register in a specific config
Rubén Justo (5):
ref-filter.c: fix a leak in get_head_description
branch: description for non-existent branch errors
branch: support for shortcuts like @{-1}, completed
branch: error copying or renaming a detached HEAD
branch: error code with --edit-description
SZEDER Gábor (4):
Documentation/build-docdep.perl: generate sorted output
line-log: free diff queue when processing non-merge commits
line-log: free the diff queues' arrays when processing merge commits
diff.c: use diff_free_queue()
Sergey Organov (3):
diff-merges: cleanup func_by_opt()
diff-merges: cleanup set_diff_merges()
diff-merges: clarify log.diffMerges documentation
Shaoxuan Yuan (1):
builtin/grep.c: integrate with sparse index
Sotir Danailov (1):
docs: git-send-email: difference between ssl and tls smtp-encryption
Taylor Blau (64):
Documentation/git-multi-pack-index.txt: fix typo
Documentation/git-multi-pack-index.txt: clarify expire behavior
midx.c: prevent `expire` from removing the cruft pack
midx.c: avoid cruft packs with `repack --batch-size=0`
midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`
midx.c: remove unnecessary loop condition
midx.c: avoid cruft packs with non-zero `repack --batch-size`
builtin/clone.c: disallow `--local` clones with symlinks
t/lib-submodule-update.sh: allow local submodules
t/t1NNN: allow local submodules
t/2NNNN: allow local submodules
t/t3NNN: allow local submodules
t/t4NNN: allow local submodules
t/t5NNN: allow local submodules
t/t6NNN: allow local submodules
t/t7NNN: allow local submodules
t/t9NNN: allow local submodules
transport: make `protocol.file.allow` be "user" by default
t1092: prepare for changing protocol.file.allow
t2080: prepare for changing protocol.file.allow
t1092: prepare for changing protocol.file.allow
t2080: prepare for changing protocol.file.allow
t3207: prepare for changing protocol.file.allow
t5516: prepare for changing protocol.file.allow
t5537: prepare for changing protocol.file.allow
t7814: prepare for changing protocol.file.allow
t3206: prepare for changing protocol.file.allow
t5537: prepare for changing protocol.file.allow
Git 2.30.6
Git 2.31.5
Git 2.32.4
Git 2.33.5
Git 2.34.5
Git 2.35.5
Git 2.36.3
t7527: prepare for changing protocol.file.allow
Git 2.37.4
Git 2.38.1
midx.c: fix whitespace typo
midx.c: consider annotated tags during bitmap selection
midx.c: instrument MIDX and bitmap generation with trace2 regions
pack-bitmap-write.c: instrument number of reused bitmaps
builtin/repack.c: remove redundant pack-based bitmaps
repack: don't remove .keep packs with `--pack-kept-objects`
builtin/repack.c: pass "out" to `prepare_pack_objects`
builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
builtin/repack.c: write cruft packs to arbitrary locations
builtin/repack.c: implement `--expire-to` for storing pruned objects
shortlog: make trailer insertion a noop when appropriate
shortlog: extract `--group` fragment for translation
shortlog: support arbitrary commit format `--group`s
shortlog: extract `shortlog_finish_setup()`
shortlog: implement `--group=author` in terms of `--group=<format>`
shortlog: implement `--group=committer` in terms of `--group=<format>`
apply: reject patches larger than ~1 GiB
Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
The ninth batch
Documentation: build redo-jch.sh from master..jch
Documentation: build redo-seen.sh from jch..seen
The tenth batch
The eleventh batch
The twelfth batch
builtin/gc.c: fix use-after-free in maintenance_unregister()
The thirteenth batch
Torsten Bögershausen (1):
diff.c: use utf8_strwidth() to count display width
Victoria Dye (8):
read-cache: avoid misaligned reads in index v4
rebase --update-refs: avoid unintended ref deletion
cache-tree: add perf test comparing update and prime
unpack-trees: add 'skip_cache_tree_update' option
reset: use 'skip_cache_tree_update' option
read-tree: use 'skip_cache_tree_update' option
rebase: use 'skip_cache_tree_update' option
rebase --update-refs: avoid unintended ref deletion
Vincent Bernat (1):
ls-files: fix --ignored and --killed flags in synopsis
Vlad-Stefan Harbuz (1):
Documentation: fix typo
Yi-Jyun Pan (1):
l10n: zh_TW.po: Git 2.39-rc2
srz_zumix (1):
fsmonitor--daemon: on macOS support symlink
Ævar Arnfjörð Bjarmason (118):
test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK
CodingGuidelines: update for C99
CodingGuidelines: mention dynamic C99 initializer elements
CodingGuidelines: allow declaring variables in for loops
CodingGuidelines: mention C99 features we can't use
grep.c: remove "extended" in favor of "pattern_expression", fix segfault
CodingGuidelines: recommend against unportable C99 struct syntax
bundle-uri: create "key=value" line parsing
bundle-uri: unit test "key=value" parsing
run-command test helper: use "else if" pattern
run-command API: have "run_processes_parallel{,_tr2}()" return void
run-command tests: use "return", not "exit"
run-command API: make "n" parameter a "size_t"
run-command API: don't fall back on online_cpus()
run-command.c: use designated init for pp_init(), add "const"
run-command API: have run_process_parallel() take an "opts" struct
run-command API: move *_tr2() users to "run_processes_parallel()"
run-command.c: make "struct parallel_processes" const if possible
run-command.c: don't copy *_fn to "struct parallel_processes"
run-command.c: don't copy "ungroup" to "struct parallel_processes"
run-command.c: don't copy "data" to "struct parallel_processes"
run-command.c: use "opts->processes", not "pp->max_processes"
run-command.c: pass "opts" further down, and use "opts->processes"
run-command.c: remove "max_processes", add "const" to signal() handler
tests: assert *.txt SYNOPSIS and -h output
CodingGuidelines: update and clarify command-line conventions
builtin/bundle.c: indent with tabs
bundle: define subcommand -h in terms of command -h
doc SYNOPSIS: don't use ' for subcommands
doc SYNOPSIS: consistently use ' for commands
built-ins: consistently add "\n" between "usage" and options
doc txt & -h consistency: word-wrap
doc txt & -h consistency: fix incorrect alternates syntax
doc txt & -h consistency: add "-z" to cat-file "-h"
doc txt & -h consistency: balance unbalanced "[" and "]"
doc txt & -h consistency: correct padding around "[]()"
stash doc SYNOPSIS & -h: correct padding around "[]()"
doc txt & -h consistency: use "<options>", not "<options>..."
doc SYNOPSIS & -h: use "-" to separate words in labels, not "_"
doc txt & -h consistency: fix mismatching labels
doc txt & -h consistency: add or fix optional "--" syntax
doc txt & -h consistency: make output order consistent
doc txt & -h consistency: add missing options and labels
doc txt & -h consistency: make "rerere" consistent
doc txt & -h consistency: make "read-tree" consistent
doc txt & -h consistency: make "bundle" consistent
doc txt & -h consistency: use "git foo" form, not "git-foo"
doc txt & -h consistency: add missing options
doc txt & -h consistency: make "stash" consistent
doc txt & -h consistency: make "annotate" consistent
doc txt & -h consistency: use "[<label>...]" for "zero or more"
doc txt & -h consistency: make "diff-tree" consistent
doc txt & -h consistency: make "commit" consistent
reflog doc: list real subcommands up-front
worktree: define subcommand -h in terms of command -h
doc txt & -h consistency: make "worktree" consistent
tests: start asserting that *.txt SYNOPSIS matches -h output
tests: assert consistent whitespace in -h output
fsmonitor OSX: compile with DC_SHA1=YesPlease
merge: remove always-the-same "verbose" arguments
hook tests: fix redirection logic error in 96e7225b310
submodule tests: reset "trace.out" between "grep" invocations
run-command tests: test stdout of run_command_parallel()
Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
cocci rules: remove unused "F" metavariable from pending rule
Makefile: add ability to TAB-complete cocci *.patch rules
Makefile: have "coccicheck" re-run if flags change
Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
cocci: split off include-less "tests" from SPATCH_FLAGS
cocci: split off "--all-includes" from SPATCH_FLAGS
cocci: make "coccicheck" rule incremental
cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
Makefile: copy contrib/coccinelle/*.cocci to build/
cocci rules: remove <id>'s from rules that don't need them
cocci: run against a generated ALL.cocci
spatchcache: add a ccache-alike for "spatch"
Makefile: always (re)set DC_SHA1 on fallback
INSTALL: remove discussion of SHA-1 backends
Makefile: correct DC_SHA1 documentation
Makefile: create and use sections for "define" flag listing
Makefile: rephrase the discussion of *_SHA1 knobs
Makefile: document default SHA-256 backend
Makefile: document SHA-1 and SHA-256 default and selection order
Makefile & test-tool: replace "DC_SHA1" variable with a "define"
Makefile: document default SHA-1 backend on OSX
Makefile: discuss SHAttered in *_SHA{1,256} discussion
submodule--helper: move "config" to a test-tool
submodule tests: add tests for top-level flag output
submodule--helper: fix a memory leak in "status"
submodule tests: test for a "foreach" blind-spot
submodule.c: refactor recursive block out of absorb function
submodule API & "absorbgitdirs": remove "----recursive" option
submodule--helper: remove --prefix from "absorbgitdirs"
submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
submodule--helper: use OPT_SUBCOMMAND() API
revisions API: extend the nascent REV_INFO_INIT macro
t7610: fix flaky timeout issue, don't clone from example.com
Makefile: don't create a ".build/.build/" for cocci, fix output
maintenance --unregister: fix uninit'd data use & -Wdeclaration-after-statement
t7610: use "file:///dev/null", not "/dev/null", fixes MinGW
cache.h: remove unused "the_index" compat macros
builtin/{grep,log}.: don't define "USE_THE_INDEX_COMPATIBILITY_MACROS"
cocci & cache.h: remove rarely used "the_index" compat macros
read-cache API & users: make discard_index() return void
cocci: add a index-compatibility.pending.cocci
cocci & cache.h: apply a selection of "pending" index-compatibility
cocci & cache.h: apply variable section of "pending" index-compatibility
cocci: apply "pending" index-compatibility to "t/helper/*.c"
{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"
cache.h & test-tool.h: add & use "USE_THE_INDEX_VARIABLE"
cocci: apply "pending" index-compatibility to some "builtin/*.c"
parse_object(): simplify blob conditional
trace2 tests: guard pthread test with "PTHREAD"
Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
cocci: avoid "should ... be a metavariable" warnings
CI: upgrade to macos-12, and pin OSX version
CI: don't explicitly pick "bash" shell outside of Windows, fix regression
CI: migrate away from deprecated "set-output" syntax
Đoàn Trần Công Danh (8):
CodingGuidelines: allow grep -E
t: remove \{m,n\} from BRE grep usage
t: convert egrep usage to "grep -E"
t: convert fgrep usage to "grep -F"
Makefile: clarify runtime relative gitexecdir
bisect--helper: remove unused options
bisect--helper: move all subcommands into their own functions
bisect--helper: parse subcommand with OPT_SUBCOMMAND
^ permalink raw reply [relevance 1%]
* [ANNOUNCE] Git v2.39.0-rc2
@ 2022-12-06 4:00 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2022-12-06 4:00 UTC (permalink / raw)
To: git; +Cc: Linux Kernel, git-packagers
A release candidate Git v2.39.0-rc2 is now available for testing at
the usual places. It is comprised of 463 non-merge commits since
v2.38.0, contributed by 74 people, 30 of which are new faces [*].
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.39.0-rc2' tag and the 'master' branch that the tag points at:
url = https://git.kernel.org/pub/scm/git/git
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.38.0 are as follows.
Welcome to the Git development community!
Alexander Kanavin, Alexander Meshcheryakov, Andreas Hasenack,
Anh Le, Arthur Chan, Daniel Sonbolian, Debra Obondo, Diomidis
Spinellis, Erik Cervin Edin, Hank Leininger, herr.kaste, John
A. Leuenhagen, Julia Ramer, Kevin Backhouse, Kousik Sanagavarapu,
Lukáš Doktor, Martin Englund, M Hickford, Michael V. Scovetta,
Noah Betzen, Nsengiyumva Wilberforce, orygaw, Ronan Pigott,
Rubén Justo, Sotir Danailov, srz_zumix, Stefano Rivera, Tim
Jaacks, Vincent Bernat, and Vlad-Stefan Harbuz.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Ævar Arnfjörð Bjarmason, Alejandro R. Sedeño, Alex Henrie, Derrick
Stolee, Đoàn Trần Công Danh, Elijah Newren, Emily Shaffer, Eric
DeCosta, Eric Sunshine, Eric Wong, Glen Choo, Han-Wen Nienhuys,
Jan Pokorný, Jean-Noël Avila, Jeff Hostetler, Jeff King, Jerry
Zhang, Jiang Xin, Johannes Altmanninger, Johannes Schindelin, John
Cai, Jonathan Tan, Julien Moutinho, Junio C Hamano, Kyle Meyer,
Martin Ågren, Martin von Zweigbergk, Matthew John Cheetham,
Michael J Gruber, Michael McClimon, Patrick Steinhardt, Paul
Smith, Philip Oakley, Philippe Blain, Phillip Wood, Randall
S. Becker, René Scharfe, Sergey Organov, Shaoxuan Yuan, SZEDER
Gábor, Taylor Blau, Torsten Bögershausen, and Victoria Dye.
[*] We are counting not just the authorship contribution but issue
reporting, mentoring, helping and reviewing that are recorded in
the commit trailers.
----------------------------------------------------------------
Git v2.39 Release Notes (draft)
===============================
UI, Workflows & Features
------------------------
* "git grep" learned to expand the sparse-index more lazily and on
demand in a sparse checkout.
* By default, use of fsmonitor on a repository on networked
filesystem is disabled. Add knobs to make it workable on macOS.
* After checking out a "branch" that is a symbolic-ref that points at
another branch, "git symbolic-ref HEAD" reports the underlying
branch, not the symbolic-ref the user gave checkout as argument.
The command learned the "--no-recurse" option to stop after
dereferencing a symbolic-ref only once.
* "git branch --edit-description @{-1}" is now a way to edit branch
description of the branch you were on before switching to the
current branch.
* "git merge-tree --stdin" is a new way to request a series of merges
and report the merge results.
* "git shortlog" learned to group by the "format" string.
* A new "--include-whitespace" option is added to "git patch-id", and
existing bugs in the internal patch-id logic that did not match
what "git patch-id" produces have been corrected.
* Enable gc.cruftpacks by default for those who opt into
feature.experimental setting.
* "git repack" learns to send cruft objects out of the way into
packfiles outside the repository.
* 'scalar reconfigure -a' is taught to automatically remove
scalar.repo entires which no longer exist.
* Redact headers from cURL's h2h3 module in GIT_CURL_VERBOSE and
others.
* 'git maintenance register' is taught to write configuration to an
arbitrary path, and 'git for-each-repo' is taught to expand tilde
characters in paths.
* When creating new notes, the template used to get a stray empty
newline, which has been removed.
* "git receive-pack" used to use all the local refs as the boundary for
checking connectivity of the data "git push" sent, but now it uses
only the refs that it advertised to the pusher. In a repository with
the .hideRefs configuration, this reduces the resources needed to
perform the check.
* With '--recurse-submodules=on-demand', all submodules are
recursively pushed.
Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------
* With a bit of header twiddling, use the native regexp library on
macOS instead of the compat/ one.
* Prepare for GNU [ef]grep that throw warning of their uses.
* Sources related to fuzz testing have been moved down to their own
directory.
* Most credential helpers ignored unknown entries in a credential
description, but a few died upon seeing them. The latter were
taught to ignore them, too
* "scalar unregister" in a repository that is already been
unregistered reported an error.
* Remove error detection from a function that fetches from promisor
remotes, and make it die when such a fetch fails to bring all the
requested objects, to give an early failure to various operations.
* Update CodingGuidelines to clarify what features to use and avoid
in C99.
* Avoid false-positive from LSan whose assumption may be broken with
higher optimization levels.
* Enable address and undefined sanitizer tasks at GitHub Actions CI.
* More UNUSED annotation to help using -Wunused option with the
compiler.
(merge 4b992f0a24 jk/unused-anno-more later to maint).
* Rewrite a deep recursion in the skipping negotiator to use a loop
with on-heap prio queue to avoid stack wastage.
* Add documentation for message IDs in fsck error messages.
* Define the logical elements of a "bundle list", data structure to
store them in-core, format to transfer them, and code to parse
them.
* The role the security mailing list plays in an embargoed release
has been documented.
* Two new facilities, "timer" and "counter", are introduced to the
trace2 API.
* Code simplification by using strvec_pushf() instead of building an
argument in a separate strbuf.
* Make sure generated dependency file is stably sorted to help
developers debugging their build issues.
* The glossary entries for "commit-graph file" and "reachability
bitmap" have been added.
* Various tests exercising the transfer.credentialsInUrl
configuration are taught to avoid making requests which require
resolving localhost to reduce CI-flakiness.
* A redundant diagnostic message is dropped from test_path_is_missing().
* Simplify the run-command API.
* Update the actions/github-script dependency in CI to avoid a
deprecation warning.
* Progress on being able to initialize a rev_info struct with a
macro.
* Add trace2 counters to the region to clear skip worktree bits in a
sparse checkout.
* Modernize test script to avoid "test -f" and friends.
* Avoid calling 'cache_tree_update()' when doing so would be
redundant.
* Update the credential-cache documentation to provide a more
realistic example.
* Makefile comments updates and reordering to clarify knobs used to
choose SHA implementations.
* A design document for sparse-checkout's future directions has been
added.
* Teach chainlint.pl to annotate the original test definition instead
of the token stream.
* "make coccicheck" is time consuming. It has been made to run more
incrementally.
* `parse_object()` has been hardened to check for the existence of a
suspected blob object.
* The build procedure has been adjusted to GNUmake version 4.4, which
made some changes to how pattern rule with multiple targets are
handled.
Fixes since v2.38
-----------------
* The codepath that reads from the index v4 had unaligned memory
accesses, which has been corrected.
* Fix messages incorrectly marked for translation.
* "git fsck" failed to release contents of tree objects already used
from the memory, which has been fixed.
* "git clone" did not like to see the "--bare" and the "--origin"
options used together without a good reason.
* "git remote rename" failed to rename a remote without fetch
refspec, which has been corrected.
* Documentation on various Boolean GIT_* environment variables have
been clarified.
* "git rebase -i" can mistakenly attempt to apply a fixup to a commit
itself, which has been corrected.
* "git multi-pack-index repack/expire" used to repack unreachable
cruft into a new pack, which have been corrected.
* In read-only repositories, "git merge-tree" tried to come up with a
merge result tree object, which it failed (which is not wrong) and
led to a segfault (which is bad), which has been corrected.
* Force C locale while running tests around httpd to make sure we can
find expected error messages in the log.
* Fix a logic in "mailinfo -b" that miscomputed the length of a
substring, which lead to an out-of-bounds access.
* The codepath to sign learned to report errors when it fails to read
from "ssh-keygen".
* Code clean-up that results in plugging a leak.
* "GIT_EDITOR=: git branch --edit-description" resulted in failure,
which has been corrected.
* The code to clean temporary object directories (used for
quarantine) tried to remove them inside its signal handler, which
was a no-no.
* Update comment in the Makefile about the RUNTIME_PREFIX config knob.
* Clarify that "the sentence after <area>: prefix does not begin with
a capital letter" rule applies only to the commit title.
* "git branch --edit-description" on an unborh branch misleadingly
said that no such branch exists, which has been corrected.
* Work around older clang that warns against C99 zero initialization
syntax for struct.
* Giving "--invert-grep" and "--all-match" without "--grep" to the
"git log" command resulted in an attempt to access grep pattern
expression structure that has not been allocated, which has been
corrected.
(merge db84376f98 ab/grep-simplify-extended-expression later to maint).
* "git diff rev^!" did not show combined diff to go to the rev from
its parents.
(merge a79c6b6081 rs/diff-caret-bang-with-parents later to maint).
* Allow configuration files in "protected" scopes to include other
configuration files.
(merge ecec57b3c9 gc/bare-repo-discovery later to maint).
* Give a bit more diversity to macOS CI by using sha1dc in one of the
jobs (the other one tests Apple Common Crypto).
(merge 1ad5c3df35 jc/ci-osx-with-sha1dc later to maint).
* A bugfix with tracing support in midx codepath
(merge e9c3839944 tb/midx-bitmap-selection-fix later to maint).
* When geometric repacking feature is in use together with the
--pack-kept-objects option, we lost packs marked with .keep files.
(merge 197443e80a tb/save-keep-pack-during-geometric-repack later to maint).
* Move a global variable added as a hack during regression fixes to
its proper place in the API.
(merge 0b0ab95f17 ab/run-hook-api-cleanup later to maint).
* Update to build procedure with VS using CMake/CTest.
(merge c858750b41 js/cmake-updates later to maint).
* The short-help text shown by "git cmd -h" and the synopsis text
shown at the beginning of "git help cmd" have been made more
consistent.
* When creating a multi-pack bitmap, remove per-pack bitmap files
unconditionally as they will never be consulted.
(merge 55d902cd61 tb/remove-unused-pack-bitmap later to maint).
* Fix a longstanding syntax error in Git.pm error codepath.
* "git diff --stat" etc. were invented back when everything was ASCII
and strlen() was a way to measure the display width of a string;
adjust them to compute the display width assuming UTF-8 pathnames.
(merge ce8529b2bb tb/diffstat-with-utf8-strwidth later to maint).
* "git branch --edit-description" can exit with status -1 which is
not a good practice; it learned to use 1 as everybody else instead.
* "git apply" limits its input to a bit less than 1 GiB.
* Merging a branch with directory renames into a branch that changes
the directory to a symlink was mishandled by the ort merge
strategy, which has been corrected.
* A bugfix to "git subtree" in its split and merge features.
* Fix some bugs in the reflog messages when rebasing and changes the
reflog messages of "rebase --apply" to match "rebase --merge" with
the aim of making the reflog easier to parse.
* "git rebase --keep-base" used to discard the commits that are
already cherry-picked to the upstream, even when "keep-base" meant
that the base, on top of which the history is being rebuilt, does
not yet include these cherry-picked commits. The --keep-base
option now implies --reapply-cherry-picks and --no-fork-point
options.
* The way "git repack" creared temporary files when it received a
signal was prone to deadlocking, which has been corrected.
* Various tests exercising the transfer.credentialsInUrl
configuration are taught to avoid making requests which require
resolving localhost to reduce CI-flakiness.
* The adjust_shared_perm() helper function learned to refrain from
setting the "g+s" bit on directories when it is not necessary.
* "git archive" mistakenly complained twice about a missing
executable, which has been corrected.
* Fix a bug where `git branch -d` did not work on an orphaned HEAD.
* `git rebase --update-refs` would delete references when all
`update-ref` commands in the sequencer were removed, which has been
corrected.
* Fix a regression in the bisect-helper which mistakenly treats
arguments to the command given to 'git bisect run' as arguments to
the helper.
* Correct an error where `git rebase` would mistakenly use a branch or
tag named "refs/rewritten/xyz" when missing a rebase label.
* Assorted fixes of parsing end-user input as integers.
(merge 14770cf0de pw/config-int-parse-fixes later to maint).
* "git prune" may try to iterate over .git/objects/pack for trash
files to remove in it, and loudly fail when the directory is
missing, which is not necessary. The command has been taught to
ignore such a failure.
(merge 6974765352 ew/prune-with-missing-objects-pack later to maint).
* Add one more candidate directory that may house httpd modules while
running tests.
(merge 1c7dc23d41 es/locate-httpd-module-location-in-test later to maint).
* A handful of leaks in the line-log machinery have been plugged.
* The format of a line in /proc/cpuinfo that describes a CPU on s390x
looked different from everybody else, and the code in chainlint.pl
failed to parse it.
(merge 1f51b77f4f ah/chainlint-cpuinfo-parse-fix later to maint).
* Adjust the GitHub CI to newer ubuntu release.
(merge 0d3507f3e7 jx/ci-ubuntu-fix later to maint).
* Other code cleanup, docfix, build fix, etc.
(merge 413bc6d20a ds/cmd-main-reorder later to maint).
(merge 8d2863e4ed nw/t1002-cleanup later to maint).
(merge 7c2dc122f9 rs/list-objects-filter-leakfix later to maint).
(merge 288fcb1c94 zk/push-use-bitmaps later to maint).
(merge 42db324c0f km/merge-recursive-typofix later to maint).
----------------------------------------------------------------
Changes since v2.38.0 are as follows:
Alejandro R. Sedeño (1):
git-compat-util.h: GCC deprecated message arg only in GCC 4.5+
Alex Henrie (2):
fsmonitor--daemon: don't translate literal commands
push: improve grammar of branch.autoSetupMerge advice
Andreas Hasenack (1):
chainlint.pl: fix /proc/cpuinfo regexp
Anh Le (2):
index: add trace2 region for clear skip worktree
index: raise a bug if the index is materialised more than once
Arthur Chan (1):
fuzz: reorganise the path for existing oss-fuzz fuzzers
Daniel Sonbolian (1):
git.c: improve code readability in cmd_main()
Debra Obondo (1):
t7001-mv.sh: modernizing test script using functions
Derrick Stolee (15):
maintenance: add 'unregister --force'
scalar: make 'unregister' idempotent
gc: replace config subprocesses with API calls
string-list: document iterator behavior on NULL input
bundle-uri: fix technical doc issues
bundle-uri: use plain string in find_temp_filename()
bundle-uri: create bundle_list struct and helpers
bundle-uri: create base key-value pair parsing
bundle-uri: parse bundle list in config format
bundle-uri: limit recursion depth for bundle lists
bundle: properly clear all revision flags
bundle-uri: fetch a list of bundles
bundle: add flags to verify_bundle()
bundle-uri: quiet failed unbundlings
bundle-uri: suppress stderr from remote-https
Diomidis Spinellis (1):
grep: fix multibyte regex handling under macOS
Elijah Newren (4):
merge-ort: fix bug with dir rename vs change dir to symlink
merge-tree: update documentation for differences in -z output
merge-tree: support multiple batched merges with --stdin
sparse-checkout.txt: new document with sparse-checkout directions
Emily Shaffer (2):
gc: add tests for --cruft and friends
config: let feature.experimental imply gc.cruftPacks=true
Eric DeCosta (6):
fsmonitor: refactor filesystem checks to common interface
fsmonitor: relocate socket file if .git directory is remote
fsmonitor: avoid socket location check if using hook
fsmonitor: deal with synthetic firmlinks on macOS
fsmonitor: check for compatability before communicating with fsmonitor
fsmonitor: add documentation for allowRemote and socketDir options
Eric Sunshine (9):
check-non-portable-shell: detect obsolescent egrep/fgrep
chainlint: add explanatory comments
chainlint: tighten accuracy when consuming input stream
chainlint: latch start/end position of each token
chainlint: annotate original test definition rather than token stream
chainlint: sidestep impoverished macOS "terminfo"
chainlint: latch line numbers at which each token starts and ends
chainlint: prefix annotated test definition with line numbers
lib-httpd: extend module location auto-detection
Eric Wong (2):
delta-islands: free island-related data after use
prune: quiet ENOENT on missing directories
Glen Choo (3):
config: respect includes in protected config
http: redact curl h2h3 headers in info
object-file: use real paths when adding alternates
Han-Wen Nienhuys (1):
refs: unify parse_worktree_ref() and ref_type()
Jean-Noël Avila (1):
i18n: fix command template placeholder format
Jeff Hostetler (9):
config.mak.dev: disable suggest braces error on old clang versions
trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
tr2tls: clarify TLS terminology
api-trace2.txt: elminate section describing the public trace2 API
trace2: rename the thread_name argument to trace2_thread_start
trace2: improve thread-name documentation in the thread-context
trace2: convert ctx.thread_name from strbuf to pointer
trace2: add stopwatch timers
trace2: add global counter mechanism
Jeff King (43):
fsck: free tree buffers after walking unreachable objects
fsck: turn off save_commit_buffer
parse_object_buffer(): respect save_commit_buffer
clone: allow "--bare" with "-o"
remote: handle rename of remote without fetch refspec
shell: add basic tests
shell: limit size of interactive commands
sequencer: detect author name errors in read_author_script()
test-submodule: inline resolve_relative_url() function
multi-pack-index: avoid writing to global in option callback
commit: avoid writing to global in option callback
attr: drop DEBUG_ATTR code
dir: use fspathncmp() in pl_hashmap_cmp()
fsmonitor: fix leak of warning message
diffstat_consume(): assert non-zero length
submodule--helper: drop unused argc from module_list_compute()
update-index: drop unused argc from do_reupdate()
mark unused parameters in trivial compat functions
object-file: mark unused parameters in hash_unknown functions
string-list: mark unused callback parameters
date: mark unused parameters in handler functions
apply: mark unused parameters in handlers
apply: mark unused parameters in noop error/warning routine
convert: mark unused parameter in null stream filter
diffcore-pickaxe: mark unused parameters in pickaxe functions
ll-merge: mark unused parameters in callbacks
Makefile: force -O0 when compiling with SANITIZE=leak
repack: convert "names" util bitfield to array
repack: populate extension bits incrementally
repack: expand error message for missing pack files
repack: use tempfiles for signal cleanup
repack: drop remove_temporary_files()
Git.pm: trust rev-parse to find bare repositories
t7700: annotate cruft-pack failure with ok=sigpipe
shortlog: accept `--date`-related options
Makefile: force -O0 when compiling with SANITIZE=leak
t5516: move plaintext-password tests from t5601 and t5516
ref-filter: fix parsing of signatures without blank lines
ref-filter: fix parsing of signatures with CRLF and no body
branch: gracefully handle '-d' on orphan HEAD
t: run t5551 tests with both HTTP and HTTP/2
parse_object(): drop extra "has" check before checking object type
parse_object(): check on-disk type of suspected blob
Jerry Zhang (6):
patch-id: fix stable patch id for binary / header-only
patch-id: use stable patch-id for rebases
builtin: patch-id: fix patch-id with binary diffs
patch-id: fix patch-id for mode changes
builtin: patch-id: add --verbatim as a command mode
builtin: patch-id: remove unused diff-tree prefix
Jiang Xin (5):
t5516: fail to run in verbose mode
github-actions: run gcc-8 on ubuntu-20.04 image
ci: remove the pipe after "p4 -V" to catch errors
ci: use the same version of p4 on both Linux and macOS
ci: install python on ubuntu
Johannes Altmanninger (1):
sequencer: avoid dropping fixup commit that targets self via commit-ish
Johannes Schindelin (11):
merge-ort: fix segmentation fault in read-only repositories
merge-ort: return early when failing to write a blob
cmake: make it easier to diagnose regressions in CTest runs
cmake: copy the merge tools for testing
add -p: avoid ambiguous signed/unsigned comparison
cmake: avoid editing t/test-lib.sh
cmake: increase time-out for a long-running test
t5516/t5601: be less strict about the number of credential warnings
scalar reconfigure -a: remove stale `scalar.repo` entries
ci: use a newer `github-script` version
tests(scalar): tighten the stale `scalar.repo` test some
John Cai (3):
tmp-objdir: skip clean up when handling a signal
fsck: remove the unused BAD_TAG_OBJECT
fsck: document msg-id
Jonathan Tan (4):
promisor-remote: remove a return value
promisor-remote: die upon failing fetch
negotiator/skipping: avoid stack overflow
Doc: document push.recurseSubmodules=only
Julia Ramer (1):
embargoed releases: also describe the git-security list and the process
Junio C Hamano (30):
environ: document GIT_SSL_NO_VERIFY
environ: explain Boolean environment variables
environ: GIT_FLUSH should be made a usual Boolean
environ: simplify description of GIT_INDEX_FILE
environ: GIT_INDEX_VERSION affects not just a new repository
branch: do not fail a no-op --edit-desc
SubmittingPatches: use usual capitalization in the log message body
Start 2.39 cycle
symbolic-ref: teach "--[no-]recurse" option
The (real) first batch for 2.39
The second batch
The third batch
The fourth batch
ci: add address and undefined sanitizer tasks
ci: use DC_SHA1=YesPlease on osx-clang job for CI
The fifth batch
diff: leave NEEDWORK notes in show_stats() function
fsck: remove the unused MISSING_TREE_OBJECT
Documentation: add lint-fsck-msgids
Downmerge a handful of topics for 2.38.2
The sixth batch
Downmerge a bit more for 2.38.2
The seventh batch
The eighth batch
adjust_shared_perm(): leave g+s alone when the group does not matter
Git 2.39-rc0
Another batch before -rc1
A bit more before -rc1
Git 2.39-rc1
Git 2.39-rc2
Kevin Backhouse (1):
alias.c: reject too-long cmdline strings in split_cmdline()
Kousik Sanagavarapu (1):
repository-version.txt: partialClone casing change
Kyle Meyer (1):
merge-recursive: fix variable typo in error message
M Hickford (4):
Documentation/gitcredentials.txt: mention password alternatives
Documentation: increase example cache timeout to 1 hour
docs: clarify that credential discards unrecognised attributes
Docs: describe how a credential-generating helper works
Martin Ågren (1):
test-lib-functions: drop redundant diagnostic print
Matthew John Cheetham (3):
wincred: ignore unknown lines (do not die)
netrc: ignore unknown lines (do not die)
osxkeychain: clarify that we ignore unknown lines
Michael J Gruber (1):
notes: avoid empty line in template
Michael McClimon (1):
Git.pm: add semicolon after catch statement
Noah Betzen (1):
mergetool.txt: typofix 'overwriten' -> 'overwritten'
Nsengiyumva Wilberforce (1):
t1002: modernize outdated conditional
Patrick Steinhardt (7):
refs: fix memory leak when parsing hideRefs config
refs: get rid of global list of hidden refs
revision: move together exclusion-related functions
revision: introduce struct to handle exclusions
revision: add new parameter to exclude hidden refs
rev-parse: add `--exclude-hidden=` option
receive-pack: only use visible refs for connectivity check
Paul Smith (1):
Makefile: avoid multiple patterns when recipes generate one file
Philip Oakley (4):
doc: use "commit-graph" hyphenation consistently
doc: use 'object database' not ODB or abbreviation
glossary: add "commit graph" description
glossary: add reachability bitmap description
Philippe Blain (9):
test-lib-functions: mark 'test_commit' variables as 'local'
subtree: use 'git rev-parse --verify [--quiet]' for better error messages
subtree: add 'die_incompatible_opt' function to reduce duplication
subtree: prefix die messages with 'fatal'
subtree: define a variable before its first use in 'find_latest_squash'
subtree: use named variables instead of "$@" in cmd_pull
subtree: process 'git-subtree-split' trailer in separate function
subtree: fix squash merging after annotated tag was squashed merged
subtree: fix split after annotated tag was squashed merged
Phillip Wood (26):
mailinfo -b: fix an out of bounds access
ssh signing: return an error when signature cannot be read
t3435: remove redundant test case
t3416: tighten two tests
t3416: set $EDITOR in subshell
rebase: be stricter when reading state files containing oids
rebase: store orig_head as a commit
rebase: rename merge_base to branch_base
rebase: factor out branch_base calculation
rebase --keep-base: imply --reapply-cherry-picks
rebase --keep-base: imply --no-fork-point
rebase --apply: remove duplicated code
t3406: rework rebase reflog tests
rebase --merge: fix reflog when continuing
rebase --merge: fix reflog message after skipping
rebase --apply: respect GIT_REFLOG_ACTION
rebase --apply: make reflog messages match rebase --merge
rebase --abort: improve reflog message
rebase: cleanup action handling
sequencer: stop exporting GIT_REFLOG_ACTION
rebase: stop exporting GIT_REFLOG_ACTION
git_parse_unsigned: reject negative values
config: require at least one digit when parsing numbers
git_parse_signed(): avoid integer overflow
sequencer: unify label lookup
sequencer: tighten label lookups
René Scharfe (21):
revision: use strtol_i() for exclude_parent
revisions.txt: unspecify order of resolved parts of ^!
diff: support ^! for merges
gc: simplify maintenance_task_pack_refs()
t/lib-httpd: pass LANG and LC_ALL to Apache
bisect--helper: plug strvec leak
archive: deduplicate verbose printing
submodule: use strvec_pushf() for --super-prefix
run-command: fix return value comment
am: simplify building "show" argument list
bisect: simplify building "checkout" argument list
bisect--helper: factor out do_bisect_run()
sequencer: simplify building argument list in do_exec()
use child_process member "args" instead of string array variable
use child_process members "args" and "env" directly
replace and remove run_command_v_opt_cd_env()
replace and remove run_command_v_opt_tr2()
replace and remove run_command_v_opt_cd_env_tr2()
replace and remove run_command_v_opt()
archive-tar: report filter start error only once
list-objects-filter: plug combine_filter_data leak
Ronan Pigott (2):
for-each-repo: interpolate repo path arguments
maintenance: add option to register in a specific config
Rubén Justo (5):
ref-filter.c: fix a leak in get_head_description
branch: description for non-existent branch errors
branch: support for shortcuts like @{-1}, completed
branch: error copying or renaming a detached HEAD
branch: error code with --edit-description
SZEDER Gábor (4):
Documentation/build-docdep.perl: generate sorted output
line-log: free diff queue when processing non-merge commits
line-log: free the diff queues' arrays when processing merge commits
diff.c: use diff_free_queue()
Sergey Organov (3):
diff-merges: cleanup func_by_opt()
diff-merges: cleanup set_diff_merges()
diff-merges: clarify log.diffMerges documentation
Shaoxuan Yuan (1):
builtin/grep.c: integrate with sparse index
Sotir Danailov (1):
docs: git-send-email: difference between ssl and tls smtp-encryption
Taylor Blau (64):
Documentation/git-multi-pack-index.txt: fix typo
Documentation/git-multi-pack-index.txt: clarify expire behavior
midx.c: prevent `expire` from removing the cruft pack
midx.c: avoid cruft packs with `repack --batch-size=0`
midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`
midx.c: remove unnecessary loop condition
midx.c: avoid cruft packs with non-zero `repack --batch-size`
builtin/clone.c: disallow `--local` clones with symlinks
t/lib-submodule-update.sh: allow local submodules
t/t1NNN: allow local submodules
t/2NNNN: allow local submodules
t/t3NNN: allow local submodules
t/t4NNN: allow local submodules
t/t5NNN: allow local submodules
t/t6NNN: allow local submodules
t/t7NNN: allow local submodules
t/t9NNN: allow local submodules
transport: make `protocol.file.allow` be "user" by default
t1092: prepare for changing protocol.file.allow
t2080: prepare for changing protocol.file.allow
t1092: prepare for changing protocol.file.allow
t2080: prepare for changing protocol.file.allow
t3207: prepare for changing protocol.file.allow
t5516: prepare for changing protocol.file.allow
t5537: prepare for changing protocol.file.allow
t7814: prepare for changing protocol.file.allow
t3206: prepare for changing protocol.file.allow
t5537: prepare for changing protocol.file.allow
Git 2.30.6
Git 2.31.5
Git 2.32.4
Git 2.33.5
Git 2.34.5
Git 2.35.5
Git 2.36.3
t7527: prepare for changing protocol.file.allow
Git 2.37.4
Git 2.38.1
midx.c: fix whitespace typo
midx.c: consider annotated tags during bitmap selection
midx.c: instrument MIDX and bitmap generation with trace2 regions
pack-bitmap-write.c: instrument number of reused bitmaps
builtin/repack.c: remove redundant pack-based bitmaps
repack: don't remove .keep packs with `--pack-kept-objects`
builtin/repack.c: pass "out" to `prepare_pack_objects`
builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
builtin/repack.c: write cruft packs to arbitrary locations
builtin/repack.c: implement `--expire-to` for storing pruned objects
shortlog: make trailer insertion a noop when appropriate
shortlog: extract `--group` fragment for translation
shortlog: support arbitrary commit format `--group`s
shortlog: extract `shortlog_finish_setup()`
shortlog: implement `--group=author` in terms of `--group=<format>`
shortlog: implement `--group=committer` in terms of `--group=<format>`
apply: reject patches larger than ~1 GiB
Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
The ninth batch
Documentation: build redo-jch.sh from master..jch
Documentation: build redo-seen.sh from jch..seen
The tenth batch
The eleventh batch
The twelfth batch
builtin/gc.c: fix use-after-free in maintenance_unregister()
The thirteenth batch
Torsten Bögershausen (1):
diff.c: use utf8_strwidth() to count display width
Victoria Dye (7):
read-cache: avoid misaligned reads in index v4
rebase --update-refs: avoid unintended ref deletion
cache-tree: add perf test comparing update and prime
unpack-trees: add 'skip_cache_tree_update' option
reset: use 'skip_cache_tree_update' option
read-tree: use 'skip_cache_tree_update' option
rebase: use 'skip_cache_tree_update' option
Vincent Bernat (1):
ls-files: fix --ignored and --killed flags in synopsis
Vlad-Stefan Harbuz (1):
Documentation: fix typo
srz_zumix (1):
fsmonitor--daemon: on macOS support symlink
Ævar Arnfjörð Bjarmason (115):
test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK
CodingGuidelines: update for C99
CodingGuidelines: mention dynamic C99 initializer elements
CodingGuidelines: allow declaring variables in for loops
CodingGuidelines: mention C99 features we can't use
grep.c: remove "extended" in favor of "pattern_expression", fix segfault
CodingGuidelines: recommend against unportable C99 struct syntax
bundle-uri: create "key=value" line parsing
bundle-uri: unit test "key=value" parsing
run-command test helper: use "else if" pattern
run-command API: have "run_processes_parallel{,_tr2}()" return void
run-command tests: use "return", not "exit"
run-command API: make "n" parameter a "size_t"
run-command API: don't fall back on online_cpus()
run-command.c: use designated init for pp_init(), add "const"
run-command API: have run_process_parallel() take an "opts" struct
run-command API: move *_tr2() users to "run_processes_parallel()"
run-command.c: make "struct parallel_processes" const if possible
run-command.c: don't copy *_fn to "struct parallel_processes"
run-command.c: don't copy "ungroup" to "struct parallel_processes"
run-command.c: don't copy "data" to "struct parallel_processes"
run-command.c: use "opts->processes", not "pp->max_processes"
run-command.c: pass "opts" further down, and use "opts->processes"
run-command.c: remove "max_processes", add "const" to signal() handler
tests: assert *.txt SYNOPSIS and -h output
CodingGuidelines: update and clarify command-line conventions
builtin/bundle.c: indent with tabs
bundle: define subcommand -h in terms of command -h
doc SYNOPSIS: don't use ' for subcommands
doc SYNOPSIS: consistently use ' for commands
built-ins: consistently add "\n" between "usage" and options
doc txt & -h consistency: word-wrap
doc txt & -h consistency: fix incorrect alternates syntax
doc txt & -h consistency: add "-z" to cat-file "-h"
doc txt & -h consistency: balance unbalanced "[" and "]"
doc txt & -h consistency: correct padding around "[]()"
stash doc SYNOPSIS & -h: correct padding around "[]()"
doc txt & -h consistency: use "<options>", not "<options>..."
doc SYNOPSIS & -h: use "-" to separate words in labels, not "_"
doc txt & -h consistency: fix mismatching labels
doc txt & -h consistency: add or fix optional "--" syntax
doc txt & -h consistency: make output order consistent
doc txt & -h consistency: add missing options and labels
doc txt & -h consistency: make "rerere" consistent
doc txt & -h consistency: make "read-tree" consistent
doc txt & -h consistency: make "bundle" consistent
doc txt & -h consistency: use "git foo" form, not "git-foo"
doc txt & -h consistency: add missing options
doc txt & -h consistency: make "stash" consistent
doc txt & -h consistency: make "annotate" consistent
doc txt & -h consistency: use "[<label>...]" for "zero or more"
doc txt & -h consistency: make "diff-tree" consistent
doc txt & -h consistency: make "commit" consistent
reflog doc: list real subcommands up-front
worktree: define subcommand -h in terms of command -h
doc txt & -h consistency: make "worktree" consistent
tests: start asserting that *.txt SYNOPSIS matches -h output
tests: assert consistent whitespace in -h output
fsmonitor OSX: compile with DC_SHA1=YesPlease
merge: remove always-the-same "verbose" arguments
hook tests: fix redirection logic error in 96e7225b310
submodule tests: reset "trace.out" between "grep" invocations
run-command tests: test stdout of run_command_parallel()
Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
cocci rules: remove unused "F" metavariable from pending rule
Makefile: add ability to TAB-complete cocci *.patch rules
Makefile: have "coccicheck" re-run if flags change
Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
cocci: split off include-less "tests" from SPATCH_FLAGS
cocci: split off "--all-includes" from SPATCH_FLAGS
cocci: make "coccicheck" rule incremental
cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
Makefile: copy contrib/coccinelle/*.cocci to build/
cocci rules: remove <id>'s from rules that don't need them
cocci: run against a generated ALL.cocci
spatchcache: add a ccache-alike for "spatch"
Makefile: always (re)set DC_SHA1 on fallback
INSTALL: remove discussion of SHA-1 backends
Makefile: correct DC_SHA1 documentation
Makefile: create and use sections for "define" flag listing
Makefile: rephrase the discussion of *_SHA1 knobs
Makefile: document default SHA-256 backend
Makefile: document SHA-1 and SHA-256 default and selection order
Makefile & test-tool: replace "DC_SHA1" variable with a "define"
Makefile: document default SHA-1 backend on OSX
Makefile: discuss SHAttered in *_SHA{1,256} discussion
submodule--helper: move "config" to a test-tool
submodule tests: add tests for top-level flag output
submodule--helper: fix a memory leak in "status"
submodule tests: test for a "foreach" blind-spot
submodule.c: refactor recursive block out of absorb function
submodule API & "absorbgitdirs": remove "----recursive" option
submodule--helper: remove --prefix from "absorbgitdirs"
submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
submodule--helper: use OPT_SUBCOMMAND() API
revisions API: extend the nascent REV_INFO_INIT macro
t7610: fix flaky timeout issue, don't clone from example.com
Makefile: don't create a ".build/.build/" for cocci, fix output
maintenance --unregister: fix uninit'd data use & -Wdeclaration-after-statement
t7610: use "file:///dev/null", not "/dev/null", fixes MinGW
cache.h: remove unused "the_index" compat macros
builtin/{grep,log}.: don't define "USE_THE_INDEX_COMPATIBILITY_MACROS"
cocci & cache.h: remove rarely used "the_index" compat macros
read-cache API & users: make discard_index() return void
cocci: add a index-compatibility.pending.cocci
cocci & cache.h: apply a selection of "pending" index-compatibility
cocci & cache.h: apply variable section of "pending" index-compatibility
cocci: apply "pending" index-compatibility to "t/helper/*.c"
{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"
cache.h & test-tool.h: add & use "USE_THE_INDEX_VARIABLE"
cocci: apply "pending" index-compatibility to some "builtin/*.c"
parse_object(): simplify blob conditional
trace2 tests: guard pthread test with "PTHREAD"
Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4
cocci: avoid "should ... be a metavariable" warnings
Đoàn Trần Công Danh (8):
CodingGuidelines: allow grep -E
t: remove \{m,n\} from BRE grep usage
t: convert egrep usage to "grep -E"
t: convert fgrep usage to "grep -F"
Makefile: clarify runtime relative gitexecdir
bisect--helper: remove unused options
bisect--helper: move all subcommands into their own functions
bisect--helper: parse subcommand with OPT_SUBCOMMAND
^ permalink raw reply [relevance 1%]
* [ANNOUNCE] Git v2.39.0-rc1
@ 2022-11-30 6:12 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2022-11-30 6:12 UTC (permalink / raw)
To: git; +Cc: git-packagers
A release candidate Git v2.39.0-rc1 is now available for testing at
the usual places. It is comprised of 460 non-merge commits since
v2.38.0, contributed by 74 people, 30 of which are new faces [*].
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.39.0-rc1' tag and the 'master' branch that the tag points at:
url = https://git.kernel.org/pub/scm/git/git
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.38.0 are as follows.
Welcome to the Git development community!
Alexander Kanavin, Alexander Meshcheryakov, Andreas Hasenack,
Anh Le, Arthur Chan, Daniel Sonbolian, Debra Obondo, Diomidis
Spinellis, Erik Cervin Edin, Hank Leininger, herr.kaste, John
A. Leuenhagen, Julia Ramer, Kevin Backhouse, Kousik Sanagavarapu,
Lukáš Doktor, Martin Englund, M Hickford, Michael V. Scovetta,
Noah Betzen, Nsengiyumva Wilberforce, orygaw, Ronan Pigott,
Rubén Justo, Sotir Danailov, srz_zumix, Stefano Rivera, Tim
Jaacks, Vincent Bernat, and Vlad-Stefan Harbuz.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
정재우, Ævar Arnfjörð Bjarmason, Alejandro R. Sedeño,
Alex Henrie, Derrick Stolee, Đoàn Trần Công Danh, Elijah
Newren, Emily Shaffer, Eric DeCosta, Eric Sunshine, Eric Wong,
Glen Choo, Han-Wen Nienhuys, Jan Pokorný, Jean-Noël Avila,
Jeff Hostetler, Jeff King, Jerry Zhang, Jiang Xin, Johannes
Altmanninger, Johannes Schindelin, John Cai, Jonathan Tan,
Julien Moutinho, Junio C Hamano, Kyle Meyer, Martin Ågren,
Martin von Zweigbergk, Matthew John Cheetham, Michael J Gruber,
Michael McClimon, Patrick Steinhardt, Paul Smith, Philip Oakley,
Philippe Blain, Phillip Wood, Randall S. Becker, René Scharfe,
Sergey Organov, Shaoxuan Yuan, SZEDER Gábor, Taylor Blau,
Torsten Bögershausen, and Victoria Dye.
[*] We are counting not just the authorship contribution but issue
reporting, mentoring, helping and reviewing that are recorded in
the commit trailers.
----------------------------------------------------------------
Git v2.39 Release Notes (draft)
===============================
UI, Workflows & Features
------------------------
* "git grep" learned to expand the sparse-index more lazily and on
demand in a sparse checkout.
* By default, use of fsmonitor on a repository on networked
filesystem is disabled. Add knobs to make it workable on macOS.
* After checking out a "branch" that is a symbolic-ref that points at
another branch, "git symbolic-ref HEAD" reports the underlying
branch, not the symbolic-ref the user gave checkout as argument.
The command learned the "--no-recurse" option to stop after
dereferencing a symbolic-ref only once.
* "git branch --edit-description @{-1}" is now a way to edit branch
description of the branch you were on before switching to the
current branch.
* "git merge-tree --stdin" is a new way to request a series of merges
and report the merge results.
* "git shortlog" learned to group by the "format" string.
* A new "--include-whitespace" option is added to "git patch-id", and
existing bugs in the internal patch-id logic that did not match
what "git patch-id" produces have been corrected.
* Enable gc.cruftpacks by default for those who opt into
feature.experimental setting.
* "git repack" learns to send cruft objects out of the way into
packfiles outside the repository.
* 'scalar reconfigure -a' is taught to automatically remove
scalar.repo entires which no longer exist.
* Redact headers from cURL's h2h3 module in GIT_CURL_VERBOSE and
others.
* 'git maintenance register' is taught to write configuration to an
arbitrary path, and 'git for-each-repo' is taught to expand tilde
characters in paths.
* When creating new notes, the template used to get a stray empty
newline, which has been removed.
* "git receive-pack" used to use all the local refs as the boundary for
checking connectivity of the data "git push" sent, but now it uses
only the refs that it advertised to the pusher. In a repository with
the .hideRefs configuration, this reduces the resources needed to
perform the check.
* With '--recurse-submodules=on-demand', all submodules are
recursively pushed.
Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------
* With a bit of header twiddling, use the native regexp library on
macOS instead of the compat/ one.
* Prepare for GNU [ef]grep that throw warning of their uses.
* Sources related to fuzz testing have been moved down to their own
directory.
* Most credential helpers ignored unknown entries in a credential
description, but a few died upon seeing them. The latter were
taught to ignore them, too
* "scalar unregister" in a repository that is already been
unregistered reported an error.
* Remove error detection from a function that fetches from promisor
remotes, and make it die when such a fetch fails to bring all the
requested objects, to give an early failure to various operations.
* Update CodingGuidelines to clarify what features to use and avoid
in C99.
* Avoid false-positive from LSan whose assumption may be broken with
higher optimization levels.
* Enable address and undefined sanitizer tasks at GitHub Actions CI.
* More UNUSED annotation to help using -Wunused option with the
compiler.
(merge 4b992f0a24 jk/unused-anno-more later to maint).
* Rewrite a deep recursion in the skipping negotiator to use a loop
with on-heap prio queue to avoid stack wastage.
* Add documentation for message IDs in fsck error messages.
* Define the logical elements of a "bundle list", data structure to
store them in-core, format to transfer them, and code to parse
them.
* The role the security mailing list plays in an embargoed release
has been documented.
* Two new facilities, "timer" and "counter", are introduced to the
trace2 API.
* Code simplification by using strvec_pushf() instead of building an
argument in a separate strbuf.
* Make sure generated dependency file is stably sorted to help
developers debugging their build issues.
* The glossary entries for "commit-graph file" and "reachability
bitmap" have been added.
* Various tests exercising the transfer.credentialsInUrl
configuration are taught to avoid making requests which require
resolving localhost to reduce CI-flakiness.
* A redundant diagnostic message is dropped from test_path_is_missing().
* Simplify the run-command API.
* Update the actions/github-script dependency in CI to avoid a
deprecation warning.
* Progress on being able to initialize a rev_info struct with a
macro.
* Add trace2 counters to the region to clear skip worktree bits in a
sparse checkout.
* Modernize test script to avoid "test -f" and friends.
* Avoid calling 'cache_tree_update()' when doing so would be
redundant.
* Update the credential-cache documentation to provide a more
realistic example.
* Makefile comments updates and reordering to clarify knobs used to
choose SHA implementations.
* A design document for sparse-checkout's future directions has been
added.
* Teach chainlint.pl to annotate the original test definition instead
of the token stream.
* "make coccicheck" is time consuming. It has been made to run more
incrementally.
* `parse_object()` has been hardened to check for the existence of a
suspected blob object.
* Adjust the documentation build procedure to GNUmake version 4.4,
which made some changes to how pattern rule with multiple targets
are handled.
Fixes since v2.38
-----------------
* The codepath that reads from the index v4 had unaligned memory
accesses, which has been corrected.
* Fix messages incorrectly marked for translation.
* "git fsck" failed to release contents of tree objects already used
from the memory, which has been fixed.
* "git clone" did not like to see the "--bare" and the "--origin"
options used together without a good reason.
* "git remote rename" failed to rename a remote without fetch
refspec, which has been corrected.
* Documentation on various Boolean GIT_* environment variables have
been clarified.
* "git rebase -i" can mistakenly attempt to apply a fixup to a commit
itself, which has been corrected.
* "git multi-pack-index repack/expire" used to repack unreachable
cruft into a new pack, which have been corrected.
* In read-only repositories, "git merge-tree" tried to come up with a
merge result tree object, which it failed (which is not wrong) and
led to a segfault (which is bad), which has been corrected.
* Force C locale while running tests around httpd to make sure we can
find expected error messages in the log.
* Fix a logic in "mailinfo -b" that miscomputed the length of a
substring, which lead to an out-of-bounds access.
* The codepath to sign learned to report errors when it fails to read
from "ssh-keygen".
* Code clean-up that results in plugging a leak.
* "GIT_EDITOR=: git branch --edit-description" resulted in failure,
which has been corrected.
* The code to clean temporary object directories (used for
quarantine) tried to remove them inside its signal handler, which
was a no-no.
* Update comment in the Makefile about the RUNTIME_PREFIX config knob.
* Clarify that "the sentence after <area>: prefix does not begin with
a capital letter" rule applies only to the commit title.
* "git branch --edit-description" on an unborh branch misleadingly
said that no such branch exists, which has been corrected.
* Work around older clang that warns against C99 zero initialization
syntax for struct.
* Giving "--invert-grep" and "--all-match" without "--grep" to the
"git log" command resulted in an attempt to access grep pattern
expression structure that has not been allocated, which has been
corrected.
(merge db84376f98 ab/grep-simplify-extended-expression later to maint).
* "git diff rev^!" did not show combined diff to go to the rev from
its parents.
(merge a79c6b6081 rs/diff-caret-bang-with-parents later to maint).
* Allow configuration files in "protected" scopes to include other
configuration files.
(merge ecec57b3c9 gc/bare-repo-discovery later to maint).
* Give a bit more diversity to macOS CI by using sha1dc in one of the
jobs (the other one tests Apple Common Crypto).
(merge 1ad5c3df35 jc/ci-osx-with-sha1dc later to maint).
* A bugfix with tracing support in midx codepath
(merge e9c3839944 tb/midx-bitmap-selection-fix later to maint).
* When geometric repacking feature is in use together with the
--pack-kept-objects option, we lost packs marked with .keep files.
(merge 197443e80a tb/save-keep-pack-during-geometric-repack later to maint).
* Move a global variable added as a hack during regression fixes to
its proper place in the API.
(merge 0b0ab95f17 ab/run-hook-api-cleanup later to maint).
* Update to build procedure with VS using CMake/CTest.
(merge c858750b41 js/cmake-updates later to maint).
* The short-help text shown by "git cmd -h" and the synopsis text
shown at the beginning of "git help cmd" have been made more
consistent.
* When creating a multi-pack bitmap, remove per-pack bitmap files
unconditionally as they will never be consulted.
(merge 55d902cd61 tb/remove-unused-pack-bitmap later to maint).
* Fix a longstanding syntax error in Git.pm error codepath.
* "git diff --stat" etc. were invented back when everything was ASCII
and strlen() was a way to measure the display width of a string;
adjust them to compute the display width assuming UTF-8 pathnames.
(merge ce8529b2bb tb/diffstat-with-utf8-strwidth later to maint).
* "git branch --edit-description" can exit with status -1 which is
not a good practice; it learned to use 1 as everybody else instead.
* "git apply" limits its input to a bit less than 1 GiB.
* Merging a branch with directory renames into a branch that changes
the directory to a symlink was mishandled by the ort merge
strategy, which has been corrected.
* A bugfix to "git subtree" in its split and merge features.
* Fix some bugs in the reflog messages when rebasing and changes the
reflog messages of "rebase --apply" to match "rebase --merge" with
the aim of making the reflog easier to parse.
* "git rebase --keep-base" used to discard the commits that are
already cherry-picked to the upstream, even when "keep-base" meant
that the base, on top of which the history is being rebuilt, does
not yet include these cherry-picked commits. The --keep-base
option now implies --reapply-cherry-picks and --no-fork-point
options.
* The way "git repack" creared temporary files when it received a
signal was prone to deadlocking, which has been corrected.
* Various tests exercising the transfer.credentialsInUrl
configuration are taught to avoid making requests which require
resolving localhost to reduce CI-flakiness.
* The adjust_shared_perm() helper function learned to refrain from
setting the "g+s" bit on directories when it is not necessary.
* "git archive" mistakenly complained twice about a missing
executable, which has been corrected.
* Fix a bug where `git branch -d` did not work on an orphaned HEAD.
* `git rebase --update-refs` would delete references when all
`update-ref` commands in the sequencer were removed, which has been
corrected.
* Fix a regression in the bisect-helper which mistakenly treats
arguments to the command given to 'git bisect run' as arguments to
the helper.
* Correct an error where `git rebase` would mistakenly use a branch or
tag named "refs/rewritten/xyz" when missing a rebase label.
* Assorted fixes of parsing end-user input as integers.
(merge 14770cf0de pw/config-int-parse-fixes later to maint).
* "git prune" may try to iterate over .git/objects/pack for trash
files to remove in it, and loudly fail when the directory is
missing, which is not necessary. The command has been taught to
ignore such a failure.
(merge 6974765352 ew/prune-with-missing-objects-pack later to maint).
* Add one more candidate directory that may house httpd modules while
running tests.
(merge 1c7dc23d41 es/locate-httpd-module-location-in-test later to maint).
* A handful of leaks in the line-log machinery have been plugged.
* The format of a line in /proc/cpuinfo that describes a CPU on s390x
looked different from everybody else, and the code in chainlint.pl
failed to parse it.
(merge 1f51b77f4f ah/chainlint-cpuinfo-parse-fix later to maint).
* Adjust the GitHub CI to newer ubuntu release.
(merge 0d3507f3e7 jx/ci-ubuntu-fix later to maint).
* Other code cleanup, docfix, build fix, etc.
(merge 413bc6d20a ds/cmd-main-reorder later to maint).
(merge 8d2863e4ed nw/t1002-cleanup later to maint).
(merge 7c2dc122f9 rs/list-objects-filter-leakfix later to maint).
(merge 288fcb1c94 zk/push-use-bitmaps later to maint).
(merge 42db324c0f km/merge-recursive-typofix later to maint).
----------------------------------------------------------------
Changes since v2.38.0 are as follows:
Alejandro R. Sedeño (1):
git-compat-util.h: GCC deprecated message arg only in GCC 4.5+
Alex Henrie (2):
fsmonitor--daemon: don't translate literal commands
push: improve grammar of branch.autoSetupMerge advice
Andreas Hasenack (1):
chainlint.pl: fix /proc/cpuinfo regexp
Anh Le (2):
index: add trace2 region for clear skip worktree
index: raise a bug if the index is materialised more than once
Arthur Chan (1):
fuzz: reorganise the path for existing oss-fuzz fuzzers
Daniel Sonbolian (1):
git.c: improve code readability in cmd_main()
Debra Obondo (1):
t7001-mv.sh: modernizing test script using functions
Derrick Stolee (15):
maintenance: add 'unregister --force'
scalar: make 'unregister' idempotent
gc: replace config subprocesses with API calls
string-list: document iterator behavior on NULL input
bundle-uri: fix technical doc issues
bundle-uri: use plain string in find_temp_filename()
bundle-uri: create bundle_list struct and helpers
bundle-uri: create base key-value pair parsing
bundle-uri: parse bundle list in config format
bundle-uri: limit recursion depth for bundle lists
bundle: properly clear all revision flags
bundle-uri: fetch a list of bundles
bundle: add flags to verify_bundle()
bundle-uri: quiet failed unbundlings
bundle-uri: suppress stderr from remote-https
Diomidis Spinellis (1):
grep: fix multibyte regex handling under macOS
Elijah Newren (4):
merge-ort: fix bug with dir rename vs change dir to symlink
merge-tree: update documentation for differences in -z output
merge-tree: support multiple batched merges with --stdin
sparse-checkout.txt: new document with sparse-checkout directions
Emily Shaffer (2):
gc: add tests for --cruft and friends
config: let feature.experimental imply gc.cruftPacks=true
Eric DeCosta (6):
fsmonitor: refactor filesystem checks to common interface
fsmonitor: relocate socket file if .git directory is remote
fsmonitor: avoid socket location check if using hook
fsmonitor: deal with synthetic firmlinks on macOS
fsmonitor: check for compatability before communicating with fsmonitor
fsmonitor: add documentation for allowRemote and socketDir options
Eric Sunshine (9):
check-non-portable-shell: detect obsolescent egrep/fgrep
chainlint: add explanatory comments
chainlint: tighten accuracy when consuming input stream
chainlint: latch start/end position of each token
chainlint: annotate original test definition rather than token stream
chainlint: sidestep impoverished macOS "terminfo"
chainlint: latch line numbers at which each token starts and ends
chainlint: prefix annotated test definition with line numbers
lib-httpd: extend module location auto-detection
Eric Wong (2):
delta-islands: free island-related data after use
prune: quiet ENOENT on missing directories
Glen Choo (3):
config: respect includes in protected config
http: redact curl h2h3 headers in info
object-file: use real paths when adding alternates
Han-Wen Nienhuys (1):
refs: unify parse_worktree_ref() and ref_type()
Jean-Noël Avila (1):
i18n: fix command template placeholder format
Jeff Hostetler (9):
config.mak.dev: disable suggest braces error on old clang versions
trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
tr2tls: clarify TLS terminology
api-trace2.txt: elminate section describing the public trace2 API
trace2: rename the thread_name argument to trace2_thread_start
trace2: improve thread-name documentation in the thread-context
trace2: convert ctx.thread_name from strbuf to pointer
trace2: add stopwatch timers
trace2: add global counter mechanism
Jeff King (43):
fsck: free tree buffers after walking unreachable objects
fsck: turn off save_commit_buffer
parse_object_buffer(): respect save_commit_buffer
clone: allow "--bare" with "-o"
remote: handle rename of remote without fetch refspec
shell: add basic tests
shell: limit size of interactive commands
sequencer: detect author name errors in read_author_script()
test-submodule: inline resolve_relative_url() function
multi-pack-index: avoid writing to global in option callback
commit: avoid writing to global in option callback
attr: drop DEBUG_ATTR code
dir: use fspathncmp() in pl_hashmap_cmp()
fsmonitor: fix leak of warning message
diffstat_consume(): assert non-zero length
submodule--helper: drop unused argc from module_list_compute()
update-index: drop unused argc from do_reupdate()
mark unused parameters in trivial compat functions
object-file: mark unused parameters in hash_unknown functions
string-list: mark unused callback parameters
date: mark unused parameters in handler functions
apply: mark unused parameters in handlers
apply: mark unused parameters in noop error/warning routine
convert: mark unused parameter in null stream filter
diffcore-pickaxe: mark unused parameters in pickaxe functions
ll-merge: mark unused parameters in callbacks
Makefile: force -O0 when compiling with SANITIZE=leak
repack: convert "names" util bitfield to array
repack: populate extension bits incrementally
repack: expand error message for missing pack files
repack: use tempfiles for signal cleanup
repack: drop remove_temporary_files()
Git.pm: trust rev-parse to find bare repositories
t7700: annotate cruft-pack failure with ok=sigpipe
shortlog: accept `--date`-related options
Makefile: force -O0 when compiling with SANITIZE=leak
t5516: move plaintext-password tests from t5601 and t5516
ref-filter: fix parsing of signatures without blank lines
ref-filter: fix parsing of signatures with CRLF and no body
branch: gracefully handle '-d' on orphan HEAD
t: run t5551 tests with both HTTP and HTTP/2
parse_object(): drop extra "has" check before checking object type
parse_object(): check on-disk type of suspected blob
Jerry Zhang (6):
patch-id: fix stable patch id for binary / header-only
patch-id: use stable patch-id for rebases
builtin: patch-id: fix patch-id with binary diffs
patch-id: fix patch-id for mode changes
builtin: patch-id: add --verbatim as a command mode
builtin: patch-id: remove unused diff-tree prefix
Jiang Xin (5):
t5516: fail to run in verbose mode
github-actions: run gcc-8 on ubuntu-20.04 image
ci: remove the pipe after "p4 -V" to catch errors
ci: use the same version of p4 on both Linux and macOS
ci: install python on ubuntu
Johannes Altmanninger (1):
sequencer: avoid dropping fixup commit that targets self via commit-ish
Johannes Schindelin (11):
merge-ort: fix segmentation fault in read-only repositories
merge-ort: return early when failing to write a blob
cmake: make it easier to diagnose regressions in CTest runs
cmake: copy the merge tools for testing
add -p: avoid ambiguous signed/unsigned comparison
cmake: avoid editing t/test-lib.sh
cmake: increase time-out for a long-running test
t5516/t5601: be less strict about the number of credential warnings
scalar reconfigure -a: remove stale `scalar.repo` entries
ci: use a newer `github-script` version
tests(scalar): tighten the stale `scalar.repo` test some
John Cai (3):
tmp-objdir: skip clean up when handling a signal
fsck: remove the unused BAD_TAG_OBJECT
fsck: document msg-id
Jonathan Tan (4):
promisor-remote: remove a return value
promisor-remote: die upon failing fetch
negotiator/skipping: avoid stack overflow
Doc: document push.recurseSubmodules=only
Julia Ramer (1):
embargoed releases: also describe the git-security list and the process
Junio C Hamano (29):
environ: document GIT_SSL_NO_VERIFY
environ: explain Boolean environment variables
environ: GIT_FLUSH should be made a usual Boolean
environ: simplify description of GIT_INDEX_FILE
environ: GIT_INDEX_VERSION affects not just a new repository
branch: do not fail a no-op --edit-desc
SubmittingPatches: use usual capitalization in the log message body
Start 2.39 cycle
symbolic-ref: teach "--[no-]recurse" option
The (real) first batch for 2.39
The second batch
The third batch
The fourth batch
ci: add address and undefined sanitizer tasks
ci: use DC_SHA1=YesPlease on osx-clang job for CI
The fifth batch
diff: leave NEEDWORK notes in show_stats() function
fsck: remove the unused MISSING_TREE_OBJECT
Documentation: add lint-fsck-msgids
Downmerge a handful of topics for 2.38.2
The sixth batch
Downmerge a bit more for 2.38.2
The seventh batch
The eighth batch
adjust_shared_perm(): leave g+s alone when the group does not matter
Git 2.39-rc0
Another batch before -rc1
A bit more before -rc1
Git 2.39-rc1
Kevin Backhouse (1):
alias.c: reject too-long cmdline strings in split_cmdline()
Kousik Sanagavarapu (1):
repository-version.txt: partialClone casing change
Kyle Meyer (1):
merge-recursive: fix variable typo in error message
M Hickford (4):
Documentation/gitcredentials.txt: mention password alternatives
Documentation: increase example cache timeout to 1 hour
docs: clarify that credential discards unrecognised attributes
Docs: describe how a credential-generating helper works
Martin Ågren (1):
test-lib-functions: drop redundant diagnostic print
Matthew John Cheetham (3):
wincred: ignore unknown lines (do not die)
netrc: ignore unknown lines (do not die)
osxkeychain: clarify that we ignore unknown lines
Michael J Gruber (1):
notes: avoid empty line in template
Michael McClimon (1):
Git.pm: add semicolon after catch statement
Noah Betzen (1):
mergetool.txt: typofix 'overwriten' -> 'overwritten'
Nsengiyumva Wilberforce (1):
t1002: modernize outdated conditional
Patrick Steinhardt (7):
refs: fix memory leak when parsing hideRefs config
refs: get rid of global list of hidden refs
revision: move together exclusion-related functions
revision: introduce struct to handle exclusions
revision: add new parameter to exclude hidden refs
rev-parse: add `--exclude-hidden=` option
receive-pack: only use visible refs for connectivity check
Paul Smith (1):
Makefile: avoid multiple patterns when recipes generate one file
Philip Oakley (4):
doc: use "commit-graph" hyphenation consistently
doc: use 'object database' not ODB or abbreviation
glossary: add "commit graph" description
glossary: add reachability bitmap description
Philippe Blain (9):
test-lib-functions: mark 'test_commit' variables as 'local'
subtree: use 'git rev-parse --verify [--quiet]' for better error messages
subtree: add 'die_incompatible_opt' function to reduce duplication
subtree: prefix die messages with 'fatal'
subtree: define a variable before its first use in 'find_latest_squash'
subtree: use named variables instead of "$@" in cmd_pull
subtree: process 'git-subtree-split' trailer in separate function
subtree: fix squash merging after annotated tag was squashed merged
subtree: fix split after annotated tag was squashed merged
Phillip Wood (26):
mailinfo -b: fix an out of bounds access
ssh signing: return an error when signature cannot be read
t3435: remove redundant test case
t3416: tighten two tests
t3416: set $EDITOR in subshell
rebase: be stricter when reading state files containing oids
rebase: store orig_head as a commit
rebase: rename merge_base to branch_base
rebase: factor out branch_base calculation
rebase --keep-base: imply --reapply-cherry-picks
rebase --keep-base: imply --no-fork-point
rebase --apply: remove duplicated code
t3406: rework rebase reflog tests
rebase --merge: fix reflog when continuing
rebase --merge: fix reflog message after skipping
rebase --apply: respect GIT_REFLOG_ACTION
rebase --apply: make reflog messages match rebase --merge
rebase --abort: improve reflog message
rebase: cleanup action handling
sequencer: stop exporting GIT_REFLOG_ACTION
rebase: stop exporting GIT_REFLOG_ACTION
git_parse_unsigned: reject negative values
config: require at least one digit when parsing numbers
git_parse_signed(): avoid integer overflow
sequencer: unify label lookup
sequencer: tighten label lookups
René Scharfe (21):
revision: use strtol_i() for exclude_parent
revisions.txt: unspecify order of resolved parts of ^!
diff: support ^! for merges
gc: simplify maintenance_task_pack_refs()
t/lib-httpd: pass LANG and LC_ALL to Apache
bisect--helper: plug strvec leak
archive: deduplicate verbose printing
submodule: use strvec_pushf() for --super-prefix
run-command: fix return value comment
am: simplify building "show" argument list
bisect: simplify building "checkout" argument list
bisect--helper: factor out do_bisect_run()
sequencer: simplify building argument list in do_exec()
use child_process member "args" instead of string array variable
use child_process members "args" and "env" directly
replace and remove run_command_v_opt_cd_env()
replace and remove run_command_v_opt_tr2()
replace and remove run_command_v_opt_cd_env_tr2()
replace and remove run_command_v_opt()
archive-tar: report filter start error only once
list-objects-filter: plug combine_filter_data leak
Ronan Pigott (2):
for-each-repo: interpolate repo path arguments
maintenance: add option to register in a specific config
Rubén Justo (5):
ref-filter.c: fix a leak in get_head_description
branch: description for non-existent branch errors
branch: support for shortcuts like @{-1}, completed
branch: error copying or renaming a detached HEAD
branch: error code with --edit-description
SZEDER Gábor (4):
Documentation/build-docdep.perl: generate sorted output
line-log: free diff queue when processing non-merge commits
line-log: free the diff queues' arrays when processing merge commits
diff.c: use diff_free_queue()
Sergey Organov (3):
diff-merges: cleanup func_by_opt()
diff-merges: cleanup set_diff_merges()
diff-merges: clarify log.diffMerges documentation
Shaoxuan Yuan (1):
builtin/grep.c: integrate with sparse index
Sotir Danailov (1):
docs: git-send-email: difference between ssl and tls smtp-encryption
Taylor Blau (64):
Documentation/git-multi-pack-index.txt: fix typo
Documentation/git-multi-pack-index.txt: clarify expire behavior
midx.c: prevent `expire` from removing the cruft pack
midx.c: avoid cruft packs with `repack --batch-size=0`
midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`
midx.c: remove unnecessary loop condition
midx.c: avoid cruft packs with non-zero `repack --batch-size`
builtin/clone.c: disallow `--local` clones with symlinks
t/lib-submodule-update.sh: allow local submodules
t/t1NNN: allow local submodules
t/2NNNN: allow local submodules
t/t3NNN: allow local submodules
t/t4NNN: allow local submodules
t/t5NNN: allow local submodules
t/t6NNN: allow local submodules
t/t7NNN: allow local submodules
t/t9NNN: allow local submodules
transport: make `protocol.file.allow` be "user" by default
t1092: prepare for changing protocol.file.allow
t2080: prepare for changing protocol.file.allow
t1092: prepare for changing protocol.file.allow
t2080: prepare for changing protocol.file.allow
t3207: prepare for changing protocol.file.allow
t5516: prepare for changing protocol.file.allow
t5537: prepare for changing protocol.file.allow
t7814: prepare for changing protocol.file.allow
t3206: prepare for changing protocol.file.allow
t5537: prepare for changing protocol.file.allow
Git 2.30.6
Git 2.31.5
Git 2.32.4
Git 2.33.5
Git 2.34.5
Git 2.35.5
Git 2.36.3
t7527: prepare for changing protocol.file.allow
Git 2.37.4
Git 2.38.1
midx.c: fix whitespace typo
midx.c: consider annotated tags during bitmap selection
midx.c: instrument MIDX and bitmap generation with trace2 regions
pack-bitmap-write.c: instrument number of reused bitmaps
builtin/repack.c: remove redundant pack-based bitmaps
repack: don't remove .keep packs with `--pack-kept-objects`
builtin/repack.c: pass "out" to `prepare_pack_objects`
builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
builtin/repack.c: write cruft packs to arbitrary locations
builtin/repack.c: implement `--expire-to` for storing pruned objects
shortlog: make trailer insertion a noop when appropriate
shortlog: extract `--group` fragment for translation
shortlog: support arbitrary commit format `--group`s
shortlog: extract `shortlog_finish_setup()`
shortlog: implement `--group=author` in terms of `--group=<format>`
shortlog: implement `--group=committer` in terms of `--group=<format>`
apply: reject patches larger than ~1 GiB
Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
The ninth batch
Documentation: build redo-jch.sh from master..jch
Documentation: build redo-seen.sh from jch..seen
The tenth batch
The eleventh batch
The twelfth batch
builtin/gc.c: fix use-after-free in maintenance_unregister()
The thirteenth batch
Torsten Bögershausen (1):
diff.c: use utf8_strwidth() to count display width
Victoria Dye (7):
read-cache: avoid misaligned reads in index v4
rebase --update-refs: avoid unintended ref deletion
cache-tree: add perf test comparing update and prime
unpack-trees: add 'skip_cache_tree_update' option
reset: use 'skip_cache_tree_update' option
read-tree: use 'skip_cache_tree_update' option
rebase: use 'skip_cache_tree_update' option
Vincent Bernat (1):
ls-files: fix --ignored and --killed flags in synopsis
Vlad-Stefan Harbuz (1):
Documentation: fix typo
srz_zumix (1):
fsmonitor--daemon: on macOS support symlink
Ævar Arnfjörð Bjarmason (113):
test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK
CodingGuidelines: update for C99
CodingGuidelines: mention dynamic C99 initializer elements
CodingGuidelines: allow declaring variables in for loops
CodingGuidelines: mention C99 features we can't use
grep.c: remove "extended" in favor of "pattern_expression", fix segfault
CodingGuidelines: recommend against unportable C99 struct syntax
bundle-uri: create "key=value" line parsing
bundle-uri: unit test "key=value" parsing
run-command test helper: use "else if" pattern
run-command API: have "run_processes_parallel{,_tr2}()" return void
run-command tests: use "return", not "exit"
run-command API: make "n" parameter a "size_t"
run-command API: don't fall back on online_cpus()
run-command.c: use designated init for pp_init(), add "const"
run-command API: have run_process_parallel() take an "opts" struct
run-command API: move *_tr2() users to "run_processes_parallel()"
run-command.c: make "struct parallel_processes" const if possible
run-command.c: don't copy *_fn to "struct parallel_processes"
run-command.c: don't copy "ungroup" to "struct parallel_processes"
run-command.c: don't copy "data" to "struct parallel_processes"
run-command.c: use "opts->processes", not "pp->max_processes"
run-command.c: pass "opts" further down, and use "opts->processes"
run-command.c: remove "max_processes", add "const" to signal() handler
tests: assert *.txt SYNOPSIS and -h output
CodingGuidelines: update and clarify command-line conventions
builtin/bundle.c: indent with tabs
bundle: define subcommand -h in terms of command -h
doc SYNOPSIS: don't use ' for subcommands
doc SYNOPSIS: consistently use ' for commands
built-ins: consistently add "\n" between "usage" and options
doc txt & -h consistency: word-wrap
doc txt & -h consistency: fix incorrect alternates syntax
doc txt & -h consistency: add "-z" to cat-file "-h"
doc txt & -h consistency: balance unbalanced "[" and "]"
doc txt & -h consistency: correct padding around "[]()"
stash doc SYNOPSIS & -h: correct padding around "[]()"
doc txt & -h consistency: use "<options>", not "<options>..."
doc SYNOPSIS & -h: use "-" to separate words in labels, not "_"
doc txt & -h consistency: fix mismatching labels
doc txt & -h consistency: add or fix optional "--" syntax
doc txt & -h consistency: make output order consistent
doc txt & -h consistency: add missing options and labels
doc txt & -h consistency: make "rerere" consistent
doc txt & -h consistency: make "read-tree" consistent
doc txt & -h consistency: make "bundle" consistent
doc txt & -h consistency: use "git foo" form, not "git-foo"
doc txt & -h consistency: add missing options
doc txt & -h consistency: make "stash" consistent
doc txt & -h consistency: make "annotate" consistent
doc txt & -h consistency: use "[<label>...]" for "zero or more"
doc txt & -h consistency: make "diff-tree" consistent
doc txt & -h consistency: make "commit" consistent
reflog doc: list real subcommands up-front
worktree: define subcommand -h in terms of command -h
doc txt & -h consistency: make "worktree" consistent
tests: start asserting that *.txt SYNOPSIS matches -h output
tests: assert consistent whitespace in -h output
fsmonitor OSX: compile with DC_SHA1=YesPlease
merge: remove always-the-same "verbose" arguments
hook tests: fix redirection logic error in 96e7225b310
submodule tests: reset "trace.out" between "grep" invocations
run-command tests: test stdout of run_command_parallel()
Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
cocci rules: remove unused "F" metavariable from pending rule
Makefile: add ability to TAB-complete cocci *.patch rules
Makefile: have "coccicheck" re-run if flags change
Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
cocci: split off include-less "tests" from SPATCH_FLAGS
cocci: split off "--all-includes" from SPATCH_FLAGS
cocci: make "coccicheck" rule incremental
cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
Makefile: copy contrib/coccinelle/*.cocci to build/
cocci rules: remove <id>'s from rules that don't need them
cocci: run against a generated ALL.cocci
spatchcache: add a ccache-alike for "spatch"
Makefile: always (re)set DC_SHA1 on fallback
INSTALL: remove discussion of SHA-1 backends
Makefile: correct DC_SHA1 documentation
Makefile: create and use sections for "define" flag listing
Makefile: rephrase the discussion of *_SHA1 knobs
Makefile: document default SHA-256 backend
Makefile: document SHA-1 and SHA-256 default and selection order
Makefile & test-tool: replace "DC_SHA1" variable with a "define"
Makefile: document default SHA-1 backend on OSX
Makefile: discuss SHAttered in *_SHA{1,256} discussion
submodule--helper: move "config" to a test-tool
submodule tests: add tests for top-level flag output
submodule--helper: fix a memory leak in "status"
submodule tests: test for a "foreach" blind-spot
submodule.c: refactor recursive block out of absorb function
submodule API & "absorbgitdirs": remove "----recursive" option
submodule--helper: remove --prefix from "absorbgitdirs"
submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
submodule--helper: use OPT_SUBCOMMAND() API
revisions API: extend the nascent REV_INFO_INIT macro
t7610: fix flaky timeout issue, don't clone from example.com
Makefile: don't create a ".build/.build/" for cocci, fix output
maintenance --unregister: fix uninit'd data use & -Wdeclaration-after-statement
t7610: use "file:///dev/null", not "/dev/null", fixes MinGW
cache.h: remove unused "the_index" compat macros
builtin/{grep,log}.: don't define "USE_THE_INDEX_COMPATIBILITY_MACROS"
cocci & cache.h: remove rarely used "the_index" compat macros
read-cache API & users: make discard_index() return void
cocci: add a index-compatibility.pending.cocci
cocci & cache.h: apply a selection of "pending" index-compatibility
cocci & cache.h: apply variable section of "pending" index-compatibility
cocci: apply "pending" index-compatibility to "t/helper/*.c"
{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"
cache.h & test-tool.h: add & use "USE_THE_INDEX_VARIABLE"
cocci: apply "pending" index-compatibility to some "builtin/*.c"
parse_object(): simplify blob conditional
trace2 tests: guard pthread test with "PTHREAD"
Đoàn Trần Công Danh (8):
CodingGuidelines: allow grep -E
t: remove \{m,n\} from BRE grep usage
t: convert egrep usage to "grep -E"
t: convert fgrep usage to "grep -F"
Makefile: clarify runtime relative gitexecdir
bisect--helper: remove unused options
bisect--helper: move all subcommands into their own functions
bisect--helper: parse subcommand with OPT_SUBCOMMAND
^ permalink raw reply [relevance 1%]
* [ANNOUNCE] Git v2.39.0-rc0
@ 2022-11-23 7:25 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2022-11-23 7:25 UTC (permalink / raw)
To: git; +Cc: git-packagers, lwn
An early preview release Git v2.39.0-rc0 is now available for
testing at the usual places. It is comprised of 423 non-merge
commits since v2.38.0, contributed by 67 people, 28 of which are
new faces [*].
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.39.0-rc0' tag and the 'master' branch that the tag points at:
url = https://git.kernel.org/pub/scm/git/git
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.38.0 are as follows.
Welcome to the Git development community!
Alexander Meshcheryakov, Anh Le, Arthur Chan, Daniel
Sonbolian, Debra Obondo, Diomidis Spinellis, Erik Cervin
Edin, Hank Leininger, herr.kaste, John A. Leuenhagen, Julia
Ramer, Kevin Backhouse, Kousik Sanagavarapu, Lukáš Doktor,
Martin Englund, M Hickford, Michael V. Scovetta, Noah Betzen,
Nsengiyumva Wilberforce, orygaw, Ronan Pigott, Rubén Justo,
Sotir Danailov, srz_zumix, Stefano Rivera, Tim Jaacks, Vincent
Bernat, and Vlad-Stefan Harbuz.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
정재우, Ævar Arnfjörð Bjarmason, Alejandro R. Sedeño,
Alex Henrie, Derrick Stolee, Đoàn Trần Công Danh, Elijah
Newren, Emily Shaffer, Eric DeCosta, Eric Sunshine, Eric Wong,
Glen Choo, Han-Wen Nienhuys, Jan Pokorný, Jeff Hostetler, Jeff
King, Jerry Zhang, Johannes Altmanninger, Johannes Schindelin,
John Cai, Jonathan Tan, Julien Moutinho, Junio C Hamano, Martin
Ågren, Martin von Zweigbergk, Matthew John Cheetham, Michael
J Gruber, Michael McClimon, Patrick Steinhardt, Philip Oakley,
Philippe Blain, Phillip Wood, René Scharfe, Sergey Organov,
Shaoxuan Yuan, SZEDER Gábor, Taylor Blau, Torsten Bögershausen,
and Victoria Dye.
[*] We are counting not just the authorship contribution but issue
reporting, mentoring, helping and reviewing that are recorded in
the commit trailers.
----------------------------------------------------------------
Git v2.39 Release Notes (draft)
===============================
UI, Workflows & Features
------------------------
* "git grep" learned to expand the sparse-index more lazily and on
demand in a sparse checkout.
* By default, use of fsmonitor on a repository on networked
filesystem is disabled. Add knobs to make it workable on macOS.
* After checking out a "branch" that is a symbolic-ref that points at
another branch, "git symbolic-ref HEAD" reports the underlying
branch, not the symbolic-ref the user gave checkout as argument.
The command learned the "--no-recurse" option to stop after
dereferencing a symbolic-ref only once.
* "git branch --edit-description @{-1}" is now a way to edit branch
description of the branch you were on before switching to the
current branch.
* "git merge-tree --stdin" is a new way to request a series of merges
and report the merge results.
* "git shortlog" learned to group by the "format" string.
* A new "--include-whitespace" option is added to "git patch-id", and
existing bugs in the internal patch-id logic that did not match
what "git patch-id" produces have been corrected.
* Enable gc.cruftpacks by default for those who opt into
feature.experimental setting.
* "git repack" learns to send cruft objects out of the way into
packfiles outside the repository.
* 'scalar reconfigure -a' is taught to automatically remove
scalar.repo entires which no longer exist.
* Redact headers from cURL's h2h3 module in GIT_CURL_VERBOSE and
others.
* 'git maintenance register' is taught to write configuration to an
arbitrary path, and 'git for-each-repo' is taught to expand tilde
characters in paths.
* When creating new notes, the template used to get a stray empty
newline, which has been removed.
* "git receive-pack" used to use all the local refs as the boundary for
checking connectivity of the data "git push" sent, but now it uses
only the refs that it advertised to the pusher. In a repository with
the .hideRefs configuration, this reduces the resources needed to
perform the check.
* With '--recurse-submodules=on-demand', all submodules are
recursively pushed.
Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------
* With a bit of header twiddling, use the native regexp library on
macOS instead of the compat/ one.
* Prepare for GNU [ef]grep that throw warning of their uses.
* Sources related to fuzz testing have been moved down to their own
directory.
* Most credential helpers ignored unknown entries in a credential
description, but a few died upon seeing them. The latter were
taught to ignore them, too
* "scalar unregister" in a repository that is already been
unregistered reported an error.
* Remove error detection from a function that fetches from promisor
remotes, and make it die when such a fetch fails to bring all the
requested objects, to give an early failure to various operations.
* Update CodingGuidelines to clarify what features to use and avoid
in C99.
* Avoid false-positive from LSan whose assumption may be broken with
higher optimization levels.
* Enable address and undefined sanitizer tasks at GitHub Actions CI.
* More UNUSED annotation to help using -Wunused option with the
compiler.
(merge 4b992f0a24 jk/unused-anno-more later to maint).
* Rewrite a deep recursion in the skipping negotiator to use a loop
with on-heap prio queue to avoid stack wastage.
* Add documentation for message IDs in fsck error messages.
* Define the logical elements of a "bundle list", data structure to
store them in-core, format to transfer them, and code to parse
them.
* The role the security mailing list plays in an embargoed release
has been documented.
* Two new facilities, "timer" and "counter", are introduced to the
trace2 API.
* Code simplification by using strvec_pushf() instead of building an
argument in a separate strbuf.
* Make sure generated dependency file is stably sorted to help
developers debugging their build issues.
* The glossary entries for "commit-graph file" and "reachability
bitmap" have been added.
* Various tests exercising the transfer.credentialsInUrl
configuration are taught to avoid making requests which require
resolving localhost to reduce CI-flakiness.
* A redundant diagnostic message is dropped from test_path_is_missing().
* Simplify the run-command API.
* Update the actions/github-script dependency in CI to avoid a
deprecation warning.
* Progress on being able to initialize a rev_info struct with a
macro.
* Add trace2 counters to the region to clear skip worktree bits in a
sparse checkout.
* Modernize test script to avoid "test -f" and friends.
* Avoid calling 'cache_tree_update()' when doing so would be
redundant.
* Update the credential-cache documentation to provide a more
realistic example.
* Makefile comments updates and reordering to clarify knobs used to
choose SHA implementations.
* A design document for sparse-checkout's future directions has been
added.
* Teach chainlint.pl to annotate the original test definition instead
of the token stream.
* "make coccicheck" is time consuming. It has been made to run more
incrementally.
Fixes since v2.38
-----------------
* The codepath that reads from the index v4 had unaligned memory
accesses, which has been corrected.
* Fix messages incorrectly marked for translation.
* "git fsck" failed to release contents of tree objects already used
from the memory, which has been fixed.
* "git clone" did not like to see the "--bare" and the "--origin"
options used together without a good reason.
* "git remote rename" failed to rename a remote without fetch
refspec, which has been corrected.
* Documentation on various Boolean GIT_* environment variables have
been clarified.
* "git rebase -i" can mistakenly attempt to apply a fixup to a commit
itself, which has been corrected.
* "git multi-pack-index repack/expire" used to repack unreachable
cruft into a new pack, which have been corrected.
* In read-only repositories, "git merge-tree" tried to come up with a
merge result tree object, which it failed (which is not wrong) and
led to a segfault (which is bad), which has been corrected.
* Force C locale while running tests around httpd to make sure we can
find expected error messages in the log.
* Fix a logic in "mailinfo -b" that miscomputed the length of a
substring, which lead to an out-of-bounds access.
* The codepath to sign learned to report errors when it fails to read
from "ssh-keygen".
* Code clean-up that results in plugging a leak.
* "GIT_EDITOR=: git branch --edit-description" resulted in failure,
which has been corrected.
* The code to clean temporary object directories (used for
quarantine) tried to remove them inside its signal handler, which
was a no-no.
* Update comment in the Makefile about the RUNTIME_PREFIX config knob.
* Clarify that "the sentence after <area>: prefix does not begin with
a capital letter" rule applies only to the commit title.
* "git branch --edit-description" on an unborh branch misleadingly
said that no such branch exists, which has been corrected.
* Work around older clang that warns against C99 zero initialization
syntax for struct.
* Giving "--invert-grep" and "--all-match" without "--grep" to the
"git log" command resulted in an attempt to access grep pattern
expression structure that has not been allocated, which has been
corrected.
(merge db84376f98 ab/grep-simplify-extended-expression later to maint).
* "git diff rev^!" did not show combined diff to go to the rev from
its parents.
(merge a79c6b6081 rs/diff-caret-bang-with-parents later to maint).
* Allow configuration files in "protected" scopes to include other
configuration files.
(merge ecec57b3c9 gc/bare-repo-discovery later to maint).
* Give a bit more diversity to macOS CI by using sha1dc in one of the
jobs (the other one tests Apple Common Crypto).
(merge 1ad5c3df35 jc/ci-osx-with-sha1dc later to maint).
* A bugfix with tracing support in midx codepath
(merge e9c3839944 tb/midx-bitmap-selection-fix later to maint).
* When geometric repacking feature is in use together with the
--pack-kept-objects option, we lost packs marked with .keep files.
(merge 197443e80a tb/save-keep-pack-during-geometric-repack later to maint).
* Move a global variable added as a hack during regression fixes to
its proper place in the API.
(merge 0b0ab95f17 ab/run-hook-api-cleanup later to maint).
* Update to build procedure with VS using CMake/CTest.
(merge c858750b41 js/cmake-updates later to maint).
* The short-help text shown by "git cmd -h" and the synopsis text
shown at the beginning of "git help cmd" have been made more
consistent.
* When creating a multi-pack bitmap, remove per-pack bitmap files
unconditionally as they will never be consulted.
(merge 55d902cd61 tb/remove-unused-pack-bitmap later to maint).
* Fix a longstanding syntax error in Git.pm error codepath.
* "git diff --stat" etc. were invented back when everything was ASCII
and strlen() was a way to measure the display width of a string;
adjust them to compute the display width assuming UTF-8 pathnames.
(merge ce8529b2bb tb/diffstat-with-utf8-strwidth later to maint).
* "git branch --edit-description" can exit with status -1 which is
not a good practice; it learned to use 1 as everybody else instead.
* "git apply" limits its input to a bit less than 1 GiB.
* Merging a branch with directory renames into a branch that changes
the directory to a symlink was mishandled by the ort merge
strategy, which has been corrected.
* A bugfix to "git subtree" in its split and merge features.
* Fix some bugs in the reflog messages when rebasing and changes the
reflog messages of "rebase --apply" to match "rebase --merge" with
the aim of making the reflog easier to parse.
* "git rebase --keep-base" used to discard the commits that are
already cherry-picked to the upstream, even when "keep-base" meant
that the base, on top of which the history is being rebuilt, does
not yet include these cherry-picked commits. The --keep-base
option now implies --reapply-cherry-picks and --no-fork-point
options.
* The way "git repack" creared temporary files when it received a
signal was prone to deadlocking, which has been corrected.
* Various tests exercising the transfer.credentialsInUrl
configuration are taught to avoid making requests which require
resolving localhost to reduce CI-flakiness.
* The adjust_shared_perm() helper function learned to refrain from
setting the "g+s" bit on directories when it is not necessary.
* "git archive" mistakenly complained twice about a missing
executable, which has been corrected.
* Fix a bug where `git branch -d` did not work on an orphaned HEAD.
* `git rebase --update-refs` would delete references when all
`update-ref` commands in the sequencer were removed, which has been
corrected.
* Fix a regression in the bisect-helper which mistakenly treats
arguments to the command given to 'git bisect run' as arguments to
the helper.
* Correct an error where `git rebase` would mistakenly use a branch or
tag named "refs/rewritten/xyz" when missing a rebase label.
* Other code cleanup, docfix, build fix, etc.
(merge 413bc6d20a ds/cmd-main-reorder later to maint).
(merge 8d2863e4ed nw/t1002-cleanup later to maint).
----------------------------------------------------------------
Changes since v2.38.0 are as follows:
Alejandro R. Sedeño (1):
git-compat-util.h: GCC deprecated message arg only in GCC 4.5+
Alex Henrie (2):
fsmonitor--daemon: don't translate literal commands
push: improve grammar of branch.autoSetupMerge advice
Anh Le (2):
index: add trace2 region for clear skip worktree
index: raise a bug if the index is materialised more than once
Arthur Chan (1):
fuzz: reorganise the path for existing oss-fuzz fuzzers
Daniel Sonbolian (1):
git.c: improve code readability in cmd_main()
Debra Obondo (1):
t7001-mv.sh: modernizing test script using functions
Derrick Stolee (15):
maintenance: add 'unregister --force'
scalar: make 'unregister' idempotent
gc: replace config subprocesses with API calls
string-list: document iterator behavior on NULL input
bundle-uri: fix technical doc issues
bundle-uri: use plain string in find_temp_filename()
bundle-uri: create bundle_list struct and helpers
bundle-uri: create base key-value pair parsing
bundle-uri: parse bundle list in config format
bundle-uri: limit recursion depth for bundle lists
bundle: properly clear all revision flags
bundle-uri: fetch a list of bundles
bundle: add flags to verify_bundle()
bundle-uri: quiet failed unbundlings
bundle-uri: suppress stderr from remote-https
Diomidis Spinellis (1):
grep: fix multibyte regex handling under macOS
Elijah Newren (4):
merge-ort: fix bug with dir rename vs change dir to symlink
merge-tree: update documentation for differences in -z output
merge-tree: support multiple batched merges with --stdin
sparse-checkout.txt: new document with sparse-checkout directions
Emily Shaffer (2):
gc: add tests for --cruft and friends
config: let feature.experimental imply gc.cruftPacks=true
Eric DeCosta (6):
fsmonitor: refactor filesystem checks to common interface
fsmonitor: relocate socket file if .git directory is remote
fsmonitor: avoid socket location check if using hook
fsmonitor: deal with synthetic firmlinks on macOS
fsmonitor: check for compatability before communicating with fsmonitor
fsmonitor: add documentation for allowRemote and socketDir options
Eric Sunshine (8):
check-non-portable-shell: detect obsolescent egrep/fgrep
chainlint: add explanatory comments
chainlint: tighten accuracy when consuming input stream
chainlint: latch start/end position of each token
chainlint: annotate original test definition rather than token stream
chainlint: sidestep impoverished macOS "terminfo"
chainlint: latch line numbers at which each token starts and ends
chainlint: prefix annotated test definition with line numbers
Eric Wong (1):
delta-islands: free island-related data after use
Glen Choo (2):
config: respect includes in protected config
http: redact curl h2h3 headers in info
Han-Wen Nienhuys (1):
refs: unify parse_worktree_ref() and ref_type()
Jeff Hostetler (9):
config.mak.dev: disable suggest braces error on old clang versions
trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
tr2tls: clarify TLS terminology
api-trace2.txt: elminate section describing the public trace2 API
trace2: rename the thread_name argument to trace2_thread_start
trace2: improve thread-name documentation in the thread-context
trace2: convert ctx.thread_name from strbuf to pointer
trace2: add stopwatch timers
trace2: add global counter mechanism
Jeff King (41):
fsck: free tree buffers after walking unreachable objects
fsck: turn off save_commit_buffer
parse_object_buffer(): respect save_commit_buffer
clone: allow "--bare" with "-o"
remote: handle rename of remote without fetch refspec
shell: add basic tests
shell: limit size of interactive commands
sequencer: detect author name errors in read_author_script()
test-submodule: inline resolve_relative_url() function
multi-pack-index: avoid writing to global in option callback
commit: avoid writing to global in option callback
attr: drop DEBUG_ATTR code
dir: use fspathncmp() in pl_hashmap_cmp()
fsmonitor: fix leak of warning message
diffstat_consume(): assert non-zero length
submodule--helper: drop unused argc from module_list_compute()
update-index: drop unused argc from do_reupdate()
mark unused parameters in trivial compat functions
object-file: mark unused parameters in hash_unknown functions
string-list: mark unused callback parameters
date: mark unused parameters in handler functions
apply: mark unused parameters in handlers
apply: mark unused parameters in noop error/warning routine
convert: mark unused parameter in null stream filter
diffcore-pickaxe: mark unused parameters in pickaxe functions
ll-merge: mark unused parameters in callbacks
Makefile: force -O0 when compiling with SANITIZE=leak
repack: convert "names" util bitfield to array
repack: populate extension bits incrementally
repack: expand error message for missing pack files
repack: use tempfiles for signal cleanup
repack: drop remove_temporary_files()
Git.pm: trust rev-parse to find bare repositories
t7700: annotate cruft-pack failure with ok=sigpipe
shortlog: accept `--date`-related options
Makefile: force -O0 when compiling with SANITIZE=leak
t5516: move plaintext-password tests from t5601 and t5516
ref-filter: fix parsing of signatures without blank lines
ref-filter: fix parsing of signatures with CRLF and no body
branch: gracefully handle '-d' on orphan HEAD
t: run t5551 tests with both HTTP and HTTP/2
Jerry Zhang (6):
patch-id: fix stable patch id for binary / header-only
patch-id: use stable patch-id for rebases
builtin: patch-id: fix patch-id with binary diffs
patch-id: fix patch-id for mode changes
builtin: patch-id: add --verbatim as a command mode
builtin: patch-id: remove unused diff-tree prefix
Johannes Altmanninger (1):
sequencer: avoid dropping fixup commit that targets self via commit-ish
Johannes Schindelin (11):
merge-ort: fix segmentation fault in read-only repositories
merge-ort: return early when failing to write a blob
cmake: make it easier to diagnose regressions in CTest runs
cmake: copy the merge tools for testing
add -p: avoid ambiguous signed/unsigned comparison
cmake: avoid editing t/test-lib.sh
cmake: increase time-out for a long-running test
t5516/t5601: be less strict about the number of credential warnings
scalar reconfigure -a: remove stale `scalar.repo` entries
ci: use a newer `github-script` version
tests(scalar): tighten the stale `scalar.repo` test some
John Cai (3):
tmp-objdir: skip clean up when handling a signal
fsck: remove the unused BAD_TAG_OBJECT
fsck: document msg-id
Jonathan Tan (4):
promisor-remote: remove a return value
promisor-remote: die upon failing fetch
negotiator/skipping: avoid stack overflow
Doc: document push.recurseSubmodules=only
Julia Ramer (1):
embargoed releases: also describe the git-security list and the process
Junio C Hamano (26):
environ: document GIT_SSL_NO_VERIFY
environ: explain Boolean environment variables
environ: GIT_FLUSH should be made a usual Boolean
environ: simplify description of GIT_INDEX_FILE
environ: GIT_INDEX_VERSION affects not just a new repository
branch: do not fail a no-op --edit-desc
SubmittingPatches: use usual capitalization in the log message body
Start 2.39 cycle
symbolic-ref: teach "--[no-]recurse" option
The (real) first batch for 2.39
The second batch
The third batch
The fourth batch
ci: add address and undefined sanitizer tasks
ci: use DC_SHA1=YesPlease on osx-clang job for CI
The fifth batch
diff: leave NEEDWORK notes in show_stats() function
fsck: remove the unused MISSING_TREE_OBJECT
Documentation: add lint-fsck-msgids
Downmerge a handful of topics for 2.38.2
The sixth batch
Downmerge a bit more for 2.38.2
The seventh batch
The eighth batch
adjust_shared_perm(): leave g+s alone when the group does not matter
Git 2.39-rc0
Kevin Backhouse (1):
alias.c: reject too-long cmdline strings in split_cmdline()
Kousik Sanagavarapu (1):
repository-version.txt: partialClone casing change
M Hickford (4):
Documentation/gitcredentials.txt: mention password alternatives
Documentation: increase example cache timeout to 1 hour
docs: clarify that credential discards unrecognised attributes
Docs: describe how a credential-generating helper works
Martin Ågren (1):
test-lib-functions: drop redundant diagnostic print
Matthew John Cheetham (3):
wincred: ignore unknown lines (do not die)
netrc: ignore unknown lines (do not die)
osxkeychain: clarify that we ignore unknown lines
Michael J Gruber (1):
notes: avoid empty line in template
Michael McClimon (1):
Git.pm: add semicolon after catch statement
Noah Betzen (1):
mergetool.txt: typofix 'overwriten' -> 'overwritten'
Nsengiyumva Wilberforce (1):
t1002: modernize outdated conditional
Patrick Steinhardt (7):
refs: fix memory leak when parsing hideRefs config
refs: get rid of global list of hidden refs
revision: move together exclusion-related functions
revision: introduce struct to handle exclusions
revision: add new parameter to exclude hidden refs
rev-parse: add `--exclude-hidden=` option
receive-pack: only use visible refs for connectivity check
Philip Oakley (4):
doc: use "commit-graph" hyphenation consistently
doc: use 'object database' not ODB or abbreviation
glossary: add "commit graph" description
glossary: add reachability bitmap description
Philippe Blain (9):
test-lib-functions: mark 'test_commit' variables as 'local'
subtree: use 'git rev-parse --verify [--quiet]' for better error messages
subtree: add 'die_incompatible_opt' function to reduce duplication
subtree: prefix die messages with 'fatal'
subtree: define a variable before its first use in 'find_latest_squash'
subtree: use named variables instead of "$@" in cmd_pull
subtree: process 'git-subtree-split' trailer in separate function
subtree: fix squash merging after annotated tag was squashed merged
subtree: fix split after annotated tag was squashed merged
Phillip Wood (23):
mailinfo -b: fix an out of bounds access
ssh signing: return an error when signature cannot be read
t3435: remove redundant test case
t3416: tighten two tests
t3416: set $EDITOR in subshell
rebase: be stricter when reading state files containing oids
rebase: store orig_head as a commit
rebase: rename merge_base to branch_base
rebase: factor out branch_base calculation
rebase --keep-base: imply --reapply-cherry-picks
rebase --keep-base: imply --no-fork-point
rebase --apply: remove duplicated code
t3406: rework rebase reflog tests
rebase --merge: fix reflog when continuing
rebase --merge: fix reflog message after skipping
rebase --apply: respect GIT_REFLOG_ACTION
rebase --apply: make reflog messages match rebase --merge
rebase --abort: improve reflog message
rebase: cleanup action handling
sequencer: stop exporting GIT_REFLOG_ACTION
rebase: stop exporting GIT_REFLOG_ACTION
sequencer: unify label lookup
sequencer: tighten label lookups
René Scharfe (20):
revision: use strtol_i() for exclude_parent
revisions.txt: unspecify order of resolved parts of ^!
diff: support ^! for merges
gc: simplify maintenance_task_pack_refs()
t/lib-httpd: pass LANG and LC_ALL to Apache
bisect--helper: plug strvec leak
archive: deduplicate verbose printing
submodule: use strvec_pushf() for --super-prefix
run-command: fix return value comment
am: simplify building "show" argument list
bisect: simplify building "checkout" argument list
bisect--helper: factor out do_bisect_run()
sequencer: simplify building argument list in do_exec()
use child_process member "args" instead of string array variable
use child_process members "args" and "env" directly
replace and remove run_command_v_opt_cd_env()
replace and remove run_command_v_opt_tr2()
replace and remove run_command_v_opt_cd_env_tr2()
replace and remove run_command_v_opt()
archive-tar: report filter start error only once
Ronan Pigott (2):
for-each-repo: interpolate repo path arguments
maintenance: add option to register in a specific config
Rubén Justo (5):
ref-filter.c: fix a leak in get_head_description
branch: description for non-existent branch errors
branch: support for shortcuts like @{-1}, completed
branch: error copying or renaming a detached HEAD
branch: error code with --edit-description
SZEDER Gábor (1):
Documentation/build-docdep.perl: generate sorted output
Sergey Organov (3):
diff-merges: cleanup func_by_opt()
diff-merges: cleanup set_diff_merges()
diff-merges: clarify log.diffMerges documentation
Shaoxuan Yuan (1):
builtin/grep.c: integrate with sparse index
Sotir Danailov (1):
docs: git-send-email: difference between ssl and tls smtp-encryption
Taylor Blau (64):
Documentation/git-multi-pack-index.txt: fix typo
Documentation/git-multi-pack-index.txt: clarify expire behavior
midx.c: prevent `expire` from removing the cruft pack
midx.c: avoid cruft packs with `repack --batch-size=0`
midx.c: replace `xcalloc()` with `CALLOC_ARRAY()`
midx.c: remove unnecessary loop condition
midx.c: avoid cruft packs with non-zero `repack --batch-size`
builtin/clone.c: disallow `--local` clones with symlinks
t/lib-submodule-update.sh: allow local submodules
t/t1NNN: allow local submodules
t/2NNNN: allow local submodules
t/t3NNN: allow local submodules
t/t4NNN: allow local submodules
t/t5NNN: allow local submodules
t/t6NNN: allow local submodules
t/t7NNN: allow local submodules
t/t9NNN: allow local submodules
transport: make `protocol.file.allow` be "user" by default
t1092: prepare for changing protocol.file.allow
t2080: prepare for changing protocol.file.allow
t1092: prepare for changing protocol.file.allow
t2080: prepare for changing protocol.file.allow
t3207: prepare for changing protocol.file.allow
t5516: prepare for changing protocol.file.allow
t5537: prepare for changing protocol.file.allow
t7814: prepare for changing protocol.file.allow
t3206: prepare for changing protocol.file.allow
t5537: prepare for changing protocol.file.allow
Git 2.30.6
Git 2.31.5
Git 2.32.4
Git 2.33.5
Git 2.34.5
Git 2.35.5
Git 2.36.3
t7527: prepare for changing protocol.file.allow
Git 2.37.4
Git 2.38.1
midx.c: fix whitespace typo
midx.c: consider annotated tags during bitmap selection
midx.c: instrument MIDX and bitmap generation with trace2 regions
pack-bitmap-write.c: instrument number of reused bitmaps
builtin/repack.c: remove redundant pack-based bitmaps
repack: don't remove .keep packs with `--pack-kept-objects`
builtin/repack.c: pass "out" to `prepare_pack_objects`
builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
builtin/repack.c: write cruft packs to arbitrary locations
builtin/repack.c: implement `--expire-to` for storing pruned objects
shortlog: make trailer insertion a noop when appropriate
shortlog: extract `--group` fragment for translation
shortlog: support arbitrary commit format `--group`s
shortlog: extract `shortlog_finish_setup()`
shortlog: implement `--group=author` in terms of `--group=<format>`
shortlog: implement `--group=committer` in terms of `--group=<format>`
apply: reject patches larger than ~1 GiB
Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
The ninth batch
Documentation: build redo-jch.sh from master..jch
Documentation: build redo-seen.sh from jch..seen
The tenth batch
The eleventh batch
The twelfth batch
builtin/gc.c: fix use-after-free in maintenance_unregister()
The thirteenth batch
Torsten Bögershausen (1):
diff.c: use utf8_strwidth() to count display width
Victoria Dye (7):
read-cache: avoid misaligned reads in index v4
rebase --update-refs: avoid unintended ref deletion
cache-tree: add perf test comparing update and prime
unpack-trees: add 'skip_cache_tree_update' option
reset: use 'skip_cache_tree_update' option
read-tree: use 'skip_cache_tree_update' option
rebase: use 'skip_cache_tree_update' option
Vincent Bernat (1):
ls-files: fix --ignored and --killed flags in synopsis
Vlad-Stefan Harbuz (1):
Documentation: fix typo
srz_zumix (1):
fsmonitor--daemon: on macOS support symlink
Ævar Arnfjörð Bjarmason (100):
test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK
CodingGuidelines: update for C99
CodingGuidelines: mention dynamic C99 initializer elements
CodingGuidelines: allow declaring variables in for loops
CodingGuidelines: mention C99 features we can't use
grep.c: remove "extended" in favor of "pattern_expression", fix segfault
CodingGuidelines: recommend against unportable C99 struct syntax
bundle-uri: create "key=value" line parsing
bundle-uri: unit test "key=value" parsing
run-command test helper: use "else if" pattern
run-command API: have "run_processes_parallel{,_tr2}()" return void
run-command tests: use "return", not "exit"
run-command API: make "n" parameter a "size_t"
run-command API: don't fall back on online_cpus()
run-command.c: use designated init for pp_init(), add "const"
run-command API: have run_process_parallel() take an "opts" struct
run-command API: move *_tr2() users to "run_processes_parallel()"
run-command.c: make "struct parallel_processes" const if possible
run-command.c: don't copy *_fn to "struct parallel_processes"
run-command.c: don't copy "ungroup" to "struct parallel_processes"
run-command.c: don't copy "data" to "struct parallel_processes"
run-command.c: use "opts->processes", not "pp->max_processes"
run-command.c: pass "opts" further down, and use "opts->processes"
run-command.c: remove "max_processes", add "const" to signal() handler
tests: assert *.txt SYNOPSIS and -h output
CodingGuidelines: update and clarify command-line conventions
builtin/bundle.c: indent with tabs
bundle: define subcommand -h in terms of command -h
doc SYNOPSIS: don't use ' for subcommands
doc SYNOPSIS: consistently use ' for commands
built-ins: consistently add "\n" between "usage" and options
doc txt & -h consistency: word-wrap
doc txt & -h consistency: fix incorrect alternates syntax
doc txt & -h consistency: add "-z" to cat-file "-h"
doc txt & -h consistency: balance unbalanced "[" and "]"
doc txt & -h consistency: correct padding around "[]()"
stash doc SYNOPSIS & -h: correct padding around "[]()"
doc txt & -h consistency: use "<options>", not "<options>..."
doc SYNOPSIS & -h: use "-" to separate words in labels, not "_"
doc txt & -h consistency: fix mismatching labels
doc txt & -h consistency: add or fix optional "--" syntax
doc txt & -h consistency: make output order consistent
doc txt & -h consistency: add missing options and labels
doc txt & -h consistency: make "rerere" consistent
doc txt & -h consistency: make "read-tree" consistent
doc txt & -h consistency: make "bundle" consistent
doc txt & -h consistency: use "git foo" form, not "git-foo"
doc txt & -h consistency: add missing options
doc txt & -h consistency: make "stash" consistent
doc txt & -h consistency: make "annotate" consistent
doc txt & -h consistency: use "[<label>...]" for "zero or more"
doc txt & -h consistency: make "diff-tree" consistent
doc txt & -h consistency: make "commit" consistent
reflog doc: list real subcommands up-front
worktree: define subcommand -h in terms of command -h
doc txt & -h consistency: make "worktree" consistent
tests: start asserting that *.txt SYNOPSIS matches -h output
tests: assert consistent whitespace in -h output
fsmonitor OSX: compile with DC_SHA1=YesPlease
merge: remove always-the-same "verbose" arguments
hook tests: fix redirection logic error in 96e7225b310
submodule tests: reset "trace.out" between "grep" invocations
run-command tests: test stdout of run_command_parallel()
Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
cocci rules: remove unused "F" metavariable from pending rule
Makefile: add ability to TAB-complete cocci *.patch rules
Makefile: have "coccicheck" re-run if flags change
Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
cocci: split off include-less "tests" from SPATCH_FLAGS
cocci: split off "--all-includes" from SPATCH_FLAGS
cocci: make "coccicheck" rule incremental
cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
Makefile: copy contrib/coccinelle/*.cocci to build/
cocci rules: remove <id>'s from rules that don't need them
cocci: run against a generated ALL.cocci
spatchcache: add a ccache-alike for "spatch"
Makefile: always (re)set DC_SHA1 on fallback
INSTALL: remove discussion of SHA-1 backends
Makefile: correct DC_SHA1 documentation
Makefile: create and use sections for "define" flag listing
Makefile: rephrase the discussion of *_SHA1 knobs
Makefile: document default SHA-256 backend
Makefile: document SHA-1 and SHA-256 default and selection order
Makefile & test-tool: replace "DC_SHA1" variable with a "define"
Makefile: document default SHA-1 backend on OSX
Makefile: discuss SHAttered in *_SHA{1,256} discussion
submodule--helper: move "config" to a test-tool
submodule tests: add tests for top-level flag output
submodule--helper: fix a memory leak in "status"
submodule tests: test for a "foreach" blind-spot
submodule.c: refactor recursive block out of absorb function
submodule API & "absorbgitdirs": remove "----recursive" option
submodule--helper: remove --prefix from "absorbgitdirs"
submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
submodule--helper: use OPT_SUBCOMMAND() API
revisions API: extend the nascent REV_INFO_INIT macro
t7610: fix flaky timeout issue, don't clone from example.com
Makefile: don't create a ".build/.build/" for cocci, fix output
maintenance --unregister: fix uninit'd data use & -Wdeclaration-after-statement
t7610: use "file:///dev/null", not "/dev/null", fixes MinGW
Đoàn Trần Công Danh (8):
CodingGuidelines: allow grep -E
t: remove \{m,n\} from BRE grep usage
t: convert egrep usage to "grep -E"
t: convert fgrep usage to "grep -F"
Makefile: clarify runtime relative gitexecdir
bisect--helper: remove unused options
bisect--helper: move all subcommands into their own functions
bisect--helper: parse subcommand with OPT_SUBCOMMAND
^ permalink raw reply [relevance 1%]
* What's cooking in git.git (Nov 2022, #03; Mon, 14)
@ 2022-11-15 4:50 1% Taylor Blau
0 siblings, 0 replies; 200+ results
From: Taylor Blau @ 2022-11-15 4:50 UTC (permalink / raw)
To: git
Here are the topics that have been cooking in my tree. Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a future
release). Commits prefixed with '-' are only in 'seen', and aren't
considered "accepted" at all. A topic without enough support may be
discarded after a long period of no activity.
There are still a large-ish number of topics in 'seen' that are
waiting for review. Otherwise, the remaining topics are graduating at
a reasonable pace, and the queue for 'next' has returned to a normal
level.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
https://github.com/git/git/
The following mirrors are currently out-of-date while the usual
maintainer is offline.
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/ttaylorr/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are typically published in these repositories
for convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
...but these and the release tarballs below are similarly out-of-date:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/rev-info-init (2022-11-08) 1 commit
(merged to 'next' on 2022-11-08 at 909ad9ed3a)
+ revisions API: extend the nascent REV_INFO_INIT macro
Progress on being able to initialize a rev_info struct with a macro.
source: <patch-1.1-c3afcd69ddb-20221108T140134Z-avarab@gmail.com>
* al/trace2-clearing-skip-worktree (2022-11-04) 2 commits
(merged to 'next' on 2022-11-08 at 567aeb8d83)
+ index: raise a bug if the index is materialised more than once
+ index: add trace2 region for clear skip worktree
Add trace2 counters to the region to clear skip worktree bits in a
sparse checkout.
source: <pull.1368.v4.git.git.1667516701.gitgitgadget@gmail.com>
* do/modernize-t7001 (2022-11-04) 1 commit
(merged to 'next' on 2022-11-08 at dfc9c80e73)
+ t7001-mv.sh: modernizing test script using functions
Modernize test script to avoid "test -f" and friends.
source: <pull.1372.v3.git.git.1667574352244.gitgitgadget@gmail.com>
* js/ci-set-output (2022-11-08) 1 commit
(merged to 'next' on 2022-11-08 at 553062428c)
+ ci: use a newer `github-script` version
Update the actions/github-script dependency in CI to avoid a
deprecation warning.
source: <pull.1387.git.1667902408921.gitgitgadget@gmail.com>
* mh/password-can-be-pat (2022-11-08) 1 commit
(merged to 'next' on 2022-11-08 at 3135ade2a6)
+ Documentation/gitcredentials.txt: mention password alternatives
Documentation update to git-credential(1).
source: <pull.1396.v3.git.1667912487608.gitgitgadget@gmail.com>
--------------------------------------------------
[New Topics]
* ab/remove--super-prefix (2022-11-14) 12 commits
- fetch: rename "--submodule-prefix" to "--super-prefix"
- read-tree: add "--super-prefix" option, eliminate global
- submodule tests: test "git branch -t" output and stderr
- submodule--helper: convert "{update,clone}" to their own "--super-prefix"
- submodule--helper: convert "status" to its own "--super-prefix"
- submodule--helper: convert "sync" to its own "--super-prefix"
- submodule--helper: convert "foreach" to its own "--super-prefix"
- submodule--helper: "deinit" has never used "--super-prefix"
- submodule--helper: don't use global --super-prefix in "absorbgitdirs"
- read-tree + fetch tests: test failing "--super-prefix" interaction
- Merge branch 'ab/submodule-no-abspath' into ab/remove--super-prefix
- Merge branch 'ab/submodule-helper-prep-only' into ab/remove--super-prefix
(this branch uses ab/submodule-helper-prep-only and ab/submodule-no-abspath.)
Remove the top-level `--super-prefix` option.
Expecting a reroll?
source: <cover-v2-00.10-00000000000-20221114T100803Z-avarab@gmail.com>
* ab/submodule-no-abspath (2022-11-09) 1 commit
- submodule--helper absorbgitdirs: no abspaths in "Migrating git..."
(this branch is used by ab/remove--super-prefix.)
Remove an absolute path in the "Migrating git directory" message.
Will merge to 'next'.
source: <patch-1.1-34b54fdd9bb-20221109T020347Z-avarab@gmail.com>
* ab/t7610-timeout (2022-11-09) 1 commit
(merged to 'next' on 2022-11-14 at 82a4abdb1d)
+ t7610: fix flaky timeout issue, don't clone from example.com
Fix a source of flakiness in CI when compiling with SANITIZE=leak.
Will cook in 'next'.
source: <patch-1.1-83eca7b5a7c-20221105T115420Z-avarab@gmail.com>
* es/chainlint-lineno (2022-11-11) 4 commits
- chainlint: prefix annotated test definition with line numbers
- chainlint: latch line numbers at which each token starts and ends
- chainlint: sidestep impoverished macOS "terminfo"
- Merge branch 'es/chainlint-output' into es/chainlint-lineno
(this branch uses es/chainlint-output.)
Teach chainlint.pl to annotate the original test definition instead
of the token stream.
Will merge to 'next'.
source: <pull.1413.v2.git.1668152094.gitgitgadget@gmail.com>
* ew/format-patch-mboxrd (2022-11-14) 1 commit
- format-patch: add --mboxrd alias for --pretty=mboxrd
Teach `format-patch` a convenient alias for `--pretty=mboxrd`.
Waiting for discussion to settle.
source: <20221114094114.18986-1-e@80x24.org>
* gc/redact-h2h3-headers (2022-11-14) 2 commits
(merged to 'next' on 2022-11-14 at 34157d24e9)
+ http: redact curl h2h3 headers in info
+ t: run t5551 tests with both HTTP and HTTP/2
Redact headers from cURL's h2h3 module in GIT_CURL_VERBOSE and
others.
Will merge to 'master'.
source: <pull.1377.v3.git.git.1668206106.gitgitgadget@gmail.com>
* jk/branch-delete-detached (2022-11-10) 1 commit
(merged to 'next' on 2022-11-14 at b185797ec0)
+ branch: gracefully handle '-d' on orphan HEAD
Fix a bug where `git branch -d` did not work on an orphaned HEAD.
source: <Y2H/1S3G+KeeEN/l@coredump.intra.peff.net>
* js/drop-mingw-test-cmp (2022-11-14) 2 commits
- tests(mingw): avoid very slow `mingw_test_cmp`
- t0021: use Windows-friendly `pwd`
Use `git diff --no-index` as a test_cmp on Windows.
Expecting a reroll.
source: <pull.1309.v4.git.1668434812.gitgitgadget@gmail.com>
* mc/switch-advice (2022-11-09) 1 commit
- po: use `switch` over `checkout` in error message
Use 'switch' instead of 'checkout' in an error message.
Waiting for review response.
source: <pull.1308.git.git.1668018620148.gitgitgadget@gmail.com>
* mh/credential-unrecognized-attrs (2022-11-12) 1 commit
(merged to 'next' on 2022-11-14 at 8170443d0a)
+ docs: clarify that credential discards unrecognised attributes
Docfix.
Will merge to 'master'.
source: <pull.1393.git.1666598268697.gitgitgadget@gmail.com>
* mh/gitcredentials-generate (2022-11-14) 1 commit
- Docs: describe how a credential-generating helper works
Doc update.
Waiting for review.
source: <pull.1379.git.git.1668217470500.gitgitgadget@gmail.com>
* mh/increase-credential-cache-timeout (2022-11-09) 1 commit
(merged to 'next' on 2022-11-14 at afe54db0f1)
+ Documentation: increase example cache timeout to 1 hour
Update the credential-cache documentation to provide a more realistic
example.
Will merge to 'master'.
source: <pull.1412.v2.git.1668010273573.gitgitgadget@gmail.com>
* ms/sendemail-validate-headers (2022-11-11) 1 commit
- Expose header information to git-send-email's sendemail-validate hook
Expecting a reroll.
source: <20221111194223.644845-2-michael.strawbridge@amd.com>
* pw/strict-label-lookups (2022-11-10) 2 commits
(merged to 'next' on 2022-11-14 at 7db4398d23)
+ sequencer: tighten label lookups
+ sequencer: unify label lookup
Correct an error where `git rebase` would mistakenly use a branch or
tag named "refs/rewritten/xyz" when missing a rebase label.
Will cook in 'next'.
source: <pull.1414.git.1668098622.gitgitgadget@gmail.com>
* rs/multi-filter-args (2022-11-12) 3 commits
- list-objects-filter: remove OPT_PARSE_LIST_OBJECTS_FILTER_INIT()
- pack-object: simplify --filter handling
- pack-objects: fix handling of multiple --filter options
Fix a bug where `pack-objects` would not respect multiple `--filter`
arguments when invoked directly.
Expecting a reroll?
source: <c64e4fa5-62c2-2a93-a4ef-bd84407ea570@web.de>
* vd/skip-cache-tree-update (2022-11-10) 5 commits
(merged to 'next' on 2022-11-14 at 06b2da01ff)
+ rebase: use 'skip_cache_tree_update' option
+ read-tree: use 'skip_cache_tree_update' option
+ reset: use 'skip_cache_tree_update' option
+ unpack-trees: add 'skip_cache_tree_update' option
+ cache-tree: add perf test comparing update and prime
Avoid calling 'cache_tree_update()' when doing so would be redundant.
Will merge to 'master'.
source: <pull.1411.v3.git.1668107165.gitgitgadget@gmail.com>
--------------------------------------------------
[Stalled]
* cw/submodule-status-in-parallel (2022-11-08) 6 commits
- diff-lib: parallelize run_diff_files for submodules
- diff-lib: refactor match_stat_with_submodule
- submodule: move status parsing into function
- submodule: strbuf variable rename
- run-command: add duplicate_output_fn to run_processes_parallel_opts
- Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel
Allow the internal "diff-files" engine to run "how has this
submodule changed?" in parallel to speed up "git status".
Waiting for review.
source: <20221020232532.1128326-1-calvinwan@google.com>
* js/bisect-in-c (2022-08-30) 17 commits
. bisect: no longer try to clean up left-over `.git/head-name` files
. bisect: remove Cogito-related code
. Turn `git bisect` into a full built-in
. bisect: move even the command-line parsing to `bisect--helper`
. bisect--helper: make `state` optional
. bisect--helper: calling `bisect_state()` without an argument is a bug
. bisect: avoid double-quoting when printing the failed command
. bisect run: fix the error message
. bisect: verify that a bogus option won't try to start a bisection
. bisect--helper: migrate to OPT_SUBCOMMAND()
. bisect--helper: make the order consistently `argc, argv`
. bisect--helper: make `terms` an explicit singleton
. bisect--helper: simplify exit code computation
. bisect--helper: really retire `--bisect-autostart`
. bisect--helper: really retire --bisect-next-check
. bisect--helper: retire the --no-log option
. Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
Final bits of "git bisect.sh" have been rewritten in C.
Needs review.
cf. <xmqqv8pr8903.fsf@gitster.g>
source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>
* od/ci-use-checkout-v3-when-applicable (2022-10-10) 2 commits
. ci(main): linux32 uses actions/checkout@v2
. ci(main): upgrade actions/checkout to v3
Attempt to update GitHub CI to use actions/checkout@v3
Expecting a reroll.
Seems to break the CI completely.
source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>
* ed/fsmonitor-inotify (2022-10-14) 7 commits
. fsmonitor: update doc for Linux
. fsmonitor: test updates
. fsmonitor: enable fsmonitor for Linux
. fsmonitor: implement filesystem change listener for Linux
. fsmonitor: determine if filesystem is local or remote
. fsmonitor: prepare to share code between Mac OS and Linux
. Merge branch 'ed/fsmonitor-on-networked-macos' into ed/fsmonitor-inotify
Bundled fsmonitor for Linux using inotify API.
Needs review.
Occasional breakages of t7527.16?
source: <pull.1352.v2.git.git.1665783944.gitgitgadget@gmail.com>
* ag/merge-strategies-in-c (2022-08-10) 14 commits
. sequencer: use the "octopus" strategy without forking
. sequencer: use the "resolve" strategy without forking
. merge: use the "octopus" strategy without forking
. merge: use the "resolve" strategy without forking
. merge-octopus: rewrite in C
. merge-recursive: move better_branch_name() to merge.c
. merge-resolve: rewrite in C
. merge-one-file: rewrite in C
. update-index: move add_cacheinfo() to read-cache.c
. merge-index: add a new way to invoke `git-merge-one-file'
. merge-index: drop the index
. merge-index: libify merge_one_path() and merge_all()
. t6060: add tests for removed files
. t6060: modify multiple files to expose a possible issue with merge-index
An attempt to rewrite remaining merge strategies from shell to C.
Needs more work.
At the minimum, we should lose 11/14 and possibly 08/14.
cf. <xmqq7d36vfur.fsf@gitster.g>
source: <20220809185429.20098-1-alban.gruin@gmail.com>
* es/doc-creation-factor-fix (2022-07-28) 2 commits
. range-diff: clarify --creation-factor=<factor>
. format-patch: clarify --creation-factor=<factor>
Expecting a reroll by somebody more familiar with the logic
cf. <xmqqo7wfix7p.fsf@gitster.g>
source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
* cw/remote-object-info (2022-08-13) 7 commits
. SQUASH???
. cat-file: add remote-object-info to batch-command
. transport: add client support for object-info
. serve: advertise object-info feature
. protocol-caps: initialization bug fix
. fetch-pack: move fetch initialization
. fetch-pack: refactor packet writing
A client component to talk with the object-info endpoint.
Expecting a reroll.
Under SANITIZE=address, t1006-cat-file.sh finds a breakage.
cf. <20220728230210.2952731-1-calvinwan@google.com>
cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>
source: <20220728230210.2952731-1-calvinwan@google.com>
--------------------------------------------------
[Cooking]
* ab/various-leak-fixes (2022-11-08) 18 commits
- built-ins: use free() not UNLEAK() if trivial, rm dead code
- revert: fix parse_options_concat() leak
- cherry-pick: free "struct replay_opts" members
- rebase: don't leak on "--abort"
- connected.c: free the "struct packed_git"
- sequencer.c: fix "opts->strategy" leak in read_strategy_opts()
- ls-files: fix a --with-tree memory leak
- revision API: call graph_clear() in release_revisions()
- unpack-file: fix ancient leak in create_temp_file()
- built-ins & libs & helpers: add/move destructors, fix leaks
- dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache"
- read-cache.c: clear and free "sparse_checkout_patterns"
- commit: discard partial cache before (re-)reading it
- {reset,merge}: call discard_index() before returning
- tests: mark tests as passing with SANITIZE=leak
- Merge branch 'pw/rebase-no-reflog-action' into ab/various-leak-fixes
- rebase: stop exporting GIT_REFLOG_ACTION
- sequencer: stop exporting GIT_REFLOG_ACTION
Various leak fixes.
Will merge to 'next'.
source: <cover-v2-00.15-00000000000-20221108T172650Z-avarab@gmail.com>
* aw/complete-case-insensitive (2022-11-07) 2 commits
- completion: add case-insensitive match of pseudorefs
- completion: add optional ignore-case when matching refs
Introduce a case insensitive mode to the Bash completion helpers.
Waiting for review.
source: <pull.1374.git.git.1667669315.gitgitgadget@gmail.com>
* dd/bisect-helper-subcommand (2022-11-11) 3 commits
(merged to 'next' on 2022-11-14 at 066f19c4fe)
+ bisect--helper: parse subcommand with OPT_SUBCOMMAND
+ bisect--helper: move all subcommands into their own functions
+ bisect--helper: remove unused options
(this branch is used by dd/git-bisect-builtin.)
Fix a regression in the bisect-helper which mistakenly treats
arguments to the command given to 'git bisect run' as arguments to
the helper.
Will cook in 'next'.
source: <cover.1668097286.git.congdanhqx@gmail.com>
* dd/git-bisect-builtin (2022-11-11) 12 commits
(merged to 'next' on 2022-11-14 at fc304fb52f)
+ Turn `git bisect` into a full built-in
+ bisect--helper: log: allow arbitrary number of arguments
+ bisect--helper: handle states directly
+ bisect--helper: emit usage for "git bisect"
+ bisect test: test exit codes on bad usage
+ bisect--helper: identify as bisect when report error
+ bisect-run: verify_good: account for non-negative exit status
+ bisect run: keep some of the post-v2.30.0 output
+ bisect: fix output regressions in v2.30.0
+ bisect: refactor bisect_run() to match CodingGuidelines
+ bisect tests: test for v2.30.0 "bisect run" regressions
+ Merge branch 'dd/bisect-helper-subcommand' into dd/git-bisect-builtin
(this branch uses dd/bisect-helper-subcommand.)
`git bisect` becomes a builtin.
Will cook in 'next'.
source: <cover.1668097962.git.congdanhqx@gmail.com>
* ds/packed-refs-v2 (2022-11-07) 30 commits
- refs: skip hashing when writing packed-refs v2
- p1401: create performance test for ref operations
- ci: run GIT_TEST_PACKED_REFS_VERSION=2 in some builds
- t*: skip packed-refs v2 over http tests
- t3210: require packed-refs v1 for some tests
- t5502: add PACKED_REFS_V1 prerequisite
- t5312: allow packed-refs v2 format
- t1409: test with packed-refs v2
- packed-backend: create GIT_TEST_PACKED_REFS_VERSION
- packed-refs: write prefix chunks
- packed-refs: read optional prefix chunks
- packed-refs: read file format v2
- packed-refs: write file format version 2
- packed-backend: create shell of v2 writes
- config: add config values for packed-refs v2
- packed-backend: create abstraction for writing refs
- packed-backend: extract iterator/updates merge
- packed-backend: extract add_write_error()
- refs: extract packfile format to new file
- chunk-format: parse trailing table of contents
- chunk-format: allow trailing table of contents
- chunk-format: store chunk offset during write
- chunk-format: document trailing table of contents
- chunk-format: number of chunks is optional
- refs: allow loose files without packed-refs
- repository: wire ref extensions to ref backends
- config: fix multi-level bulleted list
- extensions: add refFormat extension
- read-cache: add index.computeHash config option
- hashfile: allow skipping the hash function
Waiting for review.
source: <pull.1408.git.1667846164.gitgitgadget@gmail.com>
* es/chainlint-output (2022-11-08) 4 commits
(merged to 'next' on 2022-11-14 at 9cd7d30183)
+ chainlint: annotate original test definition rather than token stream
+ chainlint: latch start/end position of each token
+ chainlint: tighten accuracy when consuming input stream
+ chainlint: add explanatory comments
(this branch is used by es/chainlint-lineno.)
Teach chainlint.pl to annotate the original test definition instead
of the token stream.
Will cook in 'next'.
source: <pull.1375.git.git.1667934510.gitgitgadget@gmail.com>
* ja/worktree-orphan (2022-11-10) 2 commits
- worktree add: add --orphan flag
- worktree add: Include -B in usage docs
'git worktree add' learned how to create a worktree based on an
orphaned branch with `--orphan`.
Waiting for review discussion to settle, but leaning negative.
source: <20221110233137.10414-1-jacobabel@nullpo.dev>
* js/remove-stale-scalar-repos (2022-11-11) 2 commits
(merged to 'next' on 2022-11-14 at e1c86051c4)
+ tests(scalar): tighten the stale `scalar.repo` test some
(merged to 'next' on 2022-11-08 at 6d598a3b80)
+ scalar reconfigure -a: remove stale `scalar.repo` entries
'scalar reconfigure -a' is taught to automatically remove
scalar.repo entires which no longer exist.
Will cook in 'next'.
source: <pull.1415.git.1668065327120.gitgitgadget@gmail.com>
* jt/submodule-on-demand (2022-11-14) 1 commit
- Doc: document push.recurseSubmodules=only
Push all submodules recursively with
'--recurse-submodules=on-demand'.
Expecting a reroll?
source: <20221114213713.2341945-1-jonathantanmy@google.com>
* pw/rebase-no-reflog-action (2022-11-09) 2 commits
(merged to 'next' on 2022-11-14 at 790dadc8d3)
+ rebase: stop exporting GIT_REFLOG_ACTION
+ sequencer: stop exporting GIT_REFLOG_ACTION
Avoid setting GIT_REFLOG_ACTION to improve readability of the
sequencer internals.
Expecting a (final?) reroll.
source: <31df037eafede799c2ef27df66c6da309b719b1b.1668003719.git.gitgitgadget@gmail.com>
* rp/maintenance-qol (2022-11-14) 2 commits
(merged to 'next' on 2022-11-14 at 17db40bf26)
+ maintenance: add option to register in a specific config
+ for-each-repo: interpolate repo path arguments
'git maintenance register' is taught to write configuration to an
arbitrary path, and 'git for-each-repo' is taught to expand tilde
characters in paths.
Will cook in 'next'.
source: <20221109190708.22725-1-ronan@rjp.ie>
* sa/cat-file-mailmap--batch-check (2022-11-14) 3 commits
- doc/cat-file: allow --use-mailmap for --batch options
- cat-file: add mailmap support to --batch-check option
- cat-file: add mailmap support to -s option
'cat-file' gains mailmap support for its '--batch-check' and '-s'
options.
Will merge to 'next'.
source: <20221113212830.92609-1-siddharthasthana31@gmail.com>
* sz/macos-fsmonitor-symlinks (2022-11-08) 1 commit
- fsmonitor--daemon: on macOS support symlink
Fix an issue where core.fsmonitor on macOS would not notice created
or modified symbolic links.
Waiting for review.
source: <pull.1406.git.1667885119570.gitgitgadget@gmail.com>
* tb/ci-concurrency (2022-11-08) 1 commit
- ci: avoid unnecessary builds
Avoid unnecessary builds in CI, with settings configured in
ci-config.
Waiting for review.
source: <ff172f1de982f6f79b598e4ac6d5b2964ca4a098.1667931937.git.me@ttaylorr.com>
* tl/notes--blankline (2022-11-09) 5 commits
- notes.c: introduce "--no-blank-line" option
- notes.c: provide tips when target and append note are both empty
- notes.c: drop unreachable code in 'append_edit()'
- notes.c: cleanup for "designated init" and "char ptr init"
- notes.c: cleanup 'strbuf_grow' call in 'append_edit'
'git notes append' was taught '--[no-]blank-line' to conditionally
add a LF between a new and existing note.
Expecting a reroll.
source: <cover.1667980450.git.dyroneteng@gmail.com>
* vd/update-refs-delete (2022-11-07) 1 commit
(merged to 'next' on 2022-11-08 at 2866156953)
+ rebase --update-refs: avoid unintended ref deletion
Will merge to 'master'.
source: <20221107174752.91186-1-vdye@github.com>
* ab/submodule-helper-prep-only (2022-11-08) 9 commits
(merged to 'next' on 2022-11-08 at c0c4f4d1c3)
+ submodule--helper: use OPT_SUBCOMMAND() API
+ submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
+ submodule--helper: remove --prefix from "absorbgitdirs"
+ submodule API & "absorbgitdirs": remove "----recursive" option
+ submodule.c: refactor recursive block out of absorb function
+ submodule tests: test for a "foreach" blind-spot
+ submodule--helper: fix a memory leak in "status"
+ submodule tests: add tests for top-level flag output
+ submodule--helper: move "config" to a test-tool
(this branch is used by ab/remove--super-prefix.)
Preparation to remove git-submodule.sh and replace it with a builtin.
Will cook in 'next'.
source: <cover-v2-0.9-00000000000-20221108T140501Z-avarab@gmail.com>
* ds/bundle-uri-4 (2022-10-31) 9 commits
- clone: unbundle the advertised bundles
- bundle-uri: download bundles from an advertised list
- bundle-uri: allow relative URLs in bundle lists
- strbuf: reintroduce strbuf_parent_directory()
- bundle-uri client: add boolean transfer.bundleURI setting
- bundle-uri: serve bundle.* keys from config
- bundle-uri client: add helper for testing server
- bundle-uri client: add minimal NOOP client
- protocol v2: add server-side "bundle-uri" skeleton
Bundle URIs part 4.
Waiting for review.
source: <pull.1400.git.1667264854.gitgitgadget@gmail.com>
* sg/plug-line-log-leaks (2022-11-02) 3 commits
- diff.c: use diff_free_queue()
- line-log: free the diff queues' arrays when processing merge commits
- line-log: free diff queue when processing non-merge commits
A handful of leaks in the line-log machinery have been plugged.
Expecting a reroll.
source: <20221102220142.574890-1-szeder.dev@gmail.com>
* tb/howto-maintain-git-fixes (2022-10-31) 2 commits
- Documentation: build redo-seen.sh from jch..seen
- Documentation: build redo-jch.sh from master..jch
A pair of bugfixes to the Documentation/howto/maintain-git.txt guide.
Will merge to 'next'.
source: <cover.1667260044.git.me@ttaylorr.com>
* tl/pack-bitmap-absolute-paths (2022-11-14) 2 commits
(merged to 'next' on 2022-11-14 at 34eb0ea05a)
+ pack-bitmap.c: avoid exposing absolute paths
+ pack-bitmap.c: remove unnecessary "open_pack_index()" calls
The pack-bitmap machinery is taught to log the paths of redundant
bitmap(s) to trace2 instead of stderr.
Will merge to 'master'.
source: <cover.1668063122.git.dyroneteng@gmail.com>
* ab/cmake-nix-and-ci (2022-11-04) 14 commits
(merged to 'next' on 2022-11-08 at 6ef4e93b36)
+ CI: add a "linux-cmake-test" to run cmake & ctest on linux
+ cmake: copy over git-p4.py for t983[56] perforce test
+ cmake: only look for "sh" in "C:/Program Files" on Windows
+ cmake: increase test timeout on Windows only
+ cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults
+ Makefile + cmake: use environment, not GIT-BUILD-DIR
+ test-lib.sh: support a "GIT_TEST_BUILD_DIR"
+ cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh
+ cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable
+ cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4
+ cmake: don't copy chainlint.pl to build directory
+ cmake: update instructions for portable CMakeLists.txt
+ cmake: use "-S" and "-B" to specify source and build directories
+ cmake: don't invoke msgfmt with --statistics
Fix assorted issues with CTest on *nix machines.
Will cook in 'next'.
source: <cover-v4-00.14-00000000000-20221103T160255Z-avarab@gmail.com>
* ab/make-bin-wrappers (2022-10-31) 4 commits
- Makefile: simplify $(test_bindir_programs) rule by splitting it up
- Makefile: rename "test_bindir_programs" variable, pre-declare
- Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier
- Makefile: factor sed-powered '#!/bin/sh' munging into a variable
Resolve issues with the bin-wrappers/% rules where "make
bin-wrappers/git" would generate the script but not "git" itself.
Waiting for review discussion to settle, but leaning negative.
source: <cover-v3-0.4-00000000000-20221031T222249Z-avarab@gmail.com>
* ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
(merged to 'next' on 2022-11-03 at 0f01b25561)
+ run-command tests: test stdout of run_command_parallel()
+ submodule tests: reset "trace.out" between "grep" invocations
+ hook tests: fix redirection logic error in 96e7225b310
Various test updates.
Will merge to 'master'?
source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
* kz/merge-tree-merge-base (2022-11-12) 2 commits
(merged to 'next' on 2022-11-14 at 76d48ae21f)
+ merge-tree.c: allow specifying the merge-base when --stdin is passed
+ merge-tree.c: add --merge-base=<commit> option
"merge-tree" learns a new `--merge-base` option.
Will cook in 'next'.
source: <pull.1397.v7.git.1668210314.gitgitgadget@gmail.com>
* po/pretty-hard-trunc (2022-11-13) 1 commit
- pretty-formats: add hard truncation, without ellipsis, options
Add a new pretty format which truncates without ellipsis.
Waiting for review.
source: <20221112143616.1429-1-philipoakley@iee.email>
* rr/long-status-advice (2022-11-10) 1 commit
- status: long status advice adapted to recent capabilities
The advice message emitted by a slow "status" run is amended to
mention fsmonitor.
Waiting for reviewer feedback on the updated round.
source: <pull.1384.v5.git.1668110679098.gitgitgadget@gmail.com>
* ab/config-multi-and-nonbool (2022-11-02) 9 commits
. for-each-repo: with bad config, don't conflate <path> and <cmd>
. config API: add "string" version of *_value_multi(), fix segfaults
. config API users: test for *_get_value_multi() segfaults
. for-each-repo: error on bad --config
. config API: have *_multi() return an "int" and take a "dest"
. versioncmp.c: refactor config reading next commit
. config tests: add "NULL" tests for *_get_value_multi()
. config tests: cover blind spots in git_die_config() tests
. for-each-repo tests: test bad --config keys
A mixed bag of config API updates.
Waiting for review.
cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
source: <cover-v2-0.9-00000000000-20221101T225822Z-avarab@gmail.com>
* ab/sha-makefile-doc (2022-11-07) 10 commits
(merged to 'next' on 2022-11-08 at 6d3068d7cd)
+ Makefile: discuss SHAttered in *_SHA{1,256} discussion
+ Makefile: document default SHA-1 backend on OSX
+ Makefile & test-tool: replace "DC_SHA1" variable with a "define"
+ Makefile: document SHA-1 and SHA-256 default and selection order
+ Makefile: document default SHA-256 backend
+ Makefile: rephrase the discussion of *_SHA1 knobs
+ Makefile: create and use sections for "define" flag listing
+ Makefile: correct DC_SHA1 documentation
+ INSTALL: remove discussion of SHA-1 backends
+ Makefile: always (re)set DC_SHA1 on fallback
Makefile comments updates and reordering to clarify knobs used to
choose SHA implementations.
Will merge to 'master'?
source: <cover-v5-00.10-00000000000-20221107T211736Z-avarab@gmail.com>
* ps/receive-use-only-advertised (2022-11-11) 7 commits
- receive-pack: only use visible refs for connectivity check
- rev-parse: add `--exclude-hidden=` option
- revision: add new parameter to exclude hidden refs
- revision: introduce struct to handle exclusions
- revision: move together exclusion-related functions
- refs: get rid of global list of hidden refs
- refs: fix memory leak when parsing hideRefs config
"git receive-pack" used to use all the local refs as the boundary
for checking connectivity of the data "git push" sent, but now it
uses only the refs that it advertised to the pusher. In a
repository with the .hideRefs configuration, this reduces the
resource needed to perform the check, and also forces the pusher to
prove they have all objects that are necessary to complete the
history on top of only the history available to them.
Expecting a (final?) reroll.
cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com>
cf. <xmqqr0yrizqm.fsf@gitster.g>
source: <cover.1668149149.git.ps@pks.im>
* gc/submodule-clone-update-with-branches (2022-10-30) 8 commits
- clone, submodule update: create and check out branches
- submodule--helper: remove update_data.suboid
- submodule update: refactor update targets
- submodule: return target of submodule symref
- t5617: drop references to remote-tracking branches
- submodule--helper clone: create named branch
- repo-settings: add submodule_propagate_branches
- clone: teach --detach option
"git clone --recurse-submodules" and "git submodule update" learns
to honor the "propagete branches" option.
Waiting for review on the updated round.
source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com>
* pw/config-int-parse-fixes (2022-11-09) 3 commits
- git_parse_signed(): avoid integer overflow
- config: require at least one digit when parsing numbers
- git_parse_unsigned: reject negative values
Assorted fixes of parsing end-user input as integers.
Will merge to 'next'?
cf. <Y1L+Qv+cs1bjqjK9@coredump.intra.peff.net>
source: <pull.1389.v2.git.1668003388.gitgitgadget@gmail.com>
* tb/repack-expire-to (2022-10-24) 4 commits
(merged to 'next' on 2022-11-08 at 496ce3c62d)
+ builtin/repack.c: implement `--expire-to` for storing pruned objects
+ builtin/repack.c: write cruft packs to arbitrary locations
+ builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
+ builtin/repack.c: pass "out" to `prepare_pack_objects`
"git repack" learns to send cruft objects out of the way into
packfiles outside the repository.
Will merge to 'master'.
source: <cover.1666636974.git.me@ttaylorr.com>
* cc/filtered-repack (2022-10-25) 2 commits
- repack: add --filter=<filter-spec> option
- pack-objects: allow --filter without --stdout
"git repack" learns to discard objects that ought to be retrievable
again from the promissor remote.
Needs review.
source: <20221025122856.20204-1-christian.couder@gmail.com>
* mc/credential-helper-auth-headers (2022-11-02) 11 commits
- t5556: add HTTP authentication tests
- test-http-server: add simple authentication
- test-http-server: pass Git requests to http-backend
- test-http-server: add HTTP request parsing
- test-http-server: add HTTP error response function
- test-http-server: add stub HTTP server test helper
- http: set specific auth scheme depending on credential
- http: move proactive auth to first slot creation
- http: store all request headers on active_request_slot
- credential: add WWW-Authenticate header to cred requests
- http: read HTTP WWW-Authenticate response headers
Extending credential helper protocol.
Needs review.
source: <pull.1352.v3.git.1667426969.gitgitgadget@gmail.com>
* hl/archive-recursive (2022-10-19) 10 commits
. fixup! archive: add tests for git archive --recurse-submodules
. archive: add tests for git archive --recurse-submodules
. archive: add --recurse-submodules to git-archive command
. archive: remove global repository from archive_args
. archive: pass repo objects to write_archive handlers
. tree: add repository parameter to read_tree_fn_t
. tree: handle submodule case for read_tree_at properly
. tree: increase test coverage for tree.c
. tree: update cases to use repo_ tree methods
. tree: do not use the_repository for tree traversal methods.
"git archive" has been taught "--recurse-submodules" option to
create a tarball that includes contents from submodules.
Expecting a reroll.
Seems to break win+VS test(8).
cf. https://github.com/git/git/actions/runs/3293333066 whose only
difference from https://github.com/git/git/actions/runs/3293553109
is the inclusion of this topic.
source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
* en/sparse-checkout-design (2022-11-07) 1 commit
(merged to 'next' on 2022-11-08 at 42e164b490)
+ sparse-checkout.txt: new document with sparse-checkout directions
Design doc.
Needs review.
source: <pull.1367.v4.git.1667714666810.gitgitgadget@gmail.com>
* pw/test-todo (2022-10-06) 3 commits
. test_todo: allow [verbose] test as the command
. test_todo: allow [!] grep as the command
. tests: add test_todo() to mark known breakages
RFC for test framework improvement.
Needs review.
source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
* ab/coccicheck-incremental (2022-11-11) 14 commits
(merged to 'next' on 2022-11-14 at 8a70133571)
+ Makefile: don't create a ".build/.build/" for cocci, fix output
(merged to 'next' on 2022-11-08 at 0f3c55d4c2)
+ spatchcache: add a ccache-alike for "spatch"
+ cocci: run against a generated ALL.cocci
+ cocci rules: remove <id>'s from rules that don't need them
+ Makefile: copy contrib/coccinelle/*.cocci to build/
+ cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
+ cocci: make "coccicheck" rule incremental
+ cocci: split off "--all-includes" from SPATCH_FLAGS
+ cocci: split off include-less "tests" from SPATCH_FLAGS
+ Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
+ Makefile: have "coccicheck" re-run if flags change
+ Makefile: add ability to TAB-complete cocci *.patch rules
+ cocci rules: remove unused "F" metavariable from pending rule
+ Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
"make coccicheck" is time consuming. It has been made to run more
incrementally.
Will cook in 'next'.
source: <221109.86tu38p1x8.gmgdl@evledraar.gmail.com>
source: <cover-v5-00.13-00000000000-20221101T222616Z-avarab@gmail.com>
^ permalink raw reply [relevance 1%]
* What's cooking in git.git (Nov 2022, #02; Tue, 8)
@ 2022-11-08 23:12 1% Taylor Blau
0 siblings, 0 replies; 200+ results
From: Taylor Blau @ 2022-11-08 23:12 UTC (permalink / raw)
To: git
Here are the topics that have been cooking in my tree. Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a future
release). Commits prefixed with '-' are only in 'seen', and aren't
considered "accepted" at all. A topic without enough support may be
discarded after a long period of no activity.
A handful of topics are still sitting in 'seen' waiting review. They
are marked accordingly below. Otherwise, a number of topics have
graduated, and the slate for 'next' is relatively small. Hopefully
some additional review effort will mean that we can graduate some of
those topics to 'next' in the next round of integration.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
https://github.com/git/git/
The following mirrors are currently out-of-date while the usual
maintainer is offline.
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/ttaylorr/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are typically published in these repositories
for convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
...but these and the release tarballs below are similarly out-of-date:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* es/mark-gc-cruft-as-experimental (2022-10-26) 2 commits
(merged to 'next' on 2022-11-03 at 4079e1b06b)
+ config: let feature.experimental imply gc.cruftPacks=true
+ gc: add tests for --cruft and friends
Enable gc.cruftpacks by default for those who opt into
feature.experimental setting.
source: <cover.1666819953.git.me@ttaylorr.com>
* jc/set-gid-bit-less-aggressively (2022-10-28) 1 commit
(merged to 'next' on 2022-11-03 at 32bfd99ffd)
+ adjust_shared_perm(): leave g+s alone when the group does not matter
The adjust_shared_perm() helper function learned to refrain from
setting the "g+s" bit on directories when it is not necessary.
source: <xmqqr0yrhco6.fsf@gitster.g>
* jk/ref-filter-parsing-bugs (2022-11-02) 2 commits
(merged to 'next' on 2022-11-03 at 92c1a50548)
+ ref-filter: fix parsing of signatures with CRLF and no body
+ ref-filter: fix parsing of signatures without blank lines
Various tests exercising the transfer.credentialsInUrl configuration
are taught to avoid making requests which require resolving localhost
to reduce CI-flakiness.
source: <Y2IeqOT5Ao1Qa0Zl@coredump.intra.peff.net>
* ma/drop-redundant-diagnostic (2022-10-31) 1 commit
(merged to 'next' on 2022-11-03 at 196c5a337b)
+ test-lib-functions: drop redundant diagnostic print
A redundant diagnostic message is dropped from test_path_is_missing().
source: <20221031180048.5766-1-martin.agren@gmail.com>
* po/glossary-around-traversal (2022-10-30) 4 commits
(merged to 'next' on 2022-11-03 at 58b659f92b)
+ glossary: add reachability bitmap description
+ glossary: add "commit graph" description
+ doc: use 'object database' not ODB or abbreviation
+ doc: use "commit-graph" hyphenation consistently
The glossary entries for "commit-graph file" and "reachability
bitmap" have been added.
source: <20221029164112.2097-1-philipoakley@iee.email>
* rs/archive-filter-error-once (2022-10-30) 1 commit
(merged to 'next' on 2022-11-03 at c2d1004d96)
+ archive-tar: report filter start error only once
"git archive" mistakenly complained twice about a missing executable,
which has been corrected.
source: <c51b72e5-1c32-65e4-6faa-04693b623e2e@web.de>
* rs/no-more-run-command-v (2022-10-30) 12 commits
(merged to 'next' on 2022-11-03 at 27eb80811c)
+ replace and remove run_command_v_opt()
+ replace and remove run_command_v_opt_cd_env_tr2()
+ replace and remove run_command_v_opt_tr2()
+ replace and remove run_command_v_opt_cd_env()
+ use child_process members "args" and "env" directly
+ use child_process member "args" instead of string array variable
+ sequencer: simplify building argument list in do_exec()
+ bisect--helper: factor out do_bisect_run()
+ bisect: simplify building "checkout" argument list
+ am: simplify building "show" argument list
+ run-command: fix return value comment
+ merge: remove always-the-same "verbose" arguments
Simplify the run-command API.
source: <ea061164-b36b-485c-963f-8c13e813a47e@web.de>
* tb/howto-using-redo-script (2022-10-26) 1 commit
(merged to 'next' on 2022-11-03 at 521600fd56)
+ Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
(this branch is used by tb/howto-maintain-git-fixes.)
Doc update.
source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com>
--------------------------------------------------
[New Topics]
* ab/rev-info-init (2022-11-08) 1 commit
(merged to 'next' on 2022-11-08 at 909ad9ed3a)
+ revisions API: extend the nascent REV_INFO_INIT macro
Progress on being able to initialize a rev_info struct with a macro.
Will merge to 'master'.
source: <patch-1.1-c3afcd69ddb-20221108T140134Z-avarab@gmail.com>
* ab/various-leak-fixes (2022-11-08) 16 commits
- built-ins: use free() not UNLEAK() if trivial, rm dead code
- revert: fix parse_options_concat() leak
- cherry-pick: free "struct replay_opts" members
- rebase: don't leak on "--abort"
- connected.c: free the "struct packed_git"
- sequencer.c: fix "opts->strategy" leak in read_strategy_opts()
- ls-files: fix a --with-tree memory leak
- revision API: call graph_clear() in release_revisions()
- unpack-file: fix ancient leak in create_temp_file()
- built-ins & libs & helpers: add/move destructors, fix leaks
- dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache"
- read-cache.c: clear and free "sparse_checkout_patterns"
- commit: discard partial cache before (re-)reading it
- {reset,merge}: call discard_index() before returning
- tests: mark tests as passing with SANITIZE=leak
- Merge branch 'pw/rebase-no-reflog-action' into ab/various-leak-fixes
(this branch uses pw/rebase-no-reflog-action.)
Various leak fixes.
Will merge to 'next'.
source: <cover-v2-00.15-00000000000-20221108T172650Z-avarab@gmail.com>
* aw/complete-case-insensitive (2022-11-07) 2 commits
- completion: add case-insensitive match of pseudorefs
- completion: add optional ignore-case when matching refs
Introduce a case insensitive mode to the Bash completion helpers.
Waiting for review.
source: <pull.1374.git.git.1667669315.gitgitgadget@gmail.com>
* dd/bisect-helper-subcommand (2022-11-05) 3 commits
(merged to 'next' on 2022-11-08 at 3951bf0f12)
+ bisect--helper: parse subcommand with OPT_SUBCOMMAND
+ bisect--helper: move all subcommands into their own functions
+ bisect--helper: remove unused options
(this branch is used by dd/git-bisect-builtin.)
Fix a regression in the bisect-helper which mistakenly treats
arguments to the command given to 'git bisect run' as arguments to
the helper.
Will cook in 'next'.
source: <cover.1667667058.git.congdanhqx@gmail.com>
* dd/git-bisect-builtin (2022-11-07) 14 commits
- Turn `git bisect` into a full built-in
- bisect--helper: log: allow arbitrary number of arguments
- bisect--helper: remove subcommand state
- bisect--helper: make `state` optional
- bisect--helper: emit usage for "git bisect"
- bisect test: test exit codes on bad usage
- bisect--helper: pretend we're real bisect when report error
- bisect--helper: remove unused arguments from do_bisect_run
- bisect run: keep some of the post-v2.30.0 output
- bisect: fix output regressions in v2.30.0
- bisect--helper: pass arg[cv] down to do_bisect_run
- bisect: refactor bisect_run() to match CodingGuidelines
- bisect tests: test for v2.30.0 "bisect run" regressions
- Merge branch 'dd/bisect-helper-subcommand' into dd/git-bisect-builtin
(this branch uses dd/bisect-helper-subcommand.)
Expecting a (combined) reroll???
source: <cover-00.13-00000000000-20221104T132117Z-avarab@gmail.com>
* ds/packed-refs-v2 (2022-11-07) 30 commits
- refs: skip hashing when writing packed-refs v2
- p1401: create performance test for ref operations
- ci: run GIT_TEST_PACKED_REFS_VERSION=2 in some builds
- t*: skip packed-refs v2 over http tests
- t3210: require packed-refs v1 for some tests
- t5502: add PACKED_REFS_V1 prerequisite
- t5312: allow packed-refs v2 format
- t1409: test with packed-refs v2
- packed-backend: create GIT_TEST_PACKED_REFS_VERSION
- packed-refs: write prefix chunks
- packed-refs: read optional prefix chunks
- packed-refs: read file format v2
- packed-refs: write file format version 2
- packed-backend: create shell of v2 writes
- config: add config values for packed-refs v2
- packed-backend: create abstraction for writing refs
- packed-backend: extract iterator/updates merge
- packed-backend: extract add_write_error()
- refs: extract packfile format to new file
- chunk-format: parse trailing table of contents
- chunk-format: allow trailing table of contents
- chunk-format: store chunk offset during write
- chunk-format: document trailing table of contents
- chunk-format: number of chunks is optional
- refs: allow loose files without packed-refs
- repository: wire ref extensions to ref backends
- config: fix multi-level bulleted list
- extensions: add refFormat extension
- read-cache: add index.computeHash config option
- hashfile: allow skipping the hash function
Waiting for review.
source: <pull.1408.git.1667846164.gitgitgadget@gmail.com>
* es/chainlint-output (2022-11-08) 4 commits
- chainlint: annotate original test definition rather than token stream
- chainlint: latch start/end position of each token
- chainlint: tighten accuracy when consuming input stream
- chainlint: add explanatory comments
Teach chainlint.pl to annotate the original test definition instead
of the token stream.
Will merge to 'next'?
source: <pull.1375.git.git.1667934510.gitgitgadget@gmail.com>
* ja/worktree-orphan (2022-11-04) 2 commits
- worktree add: add --orphan flag
- worktree add: Include -B in usage docs
'git worktree add' learned how to create a worktree based on an
orphaned branch with `--orphan`.
source: <20221104213401.17393-1-jacobabel@nullpo.dev>
* js/ci-set-output (2022-11-08) 1 commit
(merged to 'next' on 2022-11-08 at 553062428c)
+ ci: use a newer `github-script` version
Update the actions/github-script dependency in CI to avoid a
deprecation warning.
Will merge to 'master'.
source: <pull.1387.git.1667902408921.gitgitgadget@gmail.com>
* js/remove-stale-scalar-repos (2022-11-07) 1 commit
(merged to 'next' on 2022-11-08 at 6d598a3b80)
+ scalar reconfigure -a: remove stale `scalar.repo` entries
'scalar reconfigure -a' is taught to automatically remove
scalar.repo entires which no longer exist.
Will cook in 'next'.
source: <pull.1407.git.1667845501422.gitgitgadget@gmail.com>
* jt/submodule-on-demand (2022-11-07) 1 commit
- submodule: explicitly specify on-demand upon push
Push all submodules recursively with
'--recurse-submodules=on-demand'.
Waiting for review.
source: <20221108002553.3836987-1-jonathantanmy@google.com>
* pw/rebase-no-reflog-action (2022-11-04) 2 commits
- rebase: stop exporting GIT_REFLOG_ACTION
- sequencer: stop exporting GIT_REFLOG_ACTION
(this branch is used by ab/various-leak-fixes.)
Avoid setting GIT_REFLOG_ACTION to improve readability of the
sequencer internals.
Expecting a (final?) reroll.
source: <pull.1405.git.1667575142.gitgitgadget@gmail.com>
* rp/maintenance-qol (2022-11-08) 2 commits
(merged to 'next' on 2022-11-08 at 076428c430)
+ maintenance: add option to register in a specific config
+ for-each-repo: interpolate repo path arguments
'git maintenance register' is taught to write configuration to an
arbitrary path, and 'git for-each-repo' is taught to expand tilde
characters in paths.
Will cook in 'next'.
source: <20221108194930.25805-1-ronan@rjp.ie>
* sa/cat-file-mailmap--batch-check (2022-10-30) 2 commits
- cat-file: add mailmap support to --batch-check option
- cat-file: add mailmap support to -s option
'cat-file' gains mailmap support for its '--batch-check' and '-s'
options.
* sz/macos-fsmonitor-symlinks (2022-11-08) 1 commit
- fsmonitor--daemon: on macOS support symlink
Fix an issue where core.fsmonitor on macOS would not notice created
or modified symbolic links.
Waiting for review.
source: <pull.1406.git.1667885119570.gitgitgadget@gmail.com>
* tb/ci-concurrency (2022-11-08) 1 commit
- ci: avoid unnecessary builds
Avoid unnecessary builds in CI, with settings configured in
ci-config.
Waiting for review.
source: <ff172f1de982f6f79b598e4ac6d5b2964ca4a098.1667931937.git.me@ttaylorr.com>
* tl/notes--blankline (2022-11-07) 3 commits
- notes.c: drop unreachable code in "append_edit()"
- notes.c: fixed tip when target and append note are both empty
- notes.c: introduce "--blank-line" option
'git notes append' was taught '--[no-]blank-line' to conditionally
add a LF between a new and existing note.
Expecting a reroll.
source: <cover.1667828335.git.dyroneteng@gmail.com>
* vd/update-refs-delete (2022-11-07) 1 commit
(merged to 'next' on 2022-11-08 at 2866156953)
+ rebase --update-refs: avoid unintended ref deletion
Will cook in 'next'.
source: <20221107174752.91186-1-vdye@github.com>
--------------------------------------------------
[Stalled]
* cw/submodule-status-in-parallel (2022-11-08) 6 commits
- diff-lib: parallelize run_diff_files for submodules
- diff-lib: refactor match_stat_with_submodule
- submodule: move status parsing into function
- submodule: strbuf variable rename
- run-command: add duplicate_output_fn to run_processes_parallel_opts
- Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel
Allow the internal "diff-files" engine to run "how has this
submodule changed?" in parallel to speed up "git status".
Waiting for review.
source: <20221020232532.1128326-1-calvinwan@google.com>
* js/bisect-in-c (2022-08-30) 17 commits
. bisect: no longer try to clean up left-over `.git/head-name` files
. bisect: remove Cogito-related code
. Turn `git bisect` into a full built-in
. bisect: move even the command-line parsing to `bisect--helper`
. bisect--helper: make `state` optional
. bisect--helper: calling `bisect_state()` without an argument is a bug
. bisect: avoid double-quoting when printing the failed command
. bisect run: fix the error message
. bisect: verify that a bogus option won't try to start a bisection
. bisect--helper: migrate to OPT_SUBCOMMAND()
. bisect--helper: make the order consistently `argc, argv`
. bisect--helper: make `terms` an explicit singleton
. bisect--helper: simplify exit code computation
. bisect--helper: really retire `--bisect-autostart`
. bisect--helper: really retire --bisect-next-check
. bisect--helper: retire the --no-log option
. Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
Final bits of "git bisect.sh" have been rewritten in C.
Needs review.
cf. <xmqqv8pr8903.fsf@gitster.g>
source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>
* od/ci-use-checkout-v3-when-applicable (2022-10-10) 2 commits
. ci(main): linux32 uses actions/checkout@v2
. ci(main): upgrade actions/checkout to v3
Attempt to update GitHub CI to use actions/checkout@v3
Expecting a reroll.
Seems to break the CI completely.
source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>
* ed/fsmonitor-inotify (2022-10-14) 7 commits
. fsmonitor: update doc for Linux
. fsmonitor: test updates
. fsmonitor: enable fsmonitor for Linux
. fsmonitor: implement filesystem change listener for Linux
. fsmonitor: determine if filesystem is local or remote
. fsmonitor: prepare to share code between Mac OS and Linux
. Merge branch 'ed/fsmonitor-on-networked-macos' into ed/fsmonitor-inotify
Bundled fsmonitor for Linux using inotify API.
Needs review.
Occasional breakages of t7527.16?
source: <pull.1352.v2.git.git.1665783944.gitgitgadget@gmail.com>
* ag/merge-strategies-in-c (2022-08-10) 14 commits
. sequencer: use the "octopus" strategy without forking
. sequencer: use the "resolve" strategy without forking
. merge: use the "octopus" strategy without forking
. merge: use the "resolve" strategy without forking
. merge-octopus: rewrite in C
. merge-recursive: move better_branch_name() to merge.c
. merge-resolve: rewrite in C
. merge-one-file: rewrite in C
. update-index: move add_cacheinfo() to read-cache.c
. merge-index: add a new way to invoke `git-merge-one-file'
. merge-index: drop the index
. merge-index: libify merge_one_path() and merge_all()
. t6060: add tests for removed files
. t6060: modify multiple files to expose a possible issue with merge-index
An attempt to rewrite remaining merge strategies from shell to C.
Needs more work.
At the minimum, we should lose 11/14 and possibly 08/14.
cf. <xmqq7d36vfur.fsf@gitster.g>
source: <20220809185429.20098-1-alban.gruin@gmail.com>
* es/doc-creation-factor-fix (2022-07-28) 2 commits
. range-diff: clarify --creation-factor=<factor>
. format-patch: clarify --creation-factor=<factor>
Expecting a reroll by somebody more familiar with the logic
cf. <xmqqo7wfix7p.fsf@gitster.g>
source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
* cw/remote-object-info (2022-08-13) 7 commits
. SQUASH???
. cat-file: add remote-object-info to batch-command
. transport: add client support for object-info
. serve: advertise object-info feature
. protocol-caps: initialization bug fix
. fetch-pack: move fetch initialization
. fetch-pack: refactor packet writing
A client component to talk with the object-info endpoint.
Expecting a reroll.
Under SANITIZE=address, t1006-cat-file.sh finds a breakage.
cf. <20220728230210.2952731-1-calvinwan@google.com>
cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>
source: <20220728230210.2952731-1-calvinwan@google.com>
--------------------------------------------------
[Cooking]
* ab/submodule-helper-prep-only (2022-11-08) 9 commits
(merged to 'next' on 2022-11-08 at c0c4f4d1c3)
+ submodule--helper: use OPT_SUBCOMMAND() API
+ submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
+ submodule--helper: remove --prefix from "absorbgitdirs"
+ submodule API & "absorbgitdirs": remove "----recursive" option
+ submodule.c: refactor recursive block out of absorb function
+ submodule tests: test for a "foreach" blind-spot
+ submodule--helper: fix a memory leak in "status"
+ submodule tests: add tests for top-level flag output
+ submodule--helper: move "config" to a test-tool
Preparation to remove git-submodule.sh and replace it with a builtin.
Will cook in 'next'.
source: <cover-v2-0.9-00000000000-20221108T140501Z-avarab@gmail.com>
* ds/bundle-uri-4 (2022-10-31) 9 commits
- clone: unbundle the advertised bundles
- bundle-uri: download bundles from an advertised list
- bundle-uri: allow relative URLs in bundle lists
- strbuf: reintroduce strbuf_parent_directory()
- bundle-uri client: add boolean transfer.bundleURI setting
- bundle-uri: serve bundle.* keys from config
- bundle-uri client: add helper for testing server
- bundle-uri client: add minimal NOOP client
- protocol v2: add server-side "bundle-uri" skeleton
Bundle URIs part 4.
Waiting for review.
source: <pull.1400.git.1667264854.gitgitgadget@gmail.com>
* sg/plug-line-log-leaks (2022-11-02) 3 commits
- diff.c: use diff_free_queue()
- line-log: free the diff queues' arrays when processing merge commits
- line-log: free diff queue when processing non-merge commits
A handful of leaks in the line-log machinery have been plugged.
Expecting a reroll.
source: <20221102220142.574890-1-szeder.dev@gmail.com>
* tb/branch-delete-detached (2022-11-01) 1 commit
- branch: gracefully handle '-d' on detached HEAD
'git branch -d' is taught to ignore failures to resolve HEAD when
detached.
Expecting a reroll.
source: <c68f4b140f2495a35c5f30bec4e2e56c246160f4.1667334672.git.me@ttaylorr.com>
* tb/howto-maintain-git-fixes (2022-10-31) 2 commits
- Documentation: build redo-seen.sh from jch..seen
- Documentation: build redo-jch.sh from master..jch
A pair of bugfixes to the Documentation/howto/maintain-git.txt guide.
Will merge to 'next'.
source: <cover.1667260044.git.me@ttaylorr.com>
* tl/pack-bitmap-absolute-paths (2022-11-04) 2 commits
- pack-bitmap.c: remove unnecessary "open_pack_index()" calls
- pack-bitmap.c: avoid exposing absolute paths
The pack-bitmap machinery is taught to log the paths of redundant
bitmap(s) to trace2 instead of stderr.
Expecting a (final?) reroll.
source: <cover.1667470481.git.dyroneteng@gmail.com>
* ab/cmake-nix-and-ci (2022-11-04) 14 commits
(merged to 'next' on 2022-11-08 at 6ef4e93b36)
+ CI: add a "linux-cmake-test" to run cmake & ctest on linux
+ cmake: copy over git-p4.py for t983[56] perforce test
+ cmake: only look for "sh" in "C:/Program Files" on Windows
+ cmake: increase test timeout on Windows only
+ cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults
+ Makefile + cmake: use environment, not GIT-BUILD-DIR
+ test-lib.sh: support a "GIT_TEST_BUILD_DIR"
+ cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh
+ cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable
+ cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4
+ cmake: don't copy chainlint.pl to build directory
+ cmake: update instructions for portable CMakeLists.txt
+ cmake: use "-S" and "-B" to specify source and build directories
+ cmake: don't invoke msgfmt with --statistics
Fix assorted issues with CTest on *nix machines.
Will cook in 'next'.
source: <cover-v4-00.14-00000000000-20221103T160255Z-avarab@gmail.com>
* ab/make-bin-wrappers (2022-10-31) 4 commits
- Makefile: simplify $(test_bindir_programs) rule by splitting it up
- Makefile: rename "test_bindir_programs" variable, pre-declare
- Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier
- Makefile: factor sed-powered '#!/bin/sh' munging into a variable
Resolve issues with the bin-wrappers/% rules where "make
bin-wrappers/git" would generate the script but not "git" itself.
Waiting for review.
source: <cover-v3-0.4-00000000000-20221031T222249Z-avarab@gmail.com>
* ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
(merged to 'next' on 2022-11-03 at 0f01b25561)
+ run-command tests: test stdout of run_command_parallel()
+ submodule tests: reset "trace.out" between "grep" invocations
+ hook tests: fix redirection logic error in 96e7225b310
Various test updates.
Waiting for review.
source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
* do/modernize-t7001 (2022-11-04) 1 commit
(merged to 'next' on 2022-11-08 at dfc9c80e73)
+ t7001-mv.sh: modernizing test script using functions
Modernize test script to avoid "test -f" and friends.
Will merge to 'master'.
source: <pull.1372.v3.git.git.1667574352244.gitgitgadget@gmail.com>
* kz/merge-tree-merge-base (2022-11-04) 2 commits
- merge-tree.c: allow specifying the merge-base when --stdin is passed
- merge-tree.c: add --merge-base=<commit> option
"merge-tree" learns a new `--merge-base` option.
Waiting for review.
source: <pull.1397.v6.git.1667472621.gitgitgadget@gmail.com>
* mh/password-can-be-pat (2022-11-08) 1 commit
(merged to 'next' on 2022-11-08 at 3135ade2a6)
+ Documentation/gitcredentials.txt: mention password alternatives
Documentation update to git-credential(1).
Will merge to 'master'.
source: <pull.1396.v3.git.1667912487608.gitgitgadget@gmail.com>
* po/pretty-hard-trunc (2022-11-02) 1 commit
- pretty-formats: add hard truncation, without ellipsis, options
Add a new pretty format which truncates without ellipsis.
Missing test coverage.
source: <20221102120853.2013-1-philipoakley@iee.email>
* rr/long-status-advice (2022-11-04) 1 commit
- status: long status advice adapted to recent capabilities
The advice message emitted by a slow "status" run is amended to
mention fsmonitor.
Waiting for reviewer feedback on the updated round.
source: <pull.1384.v3.git.1667424467505.gitgitgadget@gmail.com>
* ab/config-multi-and-nonbool (2022-11-02) 9 commits
- for-each-repo: with bad config, don't conflate <path> and <cmd>
- config API: add "string" version of *_value_multi(), fix segfaults
- config API users: test for *_get_value_multi() segfaults
- for-each-repo: error on bad --config
- config API: have *_multi() return an "int" and take a "dest"
- versioncmp.c: refactor config reading next commit
- config tests: add "NULL" tests for *_get_value_multi()
- config tests: cover blind spots in git_die_config() tests
- for-each-repo tests: test bad --config keys
A mixed bag of config API updates.
Expecting a reroll.
cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
source: <cover-v2-0.9-00000000000-20221101T225822Z-avarab@gmail.com>
* ab/sha-makefile-doc (2022-11-07) 10 commits
(merged to 'next' on 2022-11-08 at 6d3068d7cd)
+ Makefile: discuss SHAttered in *_SHA{1,256} discussion
+ Makefile: document default SHA-1 backend on OSX
+ Makefile & test-tool: replace "DC_SHA1" variable with a "define"
+ Makefile: document SHA-1 and SHA-256 default and selection order
+ Makefile: document default SHA-256 backend
+ Makefile: rephrase the discussion of *_SHA1 knobs
+ Makefile: create and use sections for "define" flag listing
+ Makefile: correct DC_SHA1 documentation
+ INSTALL: remove discussion of SHA-1 backends
+ Makefile: always (re)set DC_SHA1 on fallback
Makefile comments updates and reordering to clarify knobs used to
choose SHA implementations.
Will cook in 'next'.
source: <cover-v5-00.10-00000000000-20221107T211736Z-avarab@gmail.com>
* ps/receive-use-only-advertised (2022-11-08) 6 commits
- receive-pack: only use visible refs for connectivity check
- rev-parse: add `--exclude-hidden=` option
- revision: add new parameter to exclude hidden refs
- revision: introduce struct to handle exclusions
- revision: move together exclusion-related functions
- refs: get rid of global list of hidden refs
"git receive-pack" used to use all the local refs as the boundary
for checking connectivity of the data "git push" sent, but now it
uses only the refs that it advertised to the pusher. In a
repository with the .hideRefs configuration, this reduces the
resource needed to perform the check, and also forces the pusher to
prove they have all objects that are necessary to complete the
history on top of only the history available to them.
Expecting a (final?) reroll.
cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com>
cf. <xmqqr0yrizqm.fsf@gitster.g>
source: <cover.1667901510.git.ps@pks.im>
* gc/submodule-clone-update-with-branches (2022-10-30) 8 commits
- clone, submodule update: create and check out branches
- submodule--helper: remove update_data.suboid
- submodule update: refactor update targets
- submodule: return target of submodule symref
- t5617: drop references to remote-tracking branches
- submodule--helper clone: create named branch
- repo-settings: add submodule_propagate_branches
- clone: teach --detach option
"git clone --recurse-submodules" and "git submodule update" learns
to honor the "propagete branches" option.
Waiting for review.
source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com>
* pw/config-int-parse-fixes (2022-10-22) 3 commits
. git_parse_signed(): avoid integer overflow
. config: require at least one digit when parsing numbers
. git_parse_unsigned: reject negative values
Assorted fixes of parsing end-user input as integers.
Expecting a reroll to add test coverage.
cf. <Y1L+Qv+cs1bjqjK9@coredump.intra.peff.net>
source: <pull.1389.git.1666359915.gitgitgadget@gmail.com>
* sa/cat-file-mailmap (2022-10-21) 1 commit
. doc/cat-file: allow --use-mailmap for --batch options
Doc updates.
Waiting for review response.
source: <20221021103442.202759-1-siddharthasthana31@gmail.com>
* tb/repack-expire-to (2022-10-24) 4 commits
(merged to 'next' on 2022-11-08 at 496ce3c62d)
+ builtin/repack.c: implement `--expire-to` for storing pruned objects
+ builtin/repack.c: write cruft packs to arbitrary locations
+ builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
+ builtin/repack.c: pass "out" to `prepare_pack_objects`
"git repack" learns to send cruft objects out of the way into
packfiles outside the repository.
Will cook in 'next'.
source: <cover.1666636974.git.me@ttaylorr.com>
* cc/filtered-repack (2022-10-25) 2 commits
- repack: add --filter=<filter-spec> option
- pack-objects: allow --filter without --stdout
"git repack" learns to discard objects that ought to be retrievable
again from the promissor remote.
Needs review.
source: <20221025122856.20204-1-christian.couder@gmail.com>
* al/trace2-clearing-skip-worktree (2022-11-04) 2 commits
(merged to 'next' on 2022-11-08 at 567aeb8d83)
+ index: raise a bug if the index is materialised more than once
+ index: add trace2 region for clear skip worktree
Add trace2 counters to the region to clear skip worktree bits in a
sparse checkout.
Will merge to 'master'.
source: <pull.1368.v4.git.git.1667516701.gitgitgadget@gmail.com>
* mc/credential-helper-auth-headers (2022-11-02) 11 commits
- t5556: add HTTP authentication tests
- test-http-server: add simple authentication
- test-http-server: pass Git requests to http-backend
- test-http-server: add HTTP request parsing
- test-http-server: add HTTP error response function
- test-http-server: add stub HTTP server test helper
- http: set specific auth scheme depending on credential
- http: move proactive auth to first slot creation
- http: store all request headers on active_request_slot
- credential: add WWW-Authenticate header to cred requests
- http: read HTTP WWW-Authenticate response headers
Extending credential helper protocol.
Needs review.
source: <pull.1352.v3.git.1667426969.gitgitgadget@gmail.com>
* hl/archive-recursive (2022-10-19) 10 commits
. fixup! archive: add tests for git archive --recurse-submodules
. archive: add tests for git archive --recurse-submodules
. archive: add --recurse-submodules to git-archive command
. archive: remove global repository from archive_args
. archive: pass repo objects to write_archive handlers
. tree: add repository parameter to read_tree_fn_t
. tree: handle submodule case for read_tree_at properly
. tree: increase test coverage for tree.c
. tree: update cases to use repo_ tree methods
. tree: do not use the_repository for tree traversal methods.
"git archive" has been taught "--recurse-submodules" option to
create a tarball that includes contents from submodules.
Expecting a reroll.
Seems to break win+VS test(8).
cf. https://github.com/git/git/actions/runs/3293333066 whose only
difference from https://github.com/git/git/actions/runs/3293553109
is the inclusion of this topic.
source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
* en/sparse-checkout-design (2022-11-07) 1 commit
(merged to 'next' on 2022-11-08 at 42e164b490)
+ sparse-checkout.txt: new document with sparse-checkout directions
Design doc.
Needs review.
source: <pull.1367.v4.git.1667714666810.gitgitgadget@gmail.com>
* pw/test-todo (2022-10-06) 3 commits
. test_todo: allow [verbose] test as the command
. test_todo: allow [!] grep as the command
. tests: add test_todo() to mark known breakages
RFC for test framework improvement.
Needs review.
source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
* ab/coccicheck-incremental (2022-11-02) 13 commits
(merged to 'next' on 2022-11-08 at 0f3c55d4c2)
+ spatchcache: add a ccache-alike for "spatch"
+ cocci: run against a generated ALL.cocci
+ cocci rules: remove <id>'s from rules that don't need them
+ Makefile: copy contrib/coccinelle/*.cocci to build/
+ cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
+ cocci: make "coccicheck" rule incremental
+ cocci: split off "--all-includes" from SPATCH_FLAGS
+ cocci: split off include-less "tests" from SPATCH_FLAGS
+ Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
+ Makefile: have "coccicheck" re-run if flags change
+ Makefile: add ability to TAB-complete cocci *.patch rules
+ cocci rules: remove unused "F" metavariable from pending rule
+ Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
"make coccicheck" is time consuming. It has been made to run more
incrementally.
Will cook in 'next'.
source: <cover-v5-00.13-00000000000-20221101T222616Z-avarab@gmail.com>
^ permalink raw reply [relevance 1%]
* [OUTREACHY][DRAFT Proposal] Unify ref-filter formats with other --pretty formats
@ 2022-11-08 10:55 2% Debra Obondo
0 siblings, 0 replies; 200+ results
From: Debra Obondo @ 2022-11-08 10:55 UTC (permalink / raw)
To: git, Christian Couder, Hariom verma
Hello Team,
This is a draft proposal for the Outreachy Internship, could I kindly
have your reviews on it.
https://docs.google.com/document/d/11HX9dkEH--ZfXBTRWJ8rhGnlf3Bj_n_4U2Z-qgbDYVM/edit?usp=sharing
Below is its basic structure:
UNIFY ref-filter FORMATS WITH OTHER --pretty FORMATS
Personal Information
Name: Debra Obondo
Email: debraobondo@gmail.com
University: Jomo Kenyatta University of Agriculture and Technology
Telephone Number: +254743635117
Course: B.Sc Electronic and Computer Engineering
Github: https://github.com/fobiasic07
LinkedIn: https://www.linkedin.com/in/debra-obondo
Timezone: Nairobi (UTC+3)
Location: Nairobi, Kenya
Abstract
Git has an old problem of duplicated implementations of some logic
such as the four different implementations for formatting command
outputs for different commands. Ref-filter {.c.h} and pretty-lib
{.c.h} formatting logic have been no different and require(/d)
unification, which will help to simplify adding new functionality as
Git continues to develop.
This project was initially proposed by Hariom Verma following his FOSS
contributions to Git and Olga<olyatelezhnaya@gmail.com>’s work on
‘Unifying Git’s format languages’.
In his final report, he had completed almost all pretty format
implementation with a few challenges :
30% Log related failing tests on branch pretty-lib-2.0.2
Inability of pretty-lib {.c.h} to handle unknown formatting options.
Mailmap logic in ref-filter requires modification due to the new email
options which do not allow rebasing and consequently affects the MBOX
commit format.
MBOX commit format.
Completing the work and Rebasing a few other pretty-lib branches with
features such as fix-graph3 using Junio's way to pretty-lib-2.0.2
He also brought attention to :
Olga’s remaining work https://github.com/telezhnaya/git/commits/format
The purpose of this Internship Project is to solve the challenges,
submit well-functioning patches and increase functionality and
simplicity in pretty-lib {.c.h}.
Deliverables
The purpose of this project having been to improve and easen the
functionality of pretty, I aim to deliver in the following:
Working on failing formats to pass tests and maintain desired functionality.
Easen error identification when handling unknown formats.
Update MBOX commit format so that it still holds initial settings with
additional functionality.
Modifying mailmap logic to allow additional application.
Finishing work in other pretty-lib branches and merging with original
once tests are passed successfully.
Update documentation for ease of understanding
Final report on the improvements made and their importance.
Work that may be done if the above is completed before the end of the
project timeline:
Understanding Olga’s work in depth.
Working on the formats in ref-filter that were being adopted from cat-file.
Write and run passing tests for the formats when using ref-filter.
Working on expanded and added cat-file formats.
Update documentation on both cat-file and ref-filter work related to
Olga’s work.
In the case of the outreachy timeline having been passed, I plan to
work on this during the two months left in my long after-semester
break to further my knowledge on git and remain an active member of
the git community.
Project Implementation
The project will be done using Git, Bash Scripting and C (and likely Google;-)
Since I am about to finish my current semester, my exams (5th - 16th
December) are likely to clash with the start of the internship, but
not to worry, since after that, I will be able to give my full-time
concentration to this project, about 45-50 Hours or more a week, since
I will be having an academic year break between then and 8th May 2023
before my final academic year begins.. Below is my programming plan.
Programming Plan
I have divided my programming plan into 5 parts, which would be as follows:
PART 1(Pre- Program);
This is before the official start of the program, between now and 5th Dec :
I plan to familiarize myself better with the community, submit a few
patches using 'git send-email', as it enables ease of communication on
various contributions and projects as compared to gitgitgadget.
Learning and understanding the logic and format functionality of both
the pretty and ref-filter commands is a priority to easen working on
the project later on. If accepted, plan for the required weekly
mentor-mentee meeting time(s). I also plan to understand the function
die() by going through this project: Issue #635
PART 2 (Phase 1); 5th Dec -2nd Jan:
This is during the first third of the program:
Working with mentors to identify the log-related failing test formats.
Reworking the failing formats to pass the tests, while still
functioning in the required unified logic.
Share the first two blogs via my social media handles.
Update Documentation.
Start on 'handling unknown formatting options'
Feedback #1 submission
PART 3 (Phase 2); 3rd Jan - 1st Feb:
During the second third of the program:
Working on the die() function, to figure out the best way to handle
unknown formatting options by pretty, be it creating a new 'die'/end
process function with more options,, mentor and community discussion
will help.
Feedback #2 submission
Modifying mailmap logic in ref-filter to allow rebasing, in turn,
working on the MBOX commit format.
Share my learning progress and challenges in other two blogs.
Update Documentation.
Feedback #3 submission.
PART 4 (Phase 3): 2nd Feb - 1st March:
During the final third of the program:
Working on the other pretty lib branches (yet to go through them) and
rebasing/ merging the features to pretty-lib 2.0.2.
Sharing my experience with Git as an FOSS community and giving my
final report through blogs.
Fix any bugs that may be left and 'polish' the work on --pretty and ref-filter.
Update Documentation.
Feedback #4 submission.
Part 5(Post-program):
After gaining many skills from working on the above, I believe I will
have the capacity to take on Olga's work during the remaining 2 month
break that I will be left with. In the case of similar projects during
GSoC 23';-) or Outreachy May to August, I will also be willing to
mentor, since teaching helps us learn more.
Perceived Obstacles and Challenges
Test Fails
This is always a possible occurrence in programming, therefore,
together with my mentors and the git community, solutions are highly
likely to emerge.
Maintaining compatibility for both newer and older systems
This is majorly in the mbox commit format and mailmap logic issue.
Further research and various opinions will lead to us finding the best
way forward.
Overflow of work past the internship period
This is likely to occur with rebasing of the other pretty-lib branches
and Olga’s work and can easily be dealt with by me giving more time in
the case of not reaching my timeline personal set deadlines.
About Me
I am a fourth year B.Sc student taking Electronics and Computer
Engineering at Jomo Kenyatta University of Agriculture and Technology,
Kenya. I have also been a member of the ALX-Africa-2022 Software
Programme.
I recently decided to venture into software as my career path. This
was during my attachment at Gearbox Academy , where I gained skills in
Web Development, Microcontroller processing and 3D Design.
I have experience with C from my coursework and ALX practice and level
3 skills and knowledge in BASH scripting and Git, which I would like
to further improve on. I believe contributing to this open source
project will help me to further grow my skills and widen my knowledge
on FOSS as a whole.
Equipped with this chance, I shall also use the skills learnt to help
future developers on similar projects and to continue contributing to
git and other open-source projects.
Requirements
This is the micro project required while submitting the proposal for
the Outreachy 2022 program:
https://lore.kernel.org/git/pull.1372.git.git.1667150441883.gitgitgadget@gmail.com
Description:
Older test scripts have used the command 'test -' to verify the
presence or absence of features such as files, directories and
symbolic links. This however requires slightly complicated uses, such
as 'test ! -f '. The helper functions 'test_path_is_' located in
t/test-lib-functions.sh have taken into account all scenarios of the
'test -*' to reduce errors. This was a microproject to replace them
with the helper functions.
Test script to verify the presence/absence of files, paths,
directories, symboliclinks and many other features in mv command are
using the command format
'test -(e|f|s|h|...)’
Replace them with helper functions of format
'test_path_is_*'
At the time of submission, this patch has been queued into ‘seen’
preparation for merging into next and eventually master: t7001-mv.sh
commit
Motivation
Git members are welcoming, I feel it will be a good learning community
for me to grow as an Open source contributor and software programmer,
which is one of my personal targets. During my contribution, I
received understandable feedback in a short period of time and was
able to make ‘polished’ and ‘out-of-the-blue’ patches as required.
(It’s part of the conversation thread in my microproject) This brought
to my awareness that git is an easily approachable community for any
programming challenges faced.
References
Git SoC 2022 Ideas : https://git.github.io/SoC-2022-Ideas/
Git Soc 2022 Applicant Microprojects :
https://git.github.io/SoC-2022-Microprojects/
The Final Report by Hariom Verma:
https://harry-hov.github.io/blogs/posts/the-final-report
Looking forward to your responses.
Kind regards,
Debra obondo.
^ permalink raw reply [relevance 2%]
* Re: [PATCH v3] t7001-mv.sh: modernizing test script using functions
2022-11-04 15:05 13% ` [PATCH v3] " Debra Obondo via GitGitGadget
@ 2022-11-04 22:00 6% ` Taylor Blau
0 siblings, 0 replies; 200+ results
From: Taylor Blau @ 2022-11-04 22:00 UTC (permalink / raw)
To: Debra Obondo via GitGitGadget
Cc: git, Taylor Blau, Martin Ågren, Debra Obondo
Hi Debra,
On Fri, Nov 04, 2022 at 03:05:52PM +0000, Debra Obondo via GitGitGadget wrote:
> t/t7001-mv.sh | 62 +++++++++++++++++++++++++--------------------------
> 1 file changed, 31 insertions(+), 31 deletions(-)
This round looks great. Will queue, thanks.
Thanks,
Taylor
^ permalink raw reply [relevance 6%]
* [PATCH v3] t7001-mv.sh: modernizing test script using functions
2022-11-03 18:39 13% ` [PATCH v2] t7001-mv.sh: modernizing test script using functions Debra Obondo via GitGitGadget
2022-11-03 19:37 6% ` Martin Ågren
@ 2022-11-04 15:05 13% ` Debra Obondo via GitGitGadget
2022-11-04 22:00 6% ` Taylor Blau
1 sibling, 1 reply; 200+ results
From: Debra Obondo via GitGitGadget @ 2022-11-04 15:05 UTC (permalink / raw)
To: git; +Cc: Taylor Blau, Martin Ågren, Debra Obondo, Debra Obondo
From: Debra Obondo <debraobondo@gmail.com>
Test script to verify the presence/absence of files, paths, directories,
symlinks and other features in 'git mv' command are using the command
format:
'test (-e|f|d|h|...)'
Replace them with helper functions of format:
'test_path_is_*'
Replacing idiomatic helper functions:
'! test_path_is_*'
with
'test_path_is_missing'
This uses values of 'test_path_bar' in place of '! test_path_foo' to
bring in the helpful factor of indicating the failure of tests after the
mv command has been used, that is, it echoes if the feature/test_path
exists.
Signed-off-by: Debra Obondo <debraobondo@gmail.com>
---
[PATCH v3] [OUTREACHY] t7001-mv.sh : Use test_path_is_* functions in
test script
Changes since prevous 2 versions:
Replacing idiomatic helper functions
'! test_path_is_*'
with
'test_path_is_missing'
This uses values of 'test_path_bar' in place of '! test_path_foo' to
bring in the helpful factor of indicating the failure of tests after the
mv command has been used, that is, it echoes if the feature/test_path
exists .
Older test scripts use the command 'test -' to verify the presence or
absence of features such as files, directories and symbolic links. This
however requires slightly complicated uses, such as 'test ! -f '. The
helper functions 'test_path_is_' located in t/test-lib-functions.sh have
taken into account all scenarios of the 'test -' to reduce errors. This
was a microproject to replace them with the helper functions.
Test script to verify the presence/absence of files, paths,
directories,symboliclinks and many other features in mv command are
using the command format
'test -(e|f|s|h|...).
Replace them with helper functions of format
'test_path_is_*'
Signed-off-by: Debra Obondo debraobondo@gmail.com
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1372%2Ffobiasic07%2Ft7001-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1372/fobiasic07/t7001-v3
Pull-Request: https://github.com/git/git/pull/1372
Range-diff vs v2:
1: c6640ebff66 ! 1: 04176190ffd t7001-mv.sh: modernizing test script using functions
@@ Commit message
'test_path_is_*'
- Changes since v1
-
- Replacing idiomatic helper functions
+ Replacing idiomatic helper functions:
'! test_path_is_*'
t/t7001-mv.sh | 62 +++++++++++++++++++++++++--------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 8c37bceb336..d72cef88264 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -60,8 +60,8 @@ test_expect_success 'checking the commit' '
test_expect_success 'mv --dry-run does not move file' '
git mv -n path0/COPYING MOVED &&
- test -f path0/COPYING &&
- test ! -f MOVED
+ test_path_is_file path0/COPYING &&
+ test_path_is_missing MOVED
'
test_expect_success 'checking -k on non-existing file' '
@@ -71,25 +71,25 @@ test_expect_success 'checking -k on non-existing file' '
test_expect_success 'checking -k on untracked file' '
>untracked1 &&
git mv -k untracked1 path0 &&
- test -f untracked1 &&
- test ! -f path0/untracked1
+ test_path_is_file untracked1 &&
+ test_path_is_missing path0/untracked1
'
test_expect_success 'checking -k on multiple untracked files' '
>untracked2 &&
git mv -k untracked1 untracked2 path0 &&
- test -f untracked1 &&
- test -f untracked2 &&
- test ! -f path0/untracked1 &&
- test ! -f path0/untracked2
+ test_path_is_file untracked1 &&
+ test_path_is_file untracked2 &&
+ test_path_is_missing path0/untracked1 &&
+ test_path_is_missing path0/untracked2
'
test_expect_success 'checking -f on untracked file with existing target' '
>path0/untracked1 &&
test_must_fail git mv -f untracked1 path0 &&
- test ! -f .git/index.lock &&
- test -f untracked1 &&
- test -f path0/untracked1
+ test_path_is_missing .git/index.lock &&
+ test_path_is_file untracked1 &&
+ test_path_is_file path0/untracked1
'
# clean up the mess in case bad things happen
@@ -215,8 +215,8 @@ test_expect_success 'absolute pathname' '
git add sub/file &&
git mv sub "$(pwd)/in" &&
- ! test -d sub &&
- test -d in &&
+ test_path_is_missing sub &&
+ test_path_is_dir in &&
git ls-files --error-unmatch in/file
)
'
@@ -234,8 +234,8 @@ test_expect_success 'absolute pathname outside should fail' '
git add sub/file &&
test_must_fail git mv sub "$out/out" &&
- test -d sub &&
- ! test -d ../in &&
+ test_path_is_dir sub &&
+ test_path_is_missing ../in &&
git ls-files --error-unmatch sub/file
)
'
@@ -295,8 +295,8 @@ test_expect_success 'git mv should overwrite symlink to a file' '
git add moved &&
test_must_fail git mv moved symlink &&
git mv -f moved symlink &&
- ! test -e moved &&
- test -f symlink &&
+ test_path_is_missing moved &&
+ test_path_is_file symlink &&
test "$(cat symlink)" = 1 &&
git update-index --refresh &&
git diff-files --quiet
@@ -312,13 +312,13 @@ test_expect_success 'git mv should overwrite file with a symlink' '
git add moved &&
test_must_fail git mv symlink moved &&
git mv -f symlink moved &&
- ! test -e symlink &&
+ test_path_is_missing symlink &&
git update-index --refresh &&
git diff-files --quiet
'
test_expect_success SYMLINKS 'check moved symlink' '
- test -h moved
+ test_path_is_symlink moved
'
rm -f moved symlink
@@ -352,7 +352,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
) &&
mkdir mod &&
git mv sub mod/sub &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -372,7 +372,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
) &&
mkdir mod &&
git mv sub mod/sub &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
@@ -389,7 +389,7 @@ test_expect_success 'git mv moves a submodule with gitfile' '
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
git -C mod mv ../sub/ . &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
@@ -408,7 +408,7 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -423,13 +423,13 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
test_must_fail git mv sub mod/sub 2>actual.err &&
- test -s actual.err &&
- test -e sub &&
+ test_file_not_empty actual.err &&
+ test_path_exists sub &&
git diff-files --quiet -- sub &&
git add .gitmodules &&
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -447,7 +447,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
test_cmp expect.err actual.err &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -460,7 +460,7 @@ test_expect_success 'mv --dry-run does not touch the submodule or .gitmodules' '
git submodule update &&
mkdir mod &&
git mv -n sub mod/sub 2>actual.err &&
- test -f sub/.git &&
+ test_path_is_file sub/.git &&
git diff-index --exit-code HEAD &&
git update-index --refresh &&
git diff-files --quiet -- sub .gitmodules
@@ -474,10 +474,10 @@ test_expect_success 'checking out a commit before submodule moved needs manual u
git status -s sub2 >actual &&
echo "?? sub2/" >expected &&
test_cmp expected actual &&
- ! test -f sub/.git &&
- test -f sub2/.git &&
+ test_path_is_missing sub/.git &&
+ test_path_is_file sub2/.git &&
git submodule update &&
- test -f sub/.git &&
+ test_path_is_file sub/.git &&
rm -rf sub2 &&
git diff-index --exit-code HEAD &&
git update-index --refresh &&
base-commit: 1fc3c0ad407008c2f71dd9ae1241d8b75f8ef886
--
gitgitgadget
^ permalink raw reply related [relevance 13%]
* What's cooking in git.git (Nov 2022, #01; Thu, 3)
@ 2022-11-04 1:05 2% Taylor Blau
0 siblings, 0 replies; 200+ results
From: Taylor Blau @ 2022-11-04 1:05 UTC (permalink / raw)
To: git
Here are the topics that have been cooking in my tree. Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a future
release). Commits prefixed with '-' are only in 'seen', and aren't
considered "accepted" at all. A topic without enough support may be
discarded after a long period of no activity.
A large-ish handful of topics are awaiting review. I'll continue to
hold those topics in 'seen' until they have enough attention to feel
comfortable merging them down.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
https://github.com/git/git/
The following mirrors are currently out-of-date while the usual
maintainer is offline.
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/ttaylorr/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are typically published in these repositories
for convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
...but these and the release tarballs below are similarly out-of-date:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[New Topics]
* ab/submodule-helper-prep-only (2022-11-02) 8 commits
- submodule--helper: use OPT_SUBCOMMAND() API
- submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
- submodule--helper: remove --prefix from "absorbgitdirs"
- submodule API & "absorbgitdirs": remove "----recursive" option
- submodule.c: refactor recursive block out of absorb function
- submodule tests: test for a "foreach" blind-spot
- submodule tests: add tests for top-level flag output
- submodule--helper: move "config" to a test-tool
Preparation to remove git-submodule.sh and replace it with a builtin.
Waiting for review?
source: <cover-0.8-00000000000-20221102T074148Z-avarab@gmail.com>
* ds/bundle-uri-4 (2022-10-31) 9 commits
- clone: unbundle the advertised bundles
- bundle-uri: download bundles from an advertised list
- bundle-uri: allow relative URLs in bundle lists
- strbuf: reintroduce strbuf_parent_directory()
- bundle-uri client: add boolean transfer.bundleURI setting
- bundle-uri: serve bundle.* keys from config
- bundle-uri client: add helper for testing server
- bundle-uri client: add minimal NOOP client
- protocol v2: add server-side "bundle-uri" skeleton
Bundle URIs part 4.
source: <pull.1400.git.1667264854.gitgitgadget@gmail.com>
* jk/ref-filter-parsing-bugs (2022-11-02) 2 commits
(merged to 'next' on 2022-11-03 at 92c1a50548)
+ ref-filter: fix parsing of signatures with CRLF and no body
+ ref-filter: fix parsing of signatures without blank lines
Various tests exercising the transfer.credentialsInUrl configuration
are taught to avoid making requests which require resolving localhost
to reduce CI-flakiness.
Will merge to 'master'.
source: <Y2IeqOT5Ao1Qa0Zl@coredump.intra.peff.net>
* ma/drop-redundant-diagnostic (2022-10-31) 1 commit
(merged to 'next' on 2022-11-03 at 196c5a337b)
+ test-lib-functions: drop redundant diagnostic print
A redundant diagnostic message is dropped from test_path_is_missing().
Will merge to 'master'.
source: <20221031180048.5766-1-martin.agren@gmail.com>
* sg/plug-line-log-leaks (2022-11-02) 3 commits
- diff.c: use diff_free_queue()
- line-log: free the diff queues' arrays when processing merge commits
- line-log: free diff queue when processing non-merge commits
A handful of leaks in the line-log machinery have been plugged.
Expecting a reroll.
source: <20221102220142.574890-1-szeder.dev@gmail.com>
* tb/branch-delete-detached (2022-11-01) 1 commit
- branch: gracefully handle '-d' on detached HEAD
'git branch -d' is taught to ignore failures to resolve HEAD when
detached.
Expecting a reroll.
source: <c68f4b140f2495a35c5f30bec4e2e56c246160f4.1667334672.git.me@ttaylorr.com>
* tb/howto-maintain-git-fixes (2022-10-31) 2 commits
- Documentation: build redo-seen.sh from jch..seen
- Documentation: build redo-jch.sh from master..jch
(this branch uses tb/howto-using-redo-script.)
A pair of bugfixes to the Documentation/howto/maintain-git.txt guide.
Will merge to 'next'.
source: <cover.1667260044.git.me@ttaylorr.com>
* tl/pack-bitmap-absolute-paths (2022-11-02) 1 commit
- pack-bitmap.c: avoid exposing absolute paths
The pack-bitmap machinery is taught to log the paths of redundant
bitmap(s) to trace2 instead of stderr.
Expecting a reroll.
source: <87a494e5ac0cc992689944ab13600d097c51e54a.1667393419.git.dyroneteng@gmail.com>
--------------------------------------------------
[Stalled]
* cw/submodule-status-in-parallel (2022-10-20) 7 commits
. diff-lib: parallelize run_diff_files for submodules
. diff-lib: refactor match_stat_with_submodule
. submodule: move status parsing into function
. submodule: strbuf variable rename
. run-command: add hide_output to run_processes_parallel_opts
. run-command: add pipe_output_fn to run_processes_parallel_opts
. Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel
Allow the internal "diff-files" engine to run "how has this
submodule changed?" in parallel to speed up "git status".
Breaks winVS test?
cf. <https://github.com/git/git/actions/runs/3298596454/jobs/5441029092>
source: <20221011232604.839941-1-calvinwan@google.com>
* js/bisect-in-c (2022-08-30) 17 commits
. bisect: no longer try to clean up left-over `.git/head-name` files
. bisect: remove Cogito-related code
. Turn `git bisect` into a full built-in
. bisect: move even the command-line parsing to `bisect--helper`
. bisect--helper: make `state` optional
. bisect--helper: calling `bisect_state()` without an argument is a bug
. bisect: avoid double-quoting when printing the failed command
. bisect run: fix the error message
. bisect: verify that a bogus option won't try to start a bisection
. bisect--helper: migrate to OPT_SUBCOMMAND()
. bisect--helper: make the order consistently `argc, argv`
. bisect--helper: make `terms` an explicit singleton
. bisect--helper: simplify exit code computation
. bisect--helper: really retire `--bisect-autostart`
. bisect--helper: really retire --bisect-next-check
. bisect--helper: retire the --no-log option
. Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
Final bits of "git bisect.sh" have been rewritten in C.
Needs review.
cf. <xmqqv8pr8903.fsf@gitster.g>
source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>
* od/ci-use-checkout-v3-when-applicable (2022-10-10) 2 commits
. ci(main): linux32 uses actions/checkout@v2
. ci(main): upgrade actions/checkout to v3
Attempt to update GitHub CI to use actions/checkout@v3
Expecting a reroll.
Seems to break the CI completely.
source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>
* ed/fsmonitor-inotify (2022-10-14) 7 commits
. fsmonitor: update doc for Linux
. fsmonitor: test updates
. fsmonitor: enable fsmonitor for Linux
. fsmonitor: implement filesystem change listener for Linux
. fsmonitor: determine if filesystem is local or remote
. fsmonitor: prepare to share code between Mac OS and Linux
. Merge branch 'ed/fsmonitor-on-networked-macos' into ed/fsmonitor-inotify
Bundled fsmonitor for Linux using inotify API.
Needs review.
Occasional breakages of t7527.16?
source: <pull.1352.v2.git.git.1665783944.gitgitgadget@gmail.com>
* ag/merge-strategies-in-c (2022-08-10) 14 commits
. sequencer: use the "octopus" strategy without forking
. sequencer: use the "resolve" strategy without forking
. merge: use the "octopus" strategy without forking
. merge: use the "resolve" strategy without forking
. merge-octopus: rewrite in C
. merge-recursive: move better_branch_name() to merge.c
. merge-resolve: rewrite in C
. merge-one-file: rewrite in C
. update-index: move add_cacheinfo() to read-cache.c
. merge-index: add a new way to invoke `git-merge-one-file'
. merge-index: drop the index
. merge-index: libify merge_one_path() and merge_all()
. t6060: add tests for removed files
. t6060: modify multiple files to expose a possible issue with merge-index
An attempt to rewrite remaining merge strategies from shell to C.
Needs more work.
At the minimum, we should lose 11/14 and possibly 08/14.
cf. <xmqq7d36vfur.fsf@gitster.g>
source: <20220809185429.20098-1-alban.gruin@gmail.com>
* es/doc-creation-factor-fix (2022-07-28) 2 commits
. range-diff: clarify --creation-factor=<factor>
. format-patch: clarify --creation-factor=<factor>
Expecting a reroll by somebody more familiar with the logic
cf. <xmqqo7wfix7p.fsf@gitster.g>
source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
* cw/remote-object-info (2022-08-13) 7 commits
. SQUASH???
. cat-file: add remote-object-info to batch-command
. transport: add client support for object-info
. serve: advertise object-info feature
. protocol-caps: initialization bug fix
. fetch-pack: move fetch initialization
. fetch-pack: refactor packet writing
A client component to talk with the object-info endpoint.
Expecting a reroll.
Under SANITIZE=address, t1006-cat-file.sh finds a breakage.
cf. <20220728230210.2952731-1-calvinwan@google.com>
cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>
source: <20220728230210.2952731-1-calvinwan@google.com>
--------------------------------------------------
[Cooking]
* ab/cmake-nix-and-ci (2022-11-02) 12 commits
- CI: add a "linux-cmake-test" to run cmake & ctest on linux
- cmake: copy over git-p4.py for t983[56] perforce test
- cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults
- Makefile + cmake: use environment, not GIT-BUILD-DIR
- test-lib.sh: support a "GIT_TEST_BUILD_DIR"
- cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh
- cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable
- cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4
- cmake: don't copy chainlint.pl to build directory
- cmake: update instructions for portable CMakeLists.txt
- cmake: don't "mkdir -p" and "cd" in build instructions
- cmake: increase test timeout on Windows only
Fix assorted issues with CTest on *nix machines.
Waiting for review.
source: <cover-v3-00.12-00000000000-20221101T225022Z-avarab@gmail.com>
* ab/make-bin-wrappers (2022-10-31) 4 commits
- Makefile: simplify $(test_bindir_programs) rule by splitting it up
- Makefile: rename "test_bindir_programs" variable, pre-declare
- Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier
- Makefile: factor sed-powered '#!/bin/sh' munging into a variable
Resolve issues with the bin-wrappers/% rules where "make
bin-wrappers/git" would generate the script but not "git" itself.
Waiting for review.
source: <cover-v3-0.4-00000000000-20221031T222249Z-avarab@gmail.com>
* ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
(merged to 'next' on 2022-11-03 at 0f01b25561)
+ run-command tests: test stdout of run_command_parallel()
+ submodule tests: reset "trace.out" between "grep" invocations
+ hook tests: fix redirection logic error in 96e7225b310
Various test updates.
Waiting for review.
source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
* do/modernize-t7001 (2022-10-31) 1 commit
- t7001-mv.sh:modernizing test script using function
Modernize test script to avoid "test -f" and friends.
Will merge to 'next'.
source: <pull.1372.git.git.1667150441883.gitgitgadget@gmail.com>
* kz/merge-tree-merge-base (2022-11-01) 2 commits
- merge-tree.c: support --merge-base in conjunction with --stdin
- merge-tree.c: add --merge-base=<commit> option
"merge-tree" learns a new `--merge-base` option.
Waiting for review.
source: <pull.1397.v4.git.1667292904.gitgitgadget@gmail.com>
* mh/password-can-be-pat (2022-11-02) 1 commit
- Mention that password could be a personal access token.
Documentation update to git-credential(1).
Will merge to 'next'.
source: <pull.1396.v2.git.1667385022103.gitgitgadget@gmail.com>
* po/pretty-hard-trunc (2022-11-02) 1 commit
- pretty-formats: add hard truncation, without ellipsis, options
Add a new pretty format which truncates without ellipsis.
Missing test coverage.
source: <20221102120853.2013-1-philipoakley@iee.email>
* rr/long-status-advice (2022-10-31) 1 commit
- status: long status advice adapted to recent capabilities
The advice message emitted by a slow "status" run is amended to
mention fsmonitor.
Waiting for reviewer feedback on the updated round.
source: <pull.1384.v2.git.1667002005494.gitgitgadget@gmail.com>
* rs/archive-filter-error-once (2022-10-30) 1 commit
(merged to 'next' on 2022-11-03 at c2d1004d96)
+ archive-tar: report filter start error only once
"git archive" mistakenly complained twice about a missing executable,
which has been corrected.
Will merge to 'master'.
source: <c51b72e5-1c32-65e4-6faa-04693b623e2e@web.de>
* ab/config-multi-and-nonbool (2022-11-02) 9 commits
- for-each-repo: with bad config, don't conflate <path> and <cmd>
- config API: add "string" version of *_value_multi(), fix segfaults
- config API users: test for *_get_value_multi() segfaults
- for-each-repo: error on bad --config
- config API: have *_multi() return an "int" and take a "dest"
- versioncmp.c: refactor config reading next commit
- config tests: add "NULL" tests for *_get_value_multi()
- config tests: cover blind spots in git_die_config() tests
- for-each-repo tests: test bad --config keys
A mixed bag of config API updates.
Expecting a reroll.
cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
source: <cover-v2-0.9-00000000000-20221101T225822Z-avarab@gmail.com>
* ab/sha-makefile-doc (2022-10-26) 9 commits
- Makefile: discuss SHAttered in *_SHA{1,256} discussion
- Makefile: document default SHA-1 backend on OSX
- Makefile: document SHA-1 and SHA-256 default and selection order
- Makefile: document default SHA-256 backend
- Makefile: rephrase the discussion of *_SHA1 knobs
- Makefile: create and use sections for "define" flag listing
- Makefile: correct DC_SHA1 documentation
- INSTALL: remove discussion of SHA-1 backends
- Makefile: always (re)set DC_SHA1 on fallback
Makefile comments updates and reordering to clarify knobs used to
choose SHA implementations.
Will merge to 'next'?
source: <cover-v4-0.9-00000000000-20221026T145255Z-avarab@gmail.com>
* rs/no-more-run-command-v (2022-10-30) 12 commits
(merged to 'next' on 2022-11-03 at 27eb80811c)
+ replace and remove run_command_v_opt()
+ replace and remove run_command_v_opt_cd_env_tr2()
+ replace and remove run_command_v_opt_tr2()
+ replace and remove run_command_v_opt_cd_env()
+ use child_process members "args" and "env" directly
+ use child_process member "args" instead of string array variable
+ sequencer: simplify building argument list in do_exec()
+ bisect--helper: factor out do_bisect_run()
+ bisect: simplify building "checkout" argument list
+ am: simplify building "show" argument list
+ run-command: fix return value comment
+ merge: remove always-the-same "verbose" arguments
Simplify the run-command API.
Will merge to 'master'.
source: <ea061164-b36b-485c-963f-8c13e813a47e@web.de>
* tb/howto-using-redo-script (2022-10-26) 1 commit
(merged to 'next' on 2022-11-03 at 521600fd56)
+ Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
(this branch is used by tb/howto-maintain-git-fixes.)
Doc update.
Will merge to 'master'.
source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com>
* ps/receive-use-only-advertised (2022-10-28) 3 commits
- SQUASH - leakfix
- receive-pack: use advertised reference tips to inform connectivity check
- connected: allow supplying different view of reachable objects
"git receive-pack" used to use all the local refs as the boundary
for checking connectivity of the data "git push" sent, but now it
uses only the refs that it advertised to the pusher. In a
repository with the .hideRefs configuration, this reduces the
resource needed to perform the check, and also forces the pusher to
prove they have all objects that are necessary to complete the
history on top of only the history available to them.
Expecting a reroll.
cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com>
cf. <xmqqr0yrizqm.fsf@gitster.g>
source: <cover.1666967670.git.ps@pks.im>
* jc/set-gid-bit-less-aggressively (2022-10-28) 1 commit
(merged to 'next' on 2022-11-03 at 32bfd99ffd)
+ adjust_shared_perm(): leave g+s alone when the group does not matter
The adjust_shared_perm() helper function learned to refrain from
setting the "g+s" bit on directories when it is not necessary.
Will merge to 'master'.
source: <xmqqr0yrhco6.fsf@gitster.g>
* gc/submodule-clone-update-with-branches (2022-10-30) 8 commits
- clone, submodule update: create and check out branches
- submodule--helper: remove update_data.suboid
- submodule update: refactor update targets
- submodule: return target of submodule symref
- t5617: drop references to remote-tracking branches
- submodule--helper clone: create named branch
- repo-settings: add submodule_propagate_branches
- clone: teach --detach option
"git clone --recurse-submodules" and "git submodule update" learns
to honor the "propagete branches" option.
Waiting for review.
source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com>
* es/mark-gc-cruft-as-experimental (2022-10-26) 2 commits
(merged to 'next' on 2022-11-03 at 4079e1b06b)
+ config: let feature.experimental imply gc.cruftPacks=true
+ gc: add tests for --cruft and friends
Enable gc.cruftpacks by default for those who opt into
feature.experimental setting.
Will merge to 'master'.
source: <cover.1666819953.git.me@ttaylorr.com>
* pw/config-int-parse-fixes (2022-10-22) 3 commits
. git_parse_signed(): avoid integer overflow
. config: require at least one digit when parsing numbers
. git_parse_unsigned: reject negative values
Assorted fixes of parsing end-user input as integers.
Expecting a reroll to add test coverage.
cf. <Y1L+Qv+cs1bjqjK9@coredump.intra.peff.net>
source: <pull.1389.git.1666359915.gitgitgadget@gmail.com>
* sa/cat-file-mailmap (2022-10-21) 1 commit
. doc/cat-file: allow --use-mailmap for --batch options
Doc updates.
Waiting for review response.
source: <20221021103442.202759-1-siddharthasthana31@gmail.com>
* tb/repack-expire-to (2022-10-24) 4 commits
. builtin/repack.c: implement `--expire-to` for storing pruned objects
. builtin/repack.c: write cruft packs to arbitrary locations
. builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
. builtin/repack.c: pass "out" to `prepare_pack_objects`
"git repack" learns to send cruft objects out of the way into
packfiles outside the repository.
Waiting for review.
source: <cover.1666636974.git.me@ttaylorr.com>
* cc/filtered-repack (2022-10-25) 2 commits
. repack: add --filter=<filter-spec> option
. pack-objects: allow --filter without --stdout
"git repack" learns to discard objects that ought to be retrievable
again from the promissor remote.
Needs review.
source: <20221025122856.20204-1-christian.couder@gmail.com>
* al/trace2-clearing-skip-worktree (2022-10-31) 2 commits
- SQUASH???
- index: add trace2 region for clear skip worktree
Add trace2 counters to the region to clear skip worktree bits in a
sparse checkout.
Expecting a reroll?
source: <pull.1368.v3.git.git.1667177791591.gitgitgadget@gmail.com>
* po/glossary-around-traversal (2022-10-30) 4 commits
(merged to 'next' on 2022-11-03 at 58b659f92b)
+ glossary: add reachability bitmap description
+ glossary: add "commit graph" description
+ doc: use 'object database' not ODB or abbreviation
+ doc: use "commit-graph" hyphenation consistently
The glossary entries for "commit-graph file" and "reachability
bitmap" have been added.
Will merge to 'master'.
source: <20221029164112.2097-1-philipoakley@iee.email>
* mc/credential-helper-auth-headers (2022-11-02) 11 commits
- t5556: add HTTP authentication tests
- test-http-server: add simple authentication
- test-http-server: pass Git requests to http-backend
- test-http-server: add HTTP request parsing
- test-http-server: add HTTP error response function
- test-http-server: add stub HTTP server test helper
- http: set specific auth scheme depending on credential
- http: move proactive auth to first slot creation
- http: store all request headers on active_request_slot
- credential: add WWW-Authenticate header to cred requests
- http: read HTTP WWW-Authenticate response headers
Extending credential helper protocol.
Needs review.
source: <pull.1352.v3.git.1667426969.gitgitgadget@gmail.com>
* hl/archive-recursive (2022-10-19) 10 commits
. fixup! archive: add tests for git archive --recurse-submodules
. archive: add tests for git archive --recurse-submodules
. archive: add --recurse-submodules to git-archive command
. archive: remove global repository from archive_args
. archive: pass repo objects to write_archive handlers
. tree: add repository parameter to read_tree_fn_t
. tree: handle submodule case for read_tree_at properly
. tree: increase test coverage for tree.c
. tree: update cases to use repo_ tree methods
. tree: do not use the_repository for tree traversal methods.
"git archive" has been taught "--recurse-submodules" option to
create a tarball that includes contents from submodules.
Expecting a reroll.
Seems to break win+VS test(8).
cf. https://github.com/git/git/actions/runs/3293333066 whose only
difference from https://github.com/git/git/actions/runs/3293553109
is the inclusion of this topic.
source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
* en/sparse-checkout-design (2022-10-08) 1 commit
. sparse-checkout.txt: new document with sparse-checkout directions
Design doc.
Needs review.
source: <pull.1367.v3.git.1665269538608.gitgitgadget@gmail.com>
* pw/test-todo (2022-10-06) 3 commits
. test_todo: allow [verbose] test as the command
. test_todo: allow [!] grep as the command
. tests: add test_todo() to mark known breakages
RFC for test framework improvement.
Needs review.
source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
* ab/coccicheck-incremental (2022-11-02) 13 commits
- spatchcache: add a ccache-alike for "spatch"
- cocci: run against a generated ALL.cocci
- cocci rules: remove <id>'s from rules that don't need them
- Makefile: copy contrib/coccinelle/*.cocci to build/
- cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
- cocci: make "coccicheck" rule incremental
- cocci: split off "--all-includes" from SPATCH_FLAGS
- cocci: split off include-less "tests" from SPATCH_FLAGS
- Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
- Makefile: have "coccicheck" re-run if flags change
- Makefile: add ability to TAB-complete cocci *.patch rules
- cocci rules: remove unused "F" metavariable from pending rule
- Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
"make coccicheck" is time consuming. It has been made to run more
incrementally.
Will merge to 'next'?
source: <cover-v5-00.13-00000000000-20221101T222616Z-avarab@gmail.com>
^ permalink raw reply [relevance 2%]
* Re: [PATCH v2] t7001-mv.sh: modernizing test script using functions
2022-11-03 18:39 13% ` [PATCH v2] t7001-mv.sh: modernizing test script using functions Debra Obondo via GitGitGadget
@ 2022-11-03 19:37 6% ` Martin Ågren
2022-11-04 15:05 13% ` [PATCH v3] " Debra Obondo via GitGitGadget
1 sibling, 0 replies; 200+ results
From: Martin Ågren @ 2022-11-03 19:37 UTC (permalink / raw)
To: Debra Obondo via GitGitGadget; +Cc: git, Taylor Blau, Debra Obondo
On Thu, 3 Nov 2022 at 19:39, Debra Obondo via GitGitGadget
<gitgitgadget@gmail.com> wrote:
>
> From: Debra Obondo <debraobondo@gmail.com>
>
> Test script to verify the presence/absence of files, paths, directories,
> symlinks and other features in 'git mv' command are using the command
> format:
>
> 'test (-e|f|d|h|...)'
>
> Replace them with helper functions of format:
>
> 'test_path_is_*'
Ok.
> Changes since v1
>
> Replacing idiomatic helper functions
>
> '! test_path_is_*'
>
> with
>
> 'test_path_is_missing'
>
The above "Changes since v1" and what I've quoted here should probably
be dropped. We prefer our patches to look as if they've appeared out of
the blue in perfect shape. :-)
> This uses values of 'test_path_bar' in place of '! test_path_foo' to
> bring in the helpful factor of indicating the failure of tests after the
> mv command has been used, that is, it echoes if the feature/test_path
> exists.
This paragraph is excellent. It describes why you've done the patch this
way. This looks much better than version 1 of the patch!
> Signed-off-by: Debra Obondo <debraobondo@gmail.com>
After removing the lines about changes since v1, this patch is
Reviewed-by: Martin Ågren <martin.agren@gmail.com>
> ---
> [PATCH v2] [OUTREACHY] t7001-mv.sh : Use test_path_is_* functions in
> test script
>
> Changes since v1:
>
> Replacing idiomatic helper functions
>
> '! test_path_is_*'
>
> with
>
> 'test_path_is_missing'
This place after the "---" line is an excellent place for including such
"here's what has changed since v1" comments. Good. They will not appear
in the final commit message.
Thanks for contributing!
Martin
^ permalink raw reply [relevance 6%]
* [PATCH v2] t7001-mv.sh: modernizing test script using functions
2022-10-30 17:20 13% [PATCH] t7001-mv.sh:modernizing test script using function Debra Obondo via GitGitGadget
2022-10-30 18:00 6% ` Taylor Blau
2022-10-31 18:04 10% ` Martin Ågren
@ 2022-11-03 18:39 13% ` Debra Obondo via GitGitGadget
2022-11-03 19:37 6% ` Martin Ågren
2022-11-04 15:05 13% ` [PATCH v3] " Debra Obondo via GitGitGadget
2 siblings, 2 replies; 200+ results
From: Debra Obondo via GitGitGadget @ 2022-11-03 18:39 UTC (permalink / raw)
To: git; +Cc: Taylor Blau, Martin Ågren, Debra Obondo, Debra Obondo
From: Debra Obondo <debraobondo@gmail.com>
Test script to verify the presence/absence of files, paths, directories,
symlinks and other features in 'git mv' command are using the command
format:
'test (-e|f|d|h|...)'
Replace them with helper functions of format:
'test_path_is_*'
Changes since v1
Replacing idiomatic helper functions
'! test_path_is_*'
with
'test_path_is_missing'
This uses values of 'test_path_bar' in place of '! test_path_foo' to
bring in the helpful factor of indicating the failure of tests after the
mv command has been used, that is, it echoes if the feature/test_path
exists.
Signed-off-by: Debra Obondo <debraobondo@gmail.com>
---
[PATCH v2] [OUTREACHY] t7001-mv.sh : Use test_path_is_* functions in
test script
Changes since v1:
Replacing idiomatic helper functions
'! test_path_is_*'
with
'test_path_is_missing'
This uses values of 'test_path_bar' in place of '! test_path_foo' to
bring in the helpful factor of indicating the failure of tests after the
mv command has been used, that is, it echoes if the feature/test_path
exists (This was suggested by Martin Ågren).
Older test scripts use the command 'test -' to verify the presence or
absence of features such as files, directories and symbolic links. This
however requires slightly complicated uses, such as 'test ! -f '. The
helper functions 'test_path_is_' located in t/test-lib-functions.sh have
taken into account all scenarios of the 'test -*' to reduce errors. This
was a microproject to replace them with the helper functions.
Test script to verify the presence/absence of files, paths,
directories,symboliclinks and many other features in mv command are
using the command format
'test -(e|f|s|h|...).
Replace them with helper functions of format
'test_path_is_*'
Signed-off-by: Debra Obondo debraobondo@gmail.com
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1372%2Ffobiasic07%2Ft7001-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1372/fobiasic07/t7001-v2
Pull-Request: https://github.com/git/git/pull/1372
Range-diff vs v1:
1: b977c4ad26a ! 1: c6640ebff66 t7001-mv.sh:modernizing test script using function
@@ Metadata
Author: Debra Obondo <debraobondo@gmail.com>
## Commit message ##
- t7001-mv.sh:modernizing test script using function
+ t7001-mv.sh: modernizing test script using functions
Test script to verify the presence/absence of files, paths, directories,
symlinks and other features in 'git mv' command are using the command
@@ Commit message
'test_path_is_*'
+ Changes since v1
+
+ Replacing idiomatic helper functions
+
+ '! test_path_is_*'
+
+ with
+
+ 'test_path_is_missing'
+
+ This uses values of 'test_path_bar' in place of '! test_path_foo' to
+ bring in the helpful factor of indicating the failure of tests after the
+ mv command has been used, that is, it echoes if the feature/test_path
+ exists.
+
Signed-off-by: Debra Obondo <debraobondo@gmail.com>
## t/t7001-mv.sh ##
@@ t/t7001-mv.sh: test_expect_success 'checking the commit' '
- test -f path0/COPYING &&
- test ! -f MOVED
+ test_path_is_file path0/COPYING &&
-+ ! test_path_is_file MOVED
++ test_path_is_missing MOVED
'
test_expect_success 'checking -k on non-existing file' '
@@ t/t7001-mv.sh: test_expect_success 'checking -k on non-existing file' '
- test -f untracked1 &&
- test ! -f path0/untracked1
+ test_path_is_file untracked1 &&
-+ ! test_path_is_file path0/untracked1
++ test_path_is_missing path0/untracked1
'
test_expect_success 'checking -k on multiple untracked files' '
@@ t/t7001-mv.sh: test_expect_success 'checking -k on non-existing file' '
- test ! -f path0/untracked2
+ test_path_is_file untracked1 &&
+ test_path_is_file untracked2 &&
-+ ! test_path_is_file path0/untracked1 &&
-+ ! test_path_is_file path0/untracked2
++ test_path_is_missing path0/untracked1 &&
++ test_path_is_missing path0/untracked2
'
test_expect_success 'checking -f on untracked file with existing target' '
@@ t/t7001-mv.sh: test_expect_success 'checking -k on non-existing file' '
- test ! -f .git/index.lock &&
- test -f untracked1 &&
- test -f path0/untracked1
-+ ! test_path_is_file .git/index.lock &&
++ test_path_is_missing .git/index.lock &&
+ test_path_is_file untracked1 &&
+ test_path_is_file path0/untracked1
'
@@ t/t7001-mv.sh: test_expect_success 'absolute pathname' '
git mv sub "$(pwd)/in" &&
- ! test -d sub &&
- test -d in &&
-+ ! test_path_is_dir sub &&
++ test_path_is_missing sub &&
+ test_path_is_dir in &&
git ls-files --error-unmatch in/file
)
@@ t/t7001-mv.sh: test_expect_success 'absolute pathname outside should fail' '
- test -d sub &&
- ! test -d ../in &&
+ test_path_is_dir sub &&
-+ ! test_path_is_dir ../in &&
++ test_path_is_missing ../in &&
git ls-files --error-unmatch sub/file
)
'
@@ t/t7001-mv.sh: test_expect_success 'git mv should overwrite symlink to a file' '
git mv -f moved symlink &&
- ! test -e moved &&
- test -f symlink &&
-+ ! test_path_exists moved &&
++ test_path_is_missing moved &&
+ test_path_is_file symlink &&
test "$(cat symlink)" = 1 &&
git update-index --refresh &&
@@ t/t7001-mv.sh: test_expect_success 'git mv should overwrite file with a symlink'
test_must_fail git mv symlink moved &&
git mv -f symlink moved &&
- ! test -e symlink &&
-+ ! test_path_exists symlink &&
++ test_path_is_missing symlink &&
git update-index --refresh &&
git diff-files --quiet
'
@@ t/t7001-mv.sh: test_expect_success 'git mv moves a submodule with a .git directo
mkdir mod &&
git mv sub mod/sub &&
- ! test -e sub &&
-+ ! test_path_exists sub &&
++ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ t/t7001-mv.sh: test_expect_success 'git mv moves a submodule with a .git directo
mkdir mod &&
git mv sub mod/sub &&
- ! test -e sub &&
-+ ! test_path_exists sub &&
++ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
@@ t/t7001-mv.sh: test_expect_success 'git mv moves a submodule with gitfile' '
mkdir mod &&
git -C mod mv ../sub/ . &&
- ! test -e sub &&
-+ ! test_path_exists sub &&
++ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
@@ t/t7001-mv.sh: test_expect_success 'mv does not complain when no .gitmodules fil
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
- ! test -e sub &&
-+ ! test_path_exists sub &&
++ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ t/t7001-mv.sh: test_expect_success 'mv will error out on a modified .gitmodules
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
- ! test -e sub &&
-+ ! test_path_exists sub &&
++ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ t/t7001-mv.sh: test_expect_success 'mv issues a warning when section is not foun
git mv sub mod/sub 2>actual.err &&
test_cmp expect.err actual.err &&
- ! test -e sub &&
-+ ! test_path_exists sub &&
++ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ t/t7001-mv.sh: test_expect_success 'checking out a commit before submodule moved
test_cmp expected actual &&
- ! test -f sub/.git &&
- test -f sub2/.git &&
-+ ! test_path_is_file sub/.git &&
++ test_path_is_missing sub/.git &&
+ test_path_is_file sub2/.git &&
git submodule update &&
- test -f sub/.git &&
t/t7001-mv.sh | 62 +++++++++++++++++++++++++--------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 8c37bceb336..d72cef88264 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -60,8 +60,8 @@ test_expect_success 'checking the commit' '
test_expect_success 'mv --dry-run does not move file' '
git mv -n path0/COPYING MOVED &&
- test -f path0/COPYING &&
- test ! -f MOVED
+ test_path_is_file path0/COPYING &&
+ test_path_is_missing MOVED
'
test_expect_success 'checking -k on non-existing file' '
@@ -71,25 +71,25 @@ test_expect_success 'checking -k on non-existing file' '
test_expect_success 'checking -k on untracked file' '
>untracked1 &&
git mv -k untracked1 path0 &&
- test -f untracked1 &&
- test ! -f path0/untracked1
+ test_path_is_file untracked1 &&
+ test_path_is_missing path0/untracked1
'
test_expect_success 'checking -k on multiple untracked files' '
>untracked2 &&
git mv -k untracked1 untracked2 path0 &&
- test -f untracked1 &&
- test -f untracked2 &&
- test ! -f path0/untracked1 &&
- test ! -f path0/untracked2
+ test_path_is_file untracked1 &&
+ test_path_is_file untracked2 &&
+ test_path_is_missing path0/untracked1 &&
+ test_path_is_missing path0/untracked2
'
test_expect_success 'checking -f on untracked file with existing target' '
>path0/untracked1 &&
test_must_fail git mv -f untracked1 path0 &&
- test ! -f .git/index.lock &&
- test -f untracked1 &&
- test -f path0/untracked1
+ test_path_is_missing .git/index.lock &&
+ test_path_is_file untracked1 &&
+ test_path_is_file path0/untracked1
'
# clean up the mess in case bad things happen
@@ -215,8 +215,8 @@ test_expect_success 'absolute pathname' '
git add sub/file &&
git mv sub "$(pwd)/in" &&
- ! test -d sub &&
- test -d in &&
+ test_path_is_missing sub &&
+ test_path_is_dir in &&
git ls-files --error-unmatch in/file
)
'
@@ -234,8 +234,8 @@ test_expect_success 'absolute pathname outside should fail' '
git add sub/file &&
test_must_fail git mv sub "$out/out" &&
- test -d sub &&
- ! test -d ../in &&
+ test_path_is_dir sub &&
+ test_path_is_missing ../in &&
git ls-files --error-unmatch sub/file
)
'
@@ -295,8 +295,8 @@ test_expect_success 'git mv should overwrite symlink to a file' '
git add moved &&
test_must_fail git mv moved symlink &&
git mv -f moved symlink &&
- ! test -e moved &&
- test -f symlink &&
+ test_path_is_missing moved &&
+ test_path_is_file symlink &&
test "$(cat symlink)" = 1 &&
git update-index --refresh &&
git diff-files --quiet
@@ -312,13 +312,13 @@ test_expect_success 'git mv should overwrite file with a symlink' '
git add moved &&
test_must_fail git mv symlink moved &&
git mv -f symlink moved &&
- ! test -e symlink &&
+ test_path_is_missing symlink &&
git update-index --refresh &&
git diff-files --quiet
'
test_expect_success SYMLINKS 'check moved symlink' '
- test -h moved
+ test_path_is_symlink moved
'
rm -f moved symlink
@@ -352,7 +352,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
) &&
mkdir mod &&
git mv sub mod/sub &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -372,7 +372,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
) &&
mkdir mod &&
git mv sub mod/sub &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
@@ -389,7 +389,7 @@ test_expect_success 'git mv moves a submodule with gitfile' '
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
git -C mod mv ../sub/ . &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
@@ -408,7 +408,7 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -423,13 +423,13 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
test_must_fail git mv sub mod/sub 2>actual.err &&
- test -s actual.err &&
- test -e sub &&
+ test_file_not_empty actual.err &&
+ test_path_exists sub &&
git diff-files --quiet -- sub &&
git add .gitmodules &&
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -447,7 +447,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
test_cmp expect.err actual.err &&
- ! test -e sub &&
+ test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -460,7 +460,7 @@ test_expect_success 'mv --dry-run does not touch the submodule or .gitmodules' '
git submodule update &&
mkdir mod &&
git mv -n sub mod/sub 2>actual.err &&
- test -f sub/.git &&
+ test_path_is_file sub/.git &&
git diff-index --exit-code HEAD &&
git update-index --refresh &&
git diff-files --quiet -- sub .gitmodules
@@ -474,10 +474,10 @@ test_expect_success 'checking out a commit before submodule moved needs manual u
git status -s sub2 >actual &&
echo "?? sub2/" >expected &&
test_cmp expected actual &&
- ! test -f sub/.git &&
- test -f sub2/.git &&
+ test_path_is_missing sub/.git &&
+ test_path_is_file sub2/.git &&
git submodule update &&
- test -f sub/.git &&
+ test_path_is_file sub/.git &&
rm -rf sub2 &&
git diff-index --exit-code HEAD &&
git update-index --refresh &&
base-commit: 1fc3c0ad407008c2f71dd9ae1241d8b75f8ef886
--
gitgitgadget
^ permalink raw reply related [relevance 13%]
* Re: [PATCH] t7001-mv.sh:modernizing test script using function
2022-10-31 18:04 10% ` Martin Ågren
@ 2022-11-01 1:14 6% ` Taylor Blau
0 siblings, 0 replies; 200+ results
From: Taylor Blau @ 2022-11-01 1:14 UTC (permalink / raw)
To: Martin Ågren
Cc: Debra Obondo via GitGitGadget, Git Mailing List, Debra Obondo
On Mon, Oct 31, 2022 at 07:04:20PM +0100, Martin Ågren wrote:
> Hi Debra,
>
> On Sun, 30 Oct 2022 at 18:35, Debra Obondo via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
> >
> > From: Debra Obondo <debraobondo@gmail.com>
> >
> > Test script to verify the presence/absence of files, paths, directories,
> > symlinks and other features in 'git mv' command are using the command
> > format:
> >
> > 'test (-e|f|d|h|...)'
> >
> > Replace them with helper functions of format:
> >
> > 'test_path_is_*'
>
> This is a good idea.
>
> The subject of this patch could use a space after the colon. You could
> also write "modernize" to give an order to the code base. So something
> like
>
> t7001-mv.sh: modernize test script using function
>
> perhaps. "Function" is a bit vague, perhaps.
>
> I wanted to comment on this:
>
> > test_expect_success 'mv --dry-run does not move file' '
> > git mv -n path0/COPYING MOVED &&
> > - test -f path0/COPYING &&
> > - test ! -f MOVED
> > + test_path_is_file path0/COPYING &&
> > + ! test_path_is_file MOVED
> > '
>
> It is my understanding that we prefer to only use such a helper when we
> really expect the file to exist. If the path is not a file, this helper
> prints a helpful message before returning with an error.
>
> Here, this means we will emit this 'helpful'
>
> File MOVED doesn't exist
>
> on every test run, when really everything is as it should. And if the
> file is actually there, i.e., we have a bug, we'll emit nothing -- but
> that is precisely when we would want some diagnostics such as
>
> Path exists:
> ... MOVED ...
>
> to show us that the file actually exists, contrary to the test's
> expectations.
>
> Such output is precisely what `test_path_is_missing` would give us. :-)
>
> My gut feeling is that where this patch adds "! test_path_foo", it
> should use "test_path_bar" instead, for various values of "foo" and
> "bar". What do you think about that?
All good suggestions, thanks. I'll hold this back while we wait for a
rerolled version.
Thanks,
Taylor
^ permalink raw reply [relevance 6%]
* Re: [PATCH] t7001-mv.sh:modernizing test script using function
2022-10-30 17:20 13% [PATCH] t7001-mv.sh:modernizing test script using function Debra Obondo via GitGitGadget
2022-10-30 18:00 6% ` Taylor Blau
@ 2022-10-31 18:04 10% ` Martin Ågren
2022-11-01 1:14 6% ` Taylor Blau
2022-11-03 18:39 13% ` [PATCH v2] t7001-mv.sh: modernizing test script using functions Debra Obondo via GitGitGadget
2 siblings, 1 reply; 200+ results
From: Martin Ågren @ 2022-10-31 18:04 UTC (permalink / raw)
To: Debra Obondo via GitGitGadget; +Cc: Git Mailing List, Debra Obondo
Hi Debra,
On Sun, 30 Oct 2022 at 18:35, Debra Obondo via GitGitGadget
<gitgitgadget@gmail.com> wrote:
>
> From: Debra Obondo <debraobondo@gmail.com>
>
> Test script to verify the presence/absence of files, paths, directories,
> symlinks and other features in 'git mv' command are using the command
> format:
>
> 'test (-e|f|d|h|...)'
>
> Replace them with helper functions of format:
>
> 'test_path_is_*'
This is a good idea.
The subject of this patch could use a space after the colon. You could
also write "modernize" to give an order to the code base. So something
like
t7001-mv.sh: modernize test script using function
perhaps. "Function" is a bit vague, perhaps.
I wanted to comment on this:
> test_expect_success 'mv --dry-run does not move file' '
> git mv -n path0/COPYING MOVED &&
> - test -f path0/COPYING &&
> - test ! -f MOVED
> + test_path_is_file path0/COPYING &&
> + ! test_path_is_file MOVED
> '
It is my understanding that we prefer to only use such a helper when we
really expect the file to exist. If the path is not a file, this helper
prints a helpful message before returning with an error.
Here, this means we will emit this 'helpful'
File MOVED doesn't exist
on every test run, when really everything is as it should. And if the
file is actually there, i.e., we have a bug, we'll emit nothing -- but
that is precisely when we would want some diagnostics such as
Path exists:
... MOVED ...
to show us that the file actually exists, contrary to the test's
expectations.
Such output is precisely what `test_path_is_missing` would give us. :-)
My gut feeling is that where this patch adds "! test_path_foo", it
should use "test_path_bar" instead, for various values of "foo" and
"bar". What do you think about that?
Martin
^ permalink raw reply [relevance 10%]
* What's cooking in git.git (Oct 2022, #09; Mon, 31)
@ 2022-10-31 5:31 2% Taylor Blau
0 siblings, 0 replies; 200+ results
From: Taylor Blau @ 2022-10-31 5:31 UTC (permalink / raw)
To: git
What's cooking in git.git (Oct 2022, #09; Mon, 31)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a future
release). Commits prefixed with '-' are only in 'seen', and aren't
considered "accepted" at all. A topic without enough support may be
discarded after a long period of no activity.
This is the first pushout from the interim maintainer. Topics which
were marked as ready for 'master' have been merged, and 'next' is now
empty. A number of topics have been marked for 'next' which will start
graduating in the next round.
Please point out any glitches you see along the way. If a topic you
sent doesn't appear here, please nudge me or resend it.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
https://github.com/git/git/
The following mirrors are currently out-of-date while the usual
maintainer is offline.
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/ttaylorr/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are typically published in these repositories
for convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
...but these and the release tarballs below are similarly out-of-date:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ds/bundle-uri-3 (2022-10-12) 13 commits
(merged to 'next' on 2022-10-28 at 9d9092b4cc)
+ bundle-uri: suppress stderr from remote-https
+ bundle-uri: quiet failed unbundlings
+ bundle: add flags to verify_bundle()
+ bundle-uri: fetch a list of bundles
+ bundle: properly clear all revision flags
+ bundle-uri: limit recursion depth for bundle lists
+ bundle-uri: parse bundle list in config format
+ bundle-uri: unit test "key=value" parsing
+ bundle-uri: create "key=value" line parsing
+ bundle-uri: create base key-value pair parsing
+ bundle-uri: create bundle_list struct and helpers
+ bundle-uri: use plain string in find_temp_filename()
+ Merge branch 'ds/bundle-uri-clone' into ds/bundle-uri-3
Define the logical elements of a "bundle list", data structure to
store them in-core, format to transfer them, and code to parse
them.
source: <pull.1333.v5.git.1665579160.gitgitgadget@gmail.com>
* en/merge-tree-sequence (2022-10-22) 2 commits
(merged to 'next' on 2022-10-28 at 31459cd5a8)
+ merge-tree: support multiple batched merges with --stdin
+ merge-tree: update documentation for differences in -z output
"git merge-tree --stdin" is a new way to request a series of merges
and report the merge results.
source: <pull.1361.git.1666488485.gitgitgadget@gmail.com>
* en/ort-dir-rename-and-symlink-fix (2022-10-22) 1 commit
(merged to 'next' on 2022-10-27 at 56f1e5222d)
+ merge-ort: fix bug with dir rename vs change dir to symlink
Merging a branch with directory renames into a branch that changes
the directory to a symlink was mishandled by the ort merge
strategy, which has been corrected.
source: <pull.1391.git.1666465450590.gitgitgadget@gmail.com>
* jc/doc-fsck-msgids (2022-10-25) 4 commits
(merged to 'next' on 2022-10-28 at 3c00edabf8)
+ Documentation: add lint-fsck-msgids
+ fsck: document msg-id
+ fsck: remove the unused MISSING_TREE_OBJECT
+ fsck: remove the unused BAD_TAG_OBJECT
Add documentation for message IDs in fsck error messages.
source: <20221025224224.2352979-1-gitster@pobox.com>
* jh/trace2-timers-and-counters (2022-10-24) 8 commits
(merged to 'next' on 2022-10-26 at e4933e2658)
+ trace2: add global counter mechanism
+ trace2: add stopwatch timers
+ trace2: convert ctx.thread_name from strbuf to pointer
+ trace2: improve thread-name documentation in the thread-context
+ trace2: rename the thread_name argument to trace2_thread_start
+ api-trace2.txt: elminate section describing the public trace2 API
+ tr2tls: clarify TLS terminology
+ trace2: use size_t alloc,nr_open_regions in tr2tls_thread_ctx
Two new facilities, "timer" and "counter", are introduced to the
trace2 API.
source: <pull.1373.v4.git.1666618868.gitgitgadget@gmail.com>
* jk/repack-tempfile-cleanup (2022-10-23) 6 commits
(merged to 'next' on 2022-10-26 at e706eb120c)
+ t7700: annotate cruft-pack failure with ok=sigpipe
+ repack: drop remove_temporary_files()
+ repack: use tempfiles for signal cleanup
+ repack: expand error message for missing pack files
+ repack: populate extension bits incrementally
+ repack: convert "names" util bitfield to array
The way "git repack" creared temporary files when it received a
signal was prone to deadlocking, which has been corrected.
source: <Y1M3fVnixJHvKiSg@coredump.intra.peff.net>
* jr/embargoed-releases-doc (2022-10-24) 1 commit
(merged to 'next' on 2022-10-27 at c000502eaa)
+ embargoed releases: also describe the git-security list and the process
The role the security mailing list plays in an embargoed release
has been documented.
source: <pull.1345.v4.git.1666649239302.gitgitgadget@gmail.com>
* jt/skipping-negotiator-wo-recursion (2022-10-25) 1 commit
(merged to 'next' on 2022-10-28 at 4a2588ab9e)
+ negotiator/skipping: avoid stack overflow
Rewrite a deep recursion in the skipping negotiator to use a loop
with on-heap prio queue to avoid stack wastage.
source: <20221025232934.1504445-1-jonathantanmy@google.com>
* jz/patch-id (2022-10-24) 6 commits
(merged to 'next' on 2022-10-24 at 1ac3b46fbe)
+ builtin: patch-id: remove unused diff-tree prefix
+ builtin: patch-id: add --verbatim as a command mode
+ patch-id: fix patch-id for mode changes
+ builtin: patch-id: fix patch-id with binary diffs
+ patch-id: use stable patch-id for rebases
+ patch-id: fix stable patch id for binary / header-only
A new "--include-whitespace" option is added to "git patch-id", and
existing bugs in the internal patch-id logic that did not match
what "git patch-id" produces have been corrected.
source: <pull.1359.v5.git.1666642064.gitgitgadget@gmail.com>
* pb/subtree-split-and-merge-after-squashing-tag-fix (2022-10-21) 9 commits
(merged to 'next' on 2022-10-27 at 4f2134dd87)
+ subtree: fix split after annotated tag was squashed merged
+ subtree: fix squash merging after annotated tag was squashed merged
+ subtree: process 'git-subtree-split' trailer in separate function
+ subtree: use named variables instead of "$@" in cmd_pull
+ subtree: define a variable before its first use in 'find_latest_squash'
+ subtree: prefix die messages with 'fatal'
+ subtree: add 'die_incompatible_opt' function to reduce duplication
+ subtree: use 'git rev-parse --verify [--quiet]' for better error messages
+ test-lib-functions: mark 'test_commit' variables as 'local'
A bugfix to "git subtree" in its split and merge features.
source: <pull.1390.git.1666365219.gitgitgadget@gmail.com>
* pw/rebase-keep-base-fixes (2022-10-17) 8 commits
(merged to 'next' on 2022-10-27 at 802359afac)
+ rebase --keep-base: imply --no-fork-point
+ rebase --keep-base: imply --reapply-cherry-picks
+ rebase: factor out branch_base calculation
+ rebase: rename merge_base to branch_base
+ rebase: store orig_head as a commit
+ rebase: be stricter when reading state files containing oids
+ t3416: set $EDITOR in subshell
+ t3416: tighten two tests
(this branch is used by pw/rebase-reflog-fixes.)
"git rebase --keep-base" used to discard the commits that are
already cherry-picked to the upstream, even when "keep-base" meant
that the base, on top of which the history is being rebuilt, does
not yet include these cherry-picked commits. The --keep-base
option now implies --reapply-cherry-picks and --no-fork-point
options.
source: <pull.1323.v4.git.1666012665.gitgitgadget@gmail.com>
* pw/rebase-reflog-fixes (2022-10-17) 9 commits
(merged to 'next' on 2022-10-27 at 60738821ef)
+ rebase: cleanup action handling
+ rebase --abort: improve reflog message
+ rebase --apply: make reflog messages match rebase --merge
+ rebase --apply: respect GIT_REFLOG_ACTION
+ rebase --merge: fix reflog message after skipping
+ rebase --merge: fix reflog when continuing
+ t3406: rework rebase reflog tests
+ rebase --apply: remove duplicated code
+ Merge branch 'pw/rebase-keep-base-fixes' into pw/rebase-reflog-fixes
(this branch uses pw/rebase-keep-base-fixes.)
Fix some bugs in the reflog messages when rebasing and changes the
reflog messages of "rebase --apply" to match "rebase --merge" with
the aim of making the reflog easier to parse.
source: <pull.1150.v3.git.1665567312.gitgitgadget@gmail.com>
* rj/branch-copy-rename-error-codepath-cleanup (2022-10-26) 1 commit
(merged to 'next' on 2022-10-27 at f01a4ff619)
+ branch: error copying or renaming a detached HEAD
Code simplification.
source: <0ac8cd48-08d7-9bdd-b074-c8d5ded522f6@gmail.com>
* rj/branch-do-not-exit-with-minus-one-status (2022-10-26) 1 commit
(merged to 'next' on 2022-10-27 at 061f63d4e2)
+ branch: error code with --edit-description
"git branch --edit-description" can exit with status -1 which is
not a good practice; it learned to use 1 as everybody else instead.
source: <b0f96b35-4e69-a889-bcdf-e0b40b89384f@gmail.com>
* rs/absorb-git-dir-simplify (2022-10-23) 1 commit
(merged to 'next' on 2022-10-26 at 3d23cfd399)
+ submodule: use strvec_pushf() for --super-prefix
Code simplification by using strvec_pushf() instead of building an
argument in a separate strbuf.
source: <7a4e2fc6-3e01-5683-2be5-13b7e67c7fe5@web.de>
* sd/doc-smtp-encryption (2022-10-12) 1 commit
(merged to 'next' on 2022-10-26 at b984763a1b)
+ docs: git-send-email: difference between ssl and tls smtp-encryption
Will merge to 'master'.
source: <20221012150619.12877-1-sndanailov@wired4ever.net>
* sg/stable-docdep (2022-10-21) 1 commit
(merged to 'next' on 2022-10-26 at 68432e1b2c)
+ Documentation/build-docdep.perl: generate sorted output
Make sure generated dependency file is stably sorted to help
developers debugging their build issues.
source: <20221021102950.539148-1-szeder.dev@gmail.com>
* tb/cap-patch-at-1gb (2022-10-25) 1 commit
(merged to 'next' on 2022-10-27 at f0b4f9c12a)
+ apply: reject patches larger than ~1 GiB
"git apply" limits its input to a bit less than 1 GiB.
source: <70f5763834dff373a5573a99ec4cdfa36cadf34c.1666722251.git.me@ttaylorr.com>
* tb/midx-cleanup-fix (2022-10-25) 1 commit
- midx.c: clear auxiliary MIDX files first
The order in which multi-pack-index and its associated files are
dropped has been tweaked to make it safer for concurrent users.
Under discussion, but leaning to negative..
cf. <143a588a-c98b-733b-2b23-34a87ca89431@github.com>
source: <bf36093cd6d7ac83b16241b0199b3a8c904e6774.1666722316.git.me@ttaylorr.com>
* tb/shortlog-group (2022-10-24) 7 commits
(merged to 'next' on 2022-10-26 at 76e64a6036)
+ shortlog: implement `--group=committer` in terms of `--group=<format>`
+ shortlog: implement `--group=author` in terms of `--group=<format>`
+ shortlog: extract `shortlog_finish_setup()`
+ shortlog: support arbitrary commit format `--group`s
+ shortlog: extract `--group` fragment for translation
+ shortlog: make trailer insertion a noop when appropriate
+ shortlog: accept `--date`-related options
"git shortlog" learned to group by the "format" string.
source: <cover.1666637725.git.me@ttaylorr.com>
--------------------------------------------------
[New Topics]
* ab/cmake-nix-and-ci (2022-10-30) 11 commits
- CI: add a "linux-cmake-test" to run cmake & ctest on linux
- cmake: copy over git-p4.py for t983[56] perforce test
- cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults
- Makefile + cmake: use environment, not GIT-BUILD-DIR
- test-lib.sh: support a "GIT_TEST_BUILD_DIR"
- cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh
- cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable
- cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4
- cmake: don't copy chainlint.pl to build directory
- cmake: update instructions for portable CMakeLists.txt
- cmake: don't "mkdir -p" and "cd" in build instructions
Fix assorted issues with CTest on *nix machines.
Waiting for review.
source: <cover-v2-00.11-00000000000-20221027T032622Z-avarab@gmail.com>
* ab/make-bin-wrappers (2022-10-30) 3 commits
- Makefile: simplify $(test_bindir_programs) rule by splitting it up
- Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier
- Makefile: factor sed-powered '#!/bin/sh' munging into a variable
Resolve issues with the bin-wrappers/% rules where "make
bin-wrappers/git" would generate the script but not "git" itself.
Waiting for review.
source: <cover-v2-0.3-00000000000-20221026T143533Z-avarab@gmail.com>
* ab/misc-hook-submodule-run-command (2022-10-31) 3 commits
- run-command tests: test stdout of run_command_parallel()
- submodule tests: reset "trace.out" between "grep" invocations
- hook tests: fix redirection logic error in 96e7225b310
Various test updates.
Waiting for review.
source: <cover-0.3-00000000000-20221029T025520Z-avarab@gmail.com>
* do/modernize-t7001 (2022-10-31) 1 commit
- t7001-mv.sh:modernizing test script using function
Modernize test script to avoid "test -f" and friends.
Will merge to 'next'.
source: <pull.1372.git.git.1667150441883.gitgitgadget@gmail.com>
* kz/merge-tree-merge-base (2022-10-29) 1 commit
- merge-tree.c: add --merge-base=<commit> option
"merge-tree" learns a new `--merge-base` option.
Waiting for review.
source: <pull.1397.v3.git.1667014975042.gitgitgadget@gmail.com>
* mh/password-can-be-pat (2022-10-30) 1 commit
- Mention that password could be a personal access token.
Documentation update to git-credential(1).
Will merge to 'next'.
source: <pull.1396.git.1666845947898.gitgitgadget@gmail.com>
* po/pretty-hard-trunc (2022-10-30) 1 commit
- pretty-formats: add hard truncation, without ellipsis, options
Add a new pretty format which truncates without ellipsis.
Missing test coverage.
source: <20221030185614.3842-1-philipoakley@iee.email>
* rr/long-status-advice (2022-10-31) 1 commit
- status: long status advice adapted to recent capabilities
The advice message emitted by a slow "status" run is amended to
mention fsmonitor.
Waiting for reviewer feedback on the updated round.
source: <pull.1384.v2.git.1667002005494.gitgitgadget@gmail.com>
* rs/archive-filter-error-once (2022-10-30) 1 commit
- archive-tar: report filter start error only once
"git archive" mistakenly complained twice about a missing executable,
which has been corrected.
Will merge to 'next'.
source: <c51b72e5-1c32-65e4-6faa-04693b623e2e@web.de>
--------------------------------------------------
[Stalled]
* cw/submodule-status-in-parallel (2022-10-20) 7 commits
. diff-lib: parallelize run_diff_files for submodules
. diff-lib: refactor match_stat_with_submodule
. submodule: move status parsing into function
. submodule: strbuf variable rename
. run-command: add hide_output to run_processes_parallel_opts
. run-command: add pipe_output_fn to run_processes_parallel_opts
. Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel
Allow the internal "diff-files" engine to run "how has this
submodule changed?" in parallel to speed up "git status".
Breaks winVS test?
cf. <https://github.com/git/git/actions/runs/3298596454/jobs/5441029092>
source: <20221011232604.839941-1-calvinwan@google.com>
* js/bisect-in-c (2022-08-30) 17 commits
. bisect: no longer try to clean up left-over `.git/head-name` files
. bisect: remove Cogito-related code
. Turn `git bisect` into a full built-in
. bisect: move even the command-line parsing to `bisect--helper`
. bisect--helper: make `state` optional
. bisect--helper: calling `bisect_state()` without an argument is a bug
. bisect: avoid double-quoting when printing the failed command
. bisect run: fix the error message
. bisect: verify that a bogus option won't try to start a bisection
. bisect--helper: migrate to OPT_SUBCOMMAND()
. bisect--helper: make the order consistently `argc, argv`
. bisect--helper: make `terms` an explicit singleton
. bisect--helper: simplify exit code computation
. bisect--helper: really retire `--bisect-autostart`
. bisect--helper: really retire --bisect-next-check
. bisect--helper: retire the --no-log option
. Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
Final bits of "git bisect.sh" have been rewritten in C.
Needs review.
cf. <xmqqv8pr8903.fsf@gitster.g>
source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>
* od/ci-use-checkout-v3-when-applicable (2022-10-10) 2 commits
. ci(main): linux32 uses actions/checkout@v2
. ci(main): upgrade actions/checkout to v3
Attempt to update GitHub CI to use actions/checkout@v3
Expecting a reroll.
Seems to break the CI completely.
source: <pull.1354.git.git.1665388136.gitgitgadget@gmail.com>
* ed/fsmonitor-inotify (2022-10-14) 7 commits
. fsmonitor: update doc for Linux
. fsmonitor: test updates
. fsmonitor: enable fsmonitor for Linux
. fsmonitor: implement filesystem change listener for Linux
. fsmonitor: determine if filesystem is local or remote
. fsmonitor: prepare to share code between Mac OS and Linux
. Merge branch 'ed/fsmonitor-on-networked-macos' into ed/fsmonitor-inotify
Bundled fsmonitor for Linux using inotify API.
Needs review.
Occasional breakages of t7527.16?
source: <pull.1352.v2.git.git.1665783944.gitgitgadget@gmail.com>
* ag/merge-strategies-in-c (2022-08-10) 14 commits
. sequencer: use the "octopus" strategy without forking
. sequencer: use the "resolve" strategy without forking
. merge: use the "octopus" strategy without forking
. merge: use the "resolve" strategy without forking
. merge-octopus: rewrite in C
. merge-recursive: move better_branch_name() to merge.c
. merge-resolve: rewrite in C
. merge-one-file: rewrite in C
. update-index: move add_cacheinfo() to read-cache.c
. merge-index: add a new way to invoke `git-merge-one-file'
. merge-index: drop the index
. merge-index: libify merge_one_path() and merge_all()
. t6060: add tests for removed files
. t6060: modify multiple files to expose a possible issue with merge-index
An attempt to rewrite remaining merge strategies from shell to C.
Needs more work.
At the minimum, we should lose 11/14 and possibly 08/14.
cf. <xmqq7d36vfur.fsf@gitster.g>
source: <20220809185429.20098-1-alban.gruin@gmail.com>
* es/doc-creation-factor-fix (2022-07-28) 2 commits
. range-diff: clarify --creation-factor=<factor>
. format-patch: clarify --creation-factor=<factor>
Expecting a reroll by somebody more familiar with the logic
cf. <xmqqo7wfix7p.fsf@gitster.g>
source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>
* cw/remote-object-info (2022-08-13) 7 commits
. SQUASH???
. cat-file: add remote-object-info to batch-command
. transport: add client support for object-info
. serve: advertise object-info feature
. protocol-caps: initialization bug fix
. fetch-pack: move fetch initialization
. fetch-pack: refactor packet writing
A client component to talk with the object-info endpoint.
Expecting a reroll.
Under SANITIZE=address, t1006-cat-file.sh finds a breakage.
cf. <20220728230210.2952731-1-calvinwan@google.com>
cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>
source: <20220728230210.2952731-1-calvinwan@google.com>
--------------------------------------------------
[Cooking]
* ab/config-multi-and-nonbool (2022-10-27) 10 commits
- for-each-repo: with bad config, don't conflate <path> and <cmd>
- config API: add "string" version of *_value_multi(), fix segfaults
- config tests: add "NULL" tests for *_get_value_multi()
- config API: add and use "lookup_value" functions
- builtin/gc.c: use "unsorted_string_list_has_string()" where appropriate
- string-list API: make has_string() and list_lookup() "const"
- string-list API: mark "struct_string_list" to "for_each_string_list" const
- config API: mark *_multi() with RESULT_MUST_BE_USED
- for-each-repo: error on bad --config
- config API: have *_multi() return an "int" and take a "dest"
A mixed bag of config API updates.
Expecting a reroll.
cf. <221026.86pmeebcj9.gmgdl@evledraar.gmail.com>
source: <cover-00.10-00000000000-20221026T151328Z-avarab@gmail.com>
* ab/sha-makefile-doc (2022-10-26) 9 commits
- Makefile: discuss SHAttered in *_SHA{1,256} discussion
- Makefile: document default SHA-1 backend on OSX
- Makefile: document SHA-1 and SHA-256 default and selection order
- Makefile: document default SHA-256 backend
- Makefile: rephrase the discussion of *_SHA1 knobs
- Makefile: create and use sections for "define" flag listing
- Makefile: correct DC_SHA1 documentation
- INSTALL: remove discussion of SHA-1 backends
- Makefile: always (re)set DC_SHA1 on fallback
Makefile comments updates and reordering to clarify knobs used to
choose SHA implementations.
Will merge to 'next'?
source: <cover-v4-0.9-00000000000-20221026T145255Z-avarab@gmail.com>
* rs/no-more-run-command-v (2022-10-30) 12 commits
- replace and remove run_command_v_opt()
- replace and remove run_command_v_opt_cd_env_tr2()
- replace and remove run_command_v_opt_tr2()
- replace and remove run_command_v_opt_cd_env()
- use child_process members "args" and "env" directly
- use child_process member "args" instead of string array variable
- sequencer: simplify building argument list in do_exec()
- bisect--helper: factor out do_bisect_run()
- bisect: simplify building "checkout" argument list
- am: simplify building "show" argument list
- run-command: fix return value comment
- merge: remove always-the-same "verbose" arguments
Simplify the run-command API.
Will merge to 'next'.
source: <ea061164-b36b-485c-963f-8c13e813a47e@web.de>
* tb/howto-using-redo-script (2022-10-26) 1 commit
- Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
Doc update.
Will merge to 'next'.
source: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com>
* ps/receive-use-only-advertised (2022-10-28) 3 commits
- SQUASH - leakfix
- receive-pack: use advertised reference tips to inform connectivity check
- connected: allow supplying different view of reachable objects
"git receive-pack" used to use all the local refs as the boundary
for checking connectivity of the data "git push" sent, but now it
uses only the refs that it advertised to the pusher. In a
repository with the .hideRefs configuration, this reduces the
resource needed to perform the check, and also forces the pusher to
prove they have all objects that are necessary to complete the
history on top of only the history available to them.
Expecting a reroll.
cf. <221028.86bkpw805n.gmgdl@evledraar.gmail.com>
cf. <xmqqr0yrizqm.fsf@gitster.g>
source: <cover.1666967670.git.ps@pks.im>
* jc/set-gid-bit-less-aggressively (2022-10-28) 1 commit
- adjust_shared_perm(): leave g+s alone when the group does not matter
The adjust_shared_perm() helper function learned to refrain from
setting the "g+s" bit on directories when it is not necessary.
Will merge to 'next'.
source: <xmqqr0yrhco6.fsf@gitster.g>
* gc/submodule-clone-update-with-branches (2022-10-30) 8 commits
- clone, submodule update: create and check out branches
- submodule--helper: remove update_data.suboid
- submodule update: refactor update targets
- submodule: return target of submodule symref
- t5617: drop references to remote-tracking branches
- submodule--helper clone: create named branch
- repo-settings: add submodule_propagate_branches
- clone: teach --detach option
"git clone --recurse-submodules" and "git submodule update" learns
to honor the "propagete branches" option.
Waiting for review.
source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com>
* es/mark-gc-cruft-as-experimental (2022-10-26) 2 commits
- config: let feature.experimental imply gc.cruftPacks=true
- gc: add tests for --cruft and friends
Enable gc.cruftpacks by default for those who opt into
feature.experimental setting.
Will merge to 'next'.
source: <cover.1666819953.git.me@ttaylorr.com>
* pw/config-int-parse-fixes (2022-10-22) 3 commits
- git_parse_signed(): avoid integer overflow
- config: require at least one digit when parsing numbers
- git_parse_unsigned: reject negative values
Assorted fixes of parsing end-user input as integers.
Expecting a reroll to add test coverage.
cf. <Y1L+Qv+cs1bjqjK9@coredump.intra.peff.net>
source: <pull.1389.git.1666359915.gitgitgadget@gmail.com>
* sa/cat-file-mailmap (2022-10-21) 1 commit
- doc/cat-file: allow --use-mailmap for --batch options
Doc updates.
Waiting for review response.
source: <20221021103442.202759-1-siddharthasthana31@gmail.com>
* tb/repack-expire-to (2022-10-24) 4 commits
- builtin/repack.c: implement `--expire-to` for storing pruned objects
- builtin/repack.c: write cruft packs to arbitrary locations
- builtin/repack.c: pass "cruft_expiration" to `write_cruft_pack`
- builtin/repack.c: pass "out" to `prepare_pack_objects`
"git repack" learns to send cruft objects out of the way into
packfiles outside the repository.
Waiting for review.
source: <cover.1666636974.git.me@ttaylorr.com>
* cc/filtered-repack (2022-10-25) 2 commits
- repack: add --filter=<filter-spec> option
- pack-objects: allow --filter without --stdout
"git repack" learns to discard objects that ought to be retrievable
again from the promissor remote.
Needs review.
source: <20221025122856.20204-1-christian.couder@gmail.com>
* al/trace2-clearing-skip-worktree (2022-10-28) 2 commits
- SQUASH???
- index: add trace2 region for clear skip worktree
Add trace2 counters to the region to clear skip worktree bits in a
sparse checkout.
Expecting a reroll?
source: <pull.1368.v2.git.git.1666917961644.gitgitgadget@gmail.com>
* po/glossary-around-traversal (2022-10-30) 4 commits
- glossary: add reachability bitmap description
- glossary: add "commit graph" description
- doc: use 'object database' not ODB or abbreviation
- doc: use "commit-graph" hyphenation consistently
The glossary entries for "commit-graph file" and "reachability
bitmap" have been added.
Will merge to 'next'.
source: <20221029164112.2097-1-philipoakley@iee.email>
* mc/credential-helper-auth-headers (2022-10-21) 6 commits
- t5556-http-auth: add test for HTTP auth hdr logic
- http: set specific auth scheme depending on credential
- http: move proactive auth to first slot creation
- http: store all request headers on active_request_slot
- credential: add WWW-Authenticate header to cred requests
- http: read HTTP WWW-Authenticate response headers
Extending credential helper protocol.
Needs review.
source: <pull.1352.v2.git.1666372083.gitgitgadget@gmail.com>
* hl/archive-recursive (2022-10-19) 10 commits
- fixup! archive: add tests for git archive --recurse-submodules
- archive: add tests for git archive --recurse-submodules
- archive: add --recurse-submodules to git-archive command
- archive: remove global repository from archive_args
- archive: pass repo objects to write_archive handlers
- tree: add repository parameter to read_tree_fn_t
- tree: handle submodule case for read_tree_at properly
- tree: increase test coverage for tree.c
- tree: update cases to use repo_ tree methods
- tree: do not use the_repository for tree traversal methods.
"git archive" has been taught "--recurse-submodules" option to
create a tarball that includes contents from submodules.
Expecting a reroll.
Seems to break win+VS test(8).
cf. https://github.com/git/git/actions/runs/3293333066 whose only
difference from https://github.com/git/git/actions/runs/3293553109
is the inclusion of this topic.
source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>
* en/sparse-checkout-design (2022-10-08) 1 commit
- sparse-checkout.txt: new document with sparse-checkout directions
Design doc.
Needs review.
source: <pull.1367.v3.git.1665269538608.gitgitgadget@gmail.com>
* pw/test-todo (2022-10-06) 3 commits
- test_todo: allow [verbose] test as the command
- test_todo: allow [!] grep as the command
- tests: add test_todo() to mark known breakages
RFC for test framework improvement.
Needs review.
source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>
* ab/coccicheck-incremental (2022-10-26) 12 commits
- spatchcache: add a ccache-alike for "spatch"
- cocci: run against a generated ALL.cocci
- cocci rules: remove <id>'s from rules that don't need them
- cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
- cocci: make "coccicheck" rule incremental
- cocci: split off "--all-includes" from SPATCH_FLAGS
- cocci: split off include-less "tests" from SPATCH_FLAGS
- Makefile: split off SPATCH_BATCH_SIZE comment from "cocci" heading
- Makefile: have "coccicheck" re-run if flags change
- Makefile: add ability to TAB-complete cocci *.patch rules
- cocci rules: remove unused "F" metavariable from pending rule
- Makefile + shared.mak: rename and indent $(QUIET_SPATCH_T)
"make coccicheck" is time consuming. It has been made to run more
incrementally.
Will merge to 'next'?
source: <cover-v4-00.12-00000000000-20221026T141005Z-avarab@gmail.com>
^ permalink raw reply [relevance 2%]
* Re: [PATCH] t7001-mv.sh:modernizing test script using function
2022-10-30 17:20 13% [PATCH] t7001-mv.sh:modernizing test script using function Debra Obondo via GitGitGadget
@ 2022-10-30 18:00 6% ` Taylor Blau
2022-10-31 18:04 10% ` Martin Ågren
2022-11-03 18:39 13% ` [PATCH v2] t7001-mv.sh: modernizing test script using functions Debra Obondo via GitGitGadget
2 siblings, 0 replies; 200+ results
From: Taylor Blau @ 2022-10-30 18:00 UTC (permalink / raw)
To: Debra Obondo via GitGitGadget; +Cc: git, Debra Obondo
On Sun, Oct 30, 2022 at 05:20:41PM +0000, Debra Obondo via GitGitGadget wrote:
> t/t7001-mv.sh | 62 +++++++++++++++++++++++++--------------------------
> 1 file changed, 31 insertions(+), 31 deletions(-)
Looks good. Will queue, thanks.
Thanks,
Taylor
^ permalink raw reply [relevance 6%]
* [PATCH] t7001-mv.sh:modernizing test script using function
@ 2022-10-30 17:20 13% Debra Obondo via GitGitGadget
2022-10-30 18:00 6% ` Taylor Blau
` (2 more replies)
0 siblings, 3 replies; 200+ results
From: Debra Obondo via GitGitGadget @ 2022-10-30 17:20 UTC (permalink / raw)
To: git; +Cc: Debra Obondo, Debra Obondo
From: Debra Obondo <debraobondo@gmail.com>
Test script to verify the presence/absence of files, paths, directories,
symlinks and other features in 'git mv' command are using the command
format:
'test (-e|f|d|h|...)'
Replace them with helper functions of format:
'test_path_is_*'
Signed-off-by: Debra Obondo <debraobondo@gmail.com>
---
[PATCH] [OUTREACHY] t7001-mv.sh : Use test_path_is_* functions in test
script
Older test scripts use the command 'test -' to verify the presence or
absence of features such as files, directories and symbolic links. This
however requires slightly complicated uses, such as 'test ! -f '. The
helper functions 'test_path_is_' located in t/test-lib-functions.sh have
taken into account all scenarios of the 'test -*' to reduce errors. This
was a microproject to replace them with the helper functions.
Test script to verify the presence/absence of files, paths,
directories,symboliclinks and many other features in mv command are
using the command format
'test -(e|f|s|h|...).
Replace them with helper functions of format
'test_path_is_*'
Signed-off-by: Debra Obondo debraobondo@gmail.com
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1372%2Ffobiasic07%2Ft7001-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1372/fobiasic07/t7001-v1
Pull-Request: https://github.com/git/git/pull/1372
t/t7001-mv.sh | 62 +++++++++++++++++++++++++--------------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 8c37bceb336..aa97a2f8e1c 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -60,8 +60,8 @@ test_expect_success 'checking the commit' '
test_expect_success 'mv --dry-run does not move file' '
git mv -n path0/COPYING MOVED &&
- test -f path0/COPYING &&
- test ! -f MOVED
+ test_path_is_file path0/COPYING &&
+ ! test_path_is_file MOVED
'
test_expect_success 'checking -k on non-existing file' '
@@ -71,25 +71,25 @@ test_expect_success 'checking -k on non-existing file' '
test_expect_success 'checking -k on untracked file' '
>untracked1 &&
git mv -k untracked1 path0 &&
- test -f untracked1 &&
- test ! -f path0/untracked1
+ test_path_is_file untracked1 &&
+ ! test_path_is_file path0/untracked1
'
test_expect_success 'checking -k on multiple untracked files' '
>untracked2 &&
git mv -k untracked1 untracked2 path0 &&
- test -f untracked1 &&
- test -f untracked2 &&
- test ! -f path0/untracked1 &&
- test ! -f path0/untracked2
+ test_path_is_file untracked1 &&
+ test_path_is_file untracked2 &&
+ ! test_path_is_file path0/untracked1 &&
+ ! test_path_is_file path0/untracked2
'
test_expect_success 'checking -f on untracked file with existing target' '
>path0/untracked1 &&
test_must_fail git mv -f untracked1 path0 &&
- test ! -f .git/index.lock &&
- test -f untracked1 &&
- test -f path0/untracked1
+ ! test_path_is_file .git/index.lock &&
+ test_path_is_file untracked1 &&
+ test_path_is_file path0/untracked1
'
# clean up the mess in case bad things happen
@@ -215,8 +215,8 @@ test_expect_success 'absolute pathname' '
git add sub/file &&
git mv sub "$(pwd)/in" &&
- ! test -d sub &&
- test -d in &&
+ ! test_path_is_dir sub &&
+ test_path_is_dir in &&
git ls-files --error-unmatch in/file
)
'
@@ -234,8 +234,8 @@ test_expect_success 'absolute pathname outside should fail' '
git add sub/file &&
test_must_fail git mv sub "$out/out" &&
- test -d sub &&
- ! test -d ../in &&
+ test_path_is_dir sub &&
+ ! test_path_is_dir ../in &&
git ls-files --error-unmatch sub/file
)
'
@@ -295,8 +295,8 @@ test_expect_success 'git mv should overwrite symlink to a file' '
git add moved &&
test_must_fail git mv moved symlink &&
git mv -f moved symlink &&
- ! test -e moved &&
- test -f symlink &&
+ ! test_path_exists moved &&
+ test_path_is_file symlink &&
test "$(cat symlink)" = 1 &&
git update-index --refresh &&
git diff-files --quiet
@@ -312,13 +312,13 @@ test_expect_success 'git mv should overwrite file with a symlink' '
git add moved &&
test_must_fail git mv symlink moved &&
git mv -f symlink moved &&
- ! test -e symlink &&
+ ! test_path_exists symlink &&
git update-index --refresh &&
git diff-files --quiet
'
test_expect_success SYMLINKS 'check moved symlink' '
- test -h moved
+ test_path_is_symlink moved
'
rm -f moved symlink
@@ -352,7 +352,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
) &&
mkdir mod &&
git mv sub mod/sub &&
- ! test -e sub &&
+ ! test_path_exists sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -372,7 +372,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
) &&
mkdir mod &&
git mv sub mod/sub &&
- ! test -e sub &&
+ ! test_path_exists sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
@@ -389,7 +389,7 @@ test_expect_success 'git mv moves a submodule with gitfile' '
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
git -C mod mv ../sub/ . &&
- ! test -e sub &&
+ ! test_path_exists sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
@@ -408,7 +408,7 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
- ! test -e sub &&
+ ! test_path_exists sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -423,13 +423,13 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
test_must_fail git mv sub mod/sub 2>actual.err &&
- test -s actual.err &&
- test -e sub &&
+ test_file_not_empty actual.err &&
+ test_path_exists sub &&
git diff-files --quiet -- sub &&
git add .gitmodules &&
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
- ! test -e sub &&
+ ! test_path_exists sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -447,7 +447,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
test_cmp expect.err actual.err &&
- ! test -e sub &&
+ ! test_path_exists sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
@@ -460,7 +460,7 @@ test_expect_success 'mv --dry-run does not touch the submodule or .gitmodules' '
git submodule update &&
mkdir mod &&
git mv -n sub mod/sub 2>actual.err &&
- test -f sub/.git &&
+ test_path_is_file sub/.git &&
git diff-index --exit-code HEAD &&
git update-index --refresh &&
git diff-files --quiet -- sub .gitmodules
@@ -474,10 +474,10 @@ test_expect_success 'checking out a commit before submodule moved needs manual u
git status -s sub2 >actual &&
echo "?? sub2/" >expected &&
test_cmp expected actual &&
- ! test -f sub/.git &&
- test -f sub2/.git &&
+ ! test_path_is_file sub/.git &&
+ test_path_is_file sub2/.git &&
git submodule update &&
- test -f sub/.git &&
+ test_path_is_file sub/.git &&
rm -rf sub2 &&
git diff-index --exit-code HEAD &&
git update-index --refresh &&
base-commit: 1fc3c0ad407008c2f71dd9ae1241d8b75f8ef886
--
gitgitgadget
^ permalink raw reply related [relevance 13%]
* Re: [PATCH v2] builtin/mv.c: fix possible segfault in add_slash()
2022-09-09 20:04 0% ` Junio C Hamano
@ 2022-09-09 22:40 0% ` Shaoxuan Yuan
0 siblings, 0 replies; 200+ results
From: Shaoxuan Yuan @ 2022-09-09 22:40 UTC (permalink / raw)
To: Junio C Hamano; +Cc: derrickstolee, git, peff, vdye
On 9/9/2022 1:04 PM, Junio C Hamano wrote:
> Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> writes:
>
>> A possible segfault was introduced in c08830de41 (mv: check if
>> <destination> is a SKIP_WORKTREE_DIR, 2022-08-09).
>>
>> When running t7001 with SANITIZE=address, problem appears when running:
>>
>> git mv path1/path2/ .
>> or
>> git mv directory ../
>> or
>> any <destination> that makes dest_path[0] an empty string.
>>
>> The add_slash() call could segfault when dest_path[0] is an empty string,
>> because it was accessing a null value in such case.
>
> Terminology. The relevant preimage is
>
>> size_t len = strlen(path);
>> - if (path[len - 1] != '/') {
>
> An access to path[-1] is an out-of-bounds access.
Thanks for the term, new thing learned :-)
>> Change add_slash() to check the path argument is a non-empty string
>> before accessing its value. If the path is empty, return it as-is.
>
> That is not wrong per-se, but...
>
>> Explanation:
>
> ... you'd need this funny label here. If this is where your
> explanation begins, what was the reader reading before it? ;-)
>
> The logic would flow more naturally if you added your "explanation"
> material between "what is wrong in the current code" and "what to do
> to fix it", perhaps like so:
Indeed, explanation before action sounds more reasonable.
> ... could segfault when path argument to it is an empty
> string, because it makes an out-of-bounds read to decide if
> an extra slash '/' needs to be appended to it.
>
> As add_slash() is used to make sure that a valid pathname to
> a file in the given directory can be made by appending a
> filename after the value returned from it, if path is an
> empty string, we want to return it as-is. The path to a
> file "F" in the top-level of the working tree (i.e.
> path=="") is formed by appending "F" after "" (i.e. path)
> without any slash in between.
>
> So, just like the case where a non-empty path already ends
> with a slash, return an empty path as-is.
>
Thanks for the paraphrase, I put it in the v3 just sent.
>> diff --git a/builtin/mv.c b/builtin/mv.c
>> index 2d64c1e80f..3413ad1c9b 100644
>> --- a/builtin/mv.c
>> +++ b/builtin/mv.c
>> @@ -71,7 +71,7 @@ static const char **internal_prefix_pathspec(const char *prefix,
>> static const char *add_slash(const char *path)
>> {
>> size_t len = strlen(path);
>> - if (path[len - 1] != '/') {
>> + if (len && path[len - 1] != '/') {
>> char *with_slash = xmalloc(st_add(len, 2));
>> memcpy(with_slash, path, len);
>> with_slash[len++] = '/';
>
> Yup. It cannot be seen in the patch but the post-context of this
> hunk just returns path as-is, which is what we want to happen.
Yes.
Thanks,
Shaoxuan
^ permalink raw reply [relevance 0%]
* [PATCH v3] builtin/mv.c: fix possible segfault in add_slash()
2022-09-08 23:02 4% [PATCH] builtin/mv.c: fix possible segfault in add_slash() Shaoxuan Yuan
2022-09-09 14:14 5% ` Derrick Stolee
2022-09-09 19:44 3% ` [PATCH v2] " Shaoxuan Yuan
@ 2022-09-09 22:27 3% ` Shaoxuan Yuan
2 siblings, 0 replies; 200+ results
From: Shaoxuan Yuan @ 2022-09-09 22:27 UTC (permalink / raw)
To: shaoxuan.yuan02; +Cc: derrickstolee, git, gitster, peff, vdye
A possible segfault was introduced in c08830de41 (mv: check if
<destination> is a SKIP_WORKTREE_DIR, 2022-08-09).
When running t7001 with SANITIZE=address, problem appears when running:
git mv path1/path2/ .
or
git mv directory ../
or
any <destination> that makes dest_path[0] an empty string.
The add_slash() call could segfault when path argument to it is an empty
string, because it makes an out-of-bounds read to decide if an extra
slash '/' needs to be appended to it.
As add_slash() is used to make sure that a valid pathname to a file in
the given directory can be made by appending a filename after the value
returned from it, if path is an empty string, we want to return it
as-is. The path to a file "F" in the top-level of the working tree
(i.e. path=="") is formed by appending "F" after "" (i.e. path) without
any slash in between.
So, just like the case where a non-empty path already ends with a slash,
return an empty path as-is.
Reported-by: Jeff King <peff@peff.net>
Helped-by: Jeff King <peff@peff.net>
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
---
Range-diff against v2:
1: 1120dc7e6b ! 1: 569e618013 builtin/mv.c: fix possible segfault in add_slash()
@@ Commit message
or
any <destination> that makes dest_path[0] an empty string.
- The add_slash() call could segfault when dest_path[0] is an empty string,
- because it was accessing a null value in such case.
-
- Change add_slash() to check the path argument is a non-empty string
- before accessing its value. If the path is empty, return it as-is.
-
- Explanation:
-
- It's OK for add_slash() to return an empty string as-is. add_slash()
- converts its path argument to the prefix (for "folder1/file1",
- "folder1/" is the prefix we mean here) for the result path. The path
- argument is an empty string _iff_ the result path is analyzed to be at
- the top level (this normalization process is done earlier by
- internal_prefix_pathspec()).
-
- Because the prefix for a top-level path is an empty string, thus
- add_slash() should return an empty path argument as-is, both for
- correctness and avoiding inappropriate memory access.
+ The add_slash() call could segfault when path argument to it is an empty
+ string, because it makes an out-of-bounds read to decide if an extra
+ slash '/' needs to be appended to it.
+
+ As add_slash() is used to make sure that a valid pathname to a file in
+ the given directory can be made by appending a filename after the value
+ returned from it, if path is an empty string, we want to return it
+ as-is. The path to a file "F" in the top-level of the working tree
+ (i.e. path=="") is formed by appending "F" after "" (i.e. path) without
+ any slash in between.
+
+ So, just like the case where a non-empty path already ends with a slash,
+ return an empty path as-is.
Reported-by: Jeff King <peff@peff.net>
Helped-by: Jeff King <peff@peff.net>
builtin/mv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index 2d64c1e80f..3413ad1c9b 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -71,7 +71,7 @@ static const char **internal_prefix_pathspec(const char *prefix,
static const char *add_slash(const char *path)
{
size_t len = strlen(path);
- if (path[len - 1] != '/') {
+ if (len && path[len - 1] != '/') {
char *with_slash = xmalloc(st_add(len, 2));
memcpy(with_slash, path, len);
with_slash[len++] = '/';
base-commit: a6b4b080e4ef65ebbab73e47c0100b5dc12e104c
--
2.37.0
^ permalink raw reply related [relevance 3%]
* Re: [PATCH v2] builtin/mv.c: fix possible segfault in add_slash()
2022-09-09 19:44 3% ` [PATCH v2] " Shaoxuan Yuan
@ 2022-09-09 20:04 0% ` Junio C Hamano
2022-09-09 22:40 0% ` Shaoxuan Yuan
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2022-09-09 20:04 UTC (permalink / raw)
To: Shaoxuan Yuan; +Cc: derrickstolee, git, peff, vdye
Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> writes:
> A possible segfault was introduced in c08830de41 (mv: check if
> <destination> is a SKIP_WORKTREE_DIR, 2022-08-09).
>
> When running t7001 with SANITIZE=address, problem appears when running:
>
> git mv path1/path2/ .
> or
> git mv directory ../
> or
> any <destination> that makes dest_path[0] an empty string.
>
> The add_slash() call could segfault when dest_path[0] is an empty string,
> because it was accessing a null value in such case.
Terminology. The relevant preimage is
> size_t len = strlen(path);
> - if (path[len - 1] != '/') {
An access to path[-1] is an out-of-bounds access.
> Change add_slash() to check the path argument is a non-empty string
> before accessing its value. If the path is empty, return it as-is.
That is not wrong per-se, but...
> Explanation:
... you'd need this funny label here. If this is where your
explanation begins, what was the reader reading before it? ;-)
The logic would flow more naturally if you added your "explanation"
material between "what is wrong in the current code" and "what to do
to fix it", perhaps like so:
... could segfault when path argument to it is an empty
string, because it makes an out-of-bounds read to decide if
an extra slash '/' needs to be appended to it.
As add_slash() is used to make sure that a valid pathname to
a file in the given directory can be made by appending a
filename after the value returned from it, if path is an
empty string, we want to return it as-is. The path to a
file "F" in the top-level of the working tree (i.e.
path=="") is formed by appending "F" after "" (i.e. path)
without any slash in between.
So, just like the case where a non-empty path already ends
with a slash, return an empty path as-is.
> diff --git a/builtin/mv.c b/builtin/mv.c
> index 2d64c1e80f..3413ad1c9b 100644
> --- a/builtin/mv.c
> +++ b/builtin/mv.c
> @@ -71,7 +71,7 @@ static const char **internal_prefix_pathspec(const char *prefix,
> static const char *add_slash(const char *path)
> {
> size_t len = strlen(path);
> - if (path[len - 1] != '/') {
> + if (len && path[len - 1] != '/') {
> char *with_slash = xmalloc(st_add(len, 2));
> memcpy(with_slash, path, len);
> with_slash[len++] = '/';
Yup. It cannot be seen in the patch but the post-context of this
hunk just returns path as-is, which is what we want to happen.
Thanks.
^ permalink raw reply [relevance 0%]
* [PATCH v2] builtin/mv.c: fix possible segfault in add_slash()
2022-09-08 23:02 4% [PATCH] builtin/mv.c: fix possible segfault in add_slash() Shaoxuan Yuan
2022-09-09 14:14 5% ` Derrick Stolee
@ 2022-09-09 19:44 3% ` Shaoxuan Yuan
2022-09-09 20:04 0% ` Junio C Hamano
2022-09-09 22:27 3% ` [PATCH v3] " Shaoxuan Yuan
2 siblings, 1 reply; 200+ results
From: Shaoxuan Yuan @ 2022-09-09 19:44 UTC (permalink / raw)
To: shaoxuan.yuan02; +Cc: derrickstolee, git, gitster, peff, vdye
A possible segfault was introduced in c08830de41 (mv: check if
<destination> is a SKIP_WORKTREE_DIR, 2022-08-09).
When running t7001 with SANITIZE=address, problem appears when running:
git mv path1/path2/ .
or
git mv directory ../
or
any <destination> that makes dest_path[0] an empty string.
The add_slash() call could segfault when dest_path[0] is an empty string,
because it was accessing a null value in such case.
Change add_slash() to check the path argument is a non-empty string
before accessing its value. If the path is empty, return it as-is.
Explanation:
It's OK for add_slash() to return an empty string as-is. add_slash()
converts its path argument to the prefix (for "folder1/file1",
"folder1/" is the prefix we mean here) for the result path. The path
argument is an empty string _iff_ the result path is analyzed to be at
the top level (this normalization process is done earlier by
internal_prefix_pathspec()).
Because the prefix for a top-level path is an empty string, thus
add_slash() should return an empty path argument as-is, both for
correctness and avoiding inappropriate memory access.
Reported-by: Jeff King <peff@peff.net>
Helped-by: Jeff King <peff@peff.net>
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
---
Range-diff against v1:
1: a5dccc030c ! 1: 82353f457d builtin/mv.c: fix possible segfault in add_slash()
@@ Commit message
or
any <destination> that makes dest_path[0] an empty string.
- The add_slash() call segfaults when dest_path[0] is an empty string,
+ The add_slash() call could segfault when dest_path[0] is an empty string,
because it was accessing a null value in such case.
Change add_slash() to check the path argument is a non-empty string
- before accessing its value.
+ before accessing its value. If the path is empty, return it as-is.
- The purpose of add_slash() is adding a slash to the end of a string to
- construct a directory path. And, because adding a slash to an empty
- string is of no use here, and checking the string value without checking
- it is non-empty leads to segfault, we should make sure the length of the
- string is positive to solve both problems.
+ Explanation:
+
+ It's OK for add_slash() to return an empty string as-is. add_slash()
+ converts its path argument to the prefix (for "folder1/file1",
+ "folder1/" is the prefix we mean here) for the result path. The path
+ argument is an empty string _iff_ the result path is analyzed to be at
+ the top level (this normalization process is done earlier by
+ internal_prefix_pathspec()).
+
+ Because the prefix for a top-level path is an empty string, thus
+ add_slash() should return an empty path argument as-is, both for
+ correctness and avoiding inappropriate memory access.
Reported-by: Jeff King <peff@peff.net>
Helped-by: Jeff King <peff@peff.net>
+ Helped-by: Junio C Hamano <gitster@pobox.com>
+ Helped-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
## builtin/mv.c ##
builtin/mv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index 2d64c1e80f..3413ad1c9b 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -71,7 +71,7 @@ static const char **internal_prefix_pathspec(const char *prefix,
static const char *add_slash(const char *path)
{
size_t len = strlen(path);
- if (path[len - 1] != '/') {
+ if (len && path[len - 1] != '/') {
char *with_slash = xmalloc(st_add(len, 2));
memcpy(with_slash, path, len);
with_slash[len++] = '/';
base-commit: e71f9b1de6941c8b449d0c0e17e457f999664bc9
--
2.37.0
^ permalink raw reply related [relevance 3%]
* Re: [PATCH] builtin/mv.c: fix possible segfault in add_slash()
2022-09-09 14:14 5% ` Derrick Stolee
@ 2022-09-09 16:37 0% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2022-09-09 16:37 UTC (permalink / raw)
To: Derrick Stolee; +Cc: Shaoxuan Yuan, git, peff, vdye
Derrick Stolee <derrickstolee@github.com> writes:
> On 9/8/2022 7:02 PM, Shaoxuan Yuan wrote:
>> A possible segfault was introduced in c08830de41 (mv: check if
>> <destination> is a SKIP_WORKTREE_DIR, 2022-08-09).
>>
>> When running t7001 with SANITIZE=address, problem appears when running:
>>
>> git mv path1/path2/ .
>> or
>> git mv directory ../
>> or
>> any <destination> that makes dest_path[0] an empty string.
>>
>> The add_slash() call segfaults when dest_path[0] is an empty string,
>> because it was accessing a null value in such case.
>
> It doesn't _always_ seg fault, since we have tests that cover this
> case. Adding this change will cause t7001-mv.sh to start failing
> in many places:
>
> diff --git a/builtin/mv.c b/builtin/mv.c
> index 2d64c1e80fe..8216680ad3c 100644
> --- a/builtin/mv.c
> +++ b/builtin/mv.c
> @@ -71,6 +71,10 @@ static const char **internal_prefix_pathspec(const char *prefix,
> static const char *add_slash(const char *path)
> {
> size_t len = strlen(path);
> +
> + if (!len)
> + die("segfault?");
> +
> if (path[len - 1] != '/') {
> char *with_slash = xmalloc(st_add(len, 2));
> memcpy(with_slash, path, len);
>
> I suppose it is better to say "could segfault". Running the test
> under --valgrind also causes a failure. It covers both cases, "."
> and "../".
While "could segfault" is of course more correct, I do not see a
huge difference here, but that is only because I learned to equate
"segfaults" in our log messages with "makes an access to
inappropriate memory address".
If I were to suggest updating the proposed log message, I would
rather spend a bit more bytes to explain what callers expect
add_slash() to do, why they call the helper for. It would make it
obvious why it is the right behaviour the callers expect for the
function to return an empty string as-is.
I _think_ the reason is that the caller of add_slash has the name of
a directory in the working tree (relative to the root of the working
tree) and wants to add strings to form pathnames to things in the
directory. They have "Documentation" directory and are told to move
"Makefile" from somewhere into it, so they pass "Documentation",
want "Documentation/" back, to form "Documentation/Makefile" by
concatenating. If they are told to move something to the toplevel,
the target would be originally given as "." and while driving the
machinery to rename something to "./Makefile" might also work,
because the pathnames are normalized fairly early by removing excess
dots and resolving double-dots, the actual 'path' passed to
add_slash() by the caller in this case is an empty string, not a
single dot. And "move this Makefile sitting somewhere else to ."
means "the path to the resulting file is Makefile" (as opposed to
"the path to the resulting file is ./Makefile"), which is correct.
Of course, I expect the log message to explain it a lot more
concisely, instead of spending more than a dozen lines ;-)
Thanks.
^ permalink raw reply [relevance 0%]
* Re: [PATCH] builtin/mv.c: fix possible segfault in add_slash()
2022-09-08 23:02 4% [PATCH] builtin/mv.c: fix possible segfault in add_slash() Shaoxuan Yuan
@ 2022-09-09 14:14 5% ` Derrick Stolee
2022-09-09 16:37 0% ` Junio C Hamano
2022-09-09 19:44 3% ` [PATCH v2] " Shaoxuan Yuan
2022-09-09 22:27 3% ` [PATCH v3] " Shaoxuan Yuan
2 siblings, 1 reply; 200+ results
From: Derrick Stolee @ 2022-09-09 14:14 UTC (permalink / raw)
To: Shaoxuan Yuan, git, peff; +Cc: gitster, vdye
On 9/8/2022 7:02 PM, Shaoxuan Yuan wrote:
> A possible segfault was introduced in c08830de41 (mv: check if
> <destination> is a SKIP_WORKTREE_DIR, 2022-08-09).
>
> When running t7001 with SANITIZE=address, problem appears when running:
>
> git mv path1/path2/ .
> or
> git mv directory ../
> or
> any <destination> that makes dest_path[0] an empty string.
>
> The add_slash() call segfaults when dest_path[0] is an empty string,
> because it was accessing a null value in such case.
It doesn't _always_ seg fault, since we have tests that cover this
case. Adding this change will cause t7001-mv.sh to start failing
in many places:
diff --git a/builtin/mv.c b/builtin/mv.c
index 2d64c1e80fe..8216680ad3c 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -71,6 +71,10 @@ static const char **internal_prefix_pathspec(const char *prefix,
static const char *add_slash(const char *path)
{
size_t len = strlen(path);
+
+ if (!len)
+ die("segfault?");
+
if (path[len - 1] != '/') {
char *with_slash = xmalloc(st_add(len, 2));
memcpy(with_slash, path, len);
I suppose it is better to say "could segfault". Running the test
under --valgrind also causes a failure. It covers both cases, "."
and "../".
This is all to say that there is some subtlety to the situation, which
helps justify the lack of a new test case (the tests cover this case,
but require extra steps to show a failure).
> Change add_slash() to check the path argument is a non-empty string
> before accessing its value.
>
> The purpose of add_slash() is adding a slash to the end of a string to
> construct a directory path. And, because adding a slash to an empty
> string is of no use here, and checking the string value without checking
> it is non-empty leads to segfault, we should make sure the length of the
> string is positive to solve both problems.
I agree that the code change is correct.
Thanks,
-Stolee
^ permalink raw reply related [relevance 5%]
* [PATCH] builtin/mv.c: fix possible segfault in add_slash()
@ 2022-09-08 23:02 4% Shaoxuan Yuan
2022-09-09 14:14 5% ` Derrick Stolee
` (2 more replies)
0 siblings, 3 replies; 200+ results
From: Shaoxuan Yuan @ 2022-09-08 23:02 UTC (permalink / raw)
To: git, peff; +Cc: gitster, vdye, derrickstolee, Shaoxuan Yuan
A possible segfault was introduced in c08830de41 (mv: check if
<destination> is a SKIP_WORKTREE_DIR, 2022-08-09).
When running t7001 with SANITIZE=address, problem appears when running:
git mv path1/path2/ .
or
git mv directory ../
or
any <destination> that makes dest_path[0] an empty string.
The add_slash() call segfaults when dest_path[0] is an empty string,
because it was accessing a null value in such case.
Change add_slash() to check the path argument is a non-empty string
before accessing its value.
The purpose of add_slash() is adding a slash to the end of a string to
construct a directory path. And, because adding a slash to an empty
string is of no use here, and checking the string value without checking
it is non-empty leads to segfault, we should make sure the length of the
string is positive to solve both problems.
Reported-by: Jeff King <peff@peff.net>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
---
Reference: https://lore.kernel.org/git/YwdJRRuST2SP8ZT7@coredump.intra.peff.net/
builtin/mv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index 2d64c1e80f..3413ad1c9b 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -71,7 +71,7 @@ static const char **internal_prefix_pathspec(const char *prefix,
static const char *add_slash(const char *path)
{
size_t len = strlen(path);
- if (path[len - 1] != '/') {
+ if (len && path[len - 1] != '/') {
char *with_slash = xmalloc(st_add(len, 2));
memcpy(with_slash, path, len);
with_slash[len++] = '/';
base-commit: e71f9b1de6941c8b449d0c0e17e457f999664bc9
--
2.37.0
^ permalink raw reply related [relevance 4%]
* Re: What's cooking in git.git (Aug 2022, #08; Wed, 24)
@ 2022-08-25 10:04 5% ` Jeff King
0 siblings, 0 replies; 200+ results
From: Jeff King @ 2022-08-25 10:04 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Shaoxuan Yuan, Victoria Dye, Derrick Stolee, git
On Wed, Aug 24, 2022 at 10:20:30PM -0700, Junio C Hamano wrote:
> * sy/mv-out-of-cone (2022-08-10) 9 commits
> (merged to 'next' on 2022-08-17 at 2316d9ce4d)
> + mv: check overwrite for in-to-out move
> + advice.h: add advise_on_moving_dirty_path()
> + mv: cleanup empty WORKING_DIRECTORY
> + mv: from in-cone to out-of-cone
> + mv: remove BOTH from enum update_mode
> + mv: check if <destination> is a SKIP_WORKTREE_DIR
> + mv: free the with_slash in check_dir_in_index()
> + mv: rename check_dir_in_index() to empty_dir_has_sparse_contents()
> + t7002: add tests for moving from in-cone to out-of-cone
>
> "git mv A B" in a sparsely populated working tree can be asked to
> move a path from a directory that is "in cone" to another directory
> that is "out of cone". Handling of such a case has been improved.
>
> Will merge to 'master'.
> source: <20220809120910.2021413-1-shaoxuan.yuan02@gmail.com>
This topic (and now 'next') segfaults with SANITIZE=address in t7001.
The problem is running:
git mv path1/path2/ .
The "." in the destination is normalized to the empty string by
internal_prefix_pathspec(). But commit c08830de41 (mv: check if
<destination> is a SKIP_WORKTREE_DIR, 2022-08-09) then calls add_slash()
on the result, and it isn't prepared to see an empty string.
This makes the problem go away:
diff --git a/builtin/mv.c b/builtin/mv.c
index 11aea7b4db..6c6385dbb5 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -72,7 +72,7 @@ static const char **internal_prefix_pathspec(const char *prefix,
static const char *add_slash(const char *path)
{
size_t len = strlen(path);
- if (path[len - 1] != '/') {
+ if (len && path[len - 1] != '/') {
char *with_slash = xmalloc(st_add(len, 2));
memcpy(with_slash, path, len);
with_slash[len++] = '/';
but I didn't follow the topic well enough to know if there's anything
subtle (i.e., I'm not sure why we need the slash in the first place, and
whether "./" would be more appropriate, etc). So punting to folks who
were involved. :)
-Peff
^ permalink raw reply related [relevance 5%]
* Re: [PATCH v2] mv: refresh stat info for moved entry
2022-03-29 16:44 0% ` Junio C Hamano
@ 2022-03-29 18:54 0% ` Derrick Stolee
0 siblings, 0 replies; 200+ results
From: Derrick Stolee @ 2022-03-29 18:54 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Victoria Dye via GitGitGadget, git, reichemn, Victoria Dye
On 3/29/2022 12:44 PM, Junio C Hamano wrote:
> Derrick Stolee <derrickstolee@github.com> writes:
>
>>> Note that the test added in 't7001-mv.sh' requires a "sleep 1" to ensure the
>>> 'ctime' of the file creation will be definitively older than the 'ctime' of
>>> the renamed file in 'git mv'.
>>
>> Unfortunate that this is necessary, but it seems to be the only way
>> to handle this because of the interaction with the system clock and
>> the filesystem. There are several sleeps like this in
>> t1701-racy-split-index.sh, for example.
>
> Does "test-tool chmtime" to tweak the filesystem timestamp help? I
> didn't look at the specific step that uses sleep to work around.
The issue here is related to ctime, which is not modified by that
helper. It also uses utime() which does not seem to have a way to
modify ctime (which makes sense).
Thanks,
-Stolee
^ permalink raw reply [relevance 0%]
* Re: [PATCH v2] mv: refresh stat info for moved entry
2022-03-29 13:19 0% ` Derrick Stolee
@ 2022-03-29 16:44 0% ` Junio C Hamano
2022-03-29 18:54 0% ` Derrick Stolee
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2022-03-29 16:44 UTC (permalink / raw)
To: Derrick Stolee; +Cc: Victoria Dye via GitGitGadget, git, reichemn, Victoria Dye
Derrick Stolee <derrickstolee@github.com> writes:
>> Note that the test added in 't7001-mv.sh' requires a "sleep 1" to ensure the
>> 'ctime' of the file creation will be definitively older than the 'ctime' of
>> the renamed file in 'git mv'.
>
> Unfortunate that this is necessary, but it seems to be the only way
> to handle this because of the interaction with the system clock and
> the filesystem. There are several sleeps like this in
> t1701-racy-split-index.sh, for example.
Does "test-tool chmtime" to tweak the filesystem timestamp help? I
didn't look at the specific step that uses sleep to work around.
>> +
>> + /*
>> + * Refresh the new index entry. Using 'refresh_cache_entry' ensures
>> + * we only update stat info if the entry is otherwise up-to-date (i.e.,
>> + * the contents/mode haven't changed). This ensures that we reflect the
>> + * 'ctime' of the rename in the index without (incorrectly) updating
>> + * the cached stat info to reflect unstaged changes on disk.
>> + */
>> + refreshed = refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
>> + if (refreshed && refreshed != new_entry) {
>> + add_index_entry(istate, refreshed, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
>> + discard_cache_entry(new_entry);
>
> I'm glad you're checking that both refreshed is non-NULL and not equal
> to new_entry. Both are possible results from refresh_cache_entry().
;-)
^ permalink raw reply [relevance 0%]
* Re: [PATCH v2] mv: refresh stat info for moved entry
2022-03-29 1:07 9% ` [PATCH v2] " Victoria Dye via GitGitGadget
@ 2022-03-29 13:19 0% ` Derrick Stolee
2022-03-29 16:44 0% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Derrick Stolee @ 2022-03-29 13:19 UTC (permalink / raw)
To: Victoria Dye via GitGitGadget, git; +Cc: reichemn, gitster, Victoria Dye
On 3/28/2022 9:07 PM, Victoria Dye via GitGitGadget wrote:
> From: Victoria Dye <vdye@github.com>
>
> Update the stat info of the moved index entry in 'rename_index_entry_at()'
> if the entry is up-to-date with the index. Internally, 'git mv' uses
> 'rename_index_entry_at()' to move the source index entry to the destination.
> However, it directly copies the stat info of the original cache entry, which
> will not reflect the 'ctime' of the file renaming operation that happened as
> part of the move. If a file is otherwise up-to-date with the index, that
> difference in 'ctime' will make the entry appear out-of-date until the next
> index-refreshing operation (e.g., 'git status').
>
> Some commands, such as 'git reset', use the cached stat information to
> determine whether a file is up-to-date; if this information is incorrect,
> the command will fail when it should pass. In order to ensure a moved entry
> is evaluated as 'up-to-date' when appropriate, refresh the destination index
> entry's stat info in 'git mv' if and only if the file is up-to-date.
>
> Note that the test added in 't7001-mv.sh' requires a "sleep 1" to ensure the
> 'ctime' of the file creation will be definitively older than the 'ctime' of
> the renamed file in 'git mv'.
Unfortunate that this is necessary, but it seems to be the only way
to handle this because of the interaction with the system clock and
the filesystem. There are several sleeps like this in
t1701-racy-split-index.sh, for example.
> void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
> {
> - struct cache_entry *old_entry = istate->cache[nr], *new_entry;
> + struct cache_entry *old_entry = istate->cache[nr], *new_entry, *refreshed;
> int namelen = strlen(new_name);
>
> new_entry = make_empty_cache_entry(istate, namelen);
> @@ -147,7 +147,20 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
> cache_tree_invalidate_path(istate, old_entry->name);
> untracked_cache_remove_from_index(istate, old_entry->name);
> remove_index_entry_at(istate, nr);
> - add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
> +
> + /*
> + * Refresh the new index entry. Using 'refresh_cache_entry' ensures
> + * we only update stat info if the entry is otherwise up-to-date (i.e.,
> + * the contents/mode haven't changed). This ensures that we reflect the
> + * 'ctime' of the rename in the index without (incorrectly) updating
> + * the cached stat info to reflect unstaged changes on disk.
> + */
> + refreshed = refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
> + if (refreshed && refreshed != new_entry) {
> + add_index_entry(istate, refreshed, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
> + discard_cache_entry(new_entry);
I'm glad you're checking that both refreshed is non-NULL and not equal
to new_entry. Both are possible results from refresh_cache_entry().
> +test_expect_success 'mv -f refreshes updated index entry' '
> + echo test >bar &&
> + git add bar &&
> + git commit -m test &&
> +
> + echo foo >foo &&
> + git add foo &&
> +
> + # Wait one second to ensure ctime of rename will differ from original
> + # file creation ctime.
> + sleep 1 &&
> + git mv -f foo bar &&
> + git reset --merge HEAD &&
> +
> + # Verify the index has been reset
> + git diff-files >out &&
> + test_must_be_empty out
> +'
> +
New test looks good.
Thanks,
-Stolee
^ permalink raw reply [relevance 0%]
* [PATCH v2] mv: refresh stat info for moved entry
2022-03-25 1:56 11% [PATCH] mv: refresh stat info for moved entry Victoria Dye via GitGitGadget
@ 2022-03-29 1:07 9% ` Victoria Dye via GitGitGadget
2022-03-29 13:19 0% ` Derrick Stolee
0 siblings, 1 reply; 200+ results
From: Victoria Dye via GitGitGadget @ 2022-03-29 1:07 UTC (permalink / raw)
To: git; +Cc: reichemn, gitster, Derrick Stolee, Victoria Dye, Victoria Dye
From: Victoria Dye <vdye@github.com>
Update the stat info of the moved index entry in 'rename_index_entry_at()'
if the entry is up-to-date with the index. Internally, 'git mv' uses
'rename_index_entry_at()' to move the source index entry to the destination.
However, it directly copies the stat info of the original cache entry, which
will not reflect the 'ctime' of the file renaming operation that happened as
part of the move. If a file is otherwise up-to-date with the index, that
difference in 'ctime' will make the entry appear out-of-date until the next
index-refreshing operation (e.g., 'git status').
Some commands, such as 'git reset', use the cached stat information to
determine whether a file is up-to-date; if this information is incorrect,
the command will fail when it should pass. In order to ensure a moved entry
is evaluated as 'up-to-date' when appropriate, refresh the destination index
entry's stat info in 'git mv' if and only if the file is up-to-date.
Note that the test added in 't7001-mv.sh' requires a "sleep 1" to ensure the
'ctime' of the file creation will be definitively older than the 'ctime' of
the renamed file in 'git mv'.
Reported-by: Maximilian Reichel <reichemn@icloud.com>
Signed-off-by: Victoria Dye <vdye@github.com>
---
mv: refresh stat info for moved entry
This patch fixes a bug [1] encountered when executing 'git reset --merge
HEAD' immediately after 'git mv'. Because the stat info of the original
entry is copied to the new one, including all cached stat information,
the 'ctime' isn't updated corresponding to the rename. If the index
entry is otherwise up-to-date with the contents on-disk, the incorrect
'ctime' makes subsequent operations (e.g., 'git reset --merge') identify
the index entry as out-of-date, failing when they should succeed.
Note, however, that we use 'refresh_cache_entry()' to refresh the stat
information rather than 'fill_stat_cache_info()' directly because the
stat information should only be updated if the index entry is up-to-date
with the file on-disk. If we ignored this distinction, the stat info
would match the state of unstaged changes on-disk, not the entry in the
index as it should.
To avoid exiting 'git mv' with a stale index that may affect subsequent
commands, 'rename_index_entry_at()' (used internally by 'git mv') is
updated to refresh the destination index entry's stat information after
the move is complete.
[1]
https://lore.kernel.org/git/84FF8F9A-3A9A-4F2A-8D8E-5D50F2F06203@icloud.com/
Changes since V1
================
* Determined the exact cause of the failure (the mismatched 'ctime'),
as well as the reasoning for why the stat information cannot always
be updated; revised the implementation accordingly.
* Fixed usage of 'refresh_cache_entry()'; because it does not update
cache entries in-place, insert its return value into the index (if
valid), and discard the no-longer-needed 'new_entry' cache entry.
* Updated the test for the bug report scenario to wait long enough such
that the 'ctime' of the 'mv' is distinct from the original file
creation time.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1187%2Fvdye%2Freset%2Fmerge-inconsistency-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1187/vdye/reset/merge-inconsistency-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1187
Range-diff vs v1:
1: fe9f5f0d8ec ! 1: bde58070eda mv: refresh stat info for moved entry
@@ Metadata
## Commit message ##
mv: refresh stat info for moved entry
- Add 'refresh_cache_entry()' after moving the index entry in
- 'rename_index_entry_at()'. Internally, 'git mv' uses
- 'rename_index_entry_at()' to move the source index entry to the destination,
- overwriting the old entry if '-f' is specified. However, it does not refresh
- the stat information on destination index entry, making its 'CE_UPTODATE'
- flag out-of-date until the index is refreshed (e.g., by 'git status').
+ Update the stat info of the moved index entry in 'rename_index_entry_at()'
+ if the entry is up-to-date with the index. Internally, 'git mv' uses
+ 'rename_index_entry_at()' to move the source index entry to the destination.
+ However, it directly copies the stat info of the original cache entry, which
+ will not reflect the 'ctime' of the file renaming operation that happened as
+ part of the move. If a file is otherwise up-to-date with the index, that
+ difference in 'ctime' will make the entry appear out-of-date until the next
+ index-refreshing operation (e.g., 'git status').
- Some commands, such as 'git reset', assume the 'CE_UPTODATE' information
- they read from the index is accurate, and use that information to determine
- whether the operation can be done successfully or not. In order to ensure
- the index is correct for commands such as these, explicitly refresh the
- destination index entry in 'git mv' before exiting.
+ Some commands, such as 'git reset', use the cached stat information to
+ determine whether a file is up-to-date; if this information is incorrect,
+ the command will fail when it should pass. In order to ensure a moved entry
+ is evaluated as 'up-to-date' when appropriate, refresh the destination index
+ entry's stat info in 'git mv' if and only if the file is up-to-date.
+
+ Note that the test added in 't7001-mv.sh' requires a "sleep 1" to ensure the
+ 'ctime' of the file creation will be definitively older than the 'ctime' of
+ the renamed file in 'git mv'.
Reported-by: Maximilian Reichel <reichemn@icloud.com>
Signed-off-by: Victoria Dye <vdye@github.com>
## read-cache.c ##
+@@ read-cache.c: static void replace_index_entry(struct index_state *istate, int nr, struct cache
+
+ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
+ {
+- struct cache_entry *old_entry = istate->cache[nr], *new_entry;
++ struct cache_entry *old_entry = istate->cache[nr], *new_entry, *refreshed;
+ int namelen = strlen(new_name);
+
+ new_entry = make_empty_cache_entry(istate, namelen);
@@ read-cache.c: void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
+ cache_tree_invalidate_path(istate, old_entry->name);
untracked_cache_remove_from_index(istate, old_entry->name);
remove_index_entry_at(istate, nr);
- add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
-+ refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
+- add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
++
++ /*
++ * Refresh the new index entry. Using 'refresh_cache_entry' ensures
++ * we only update stat info if the entry is otherwise up-to-date (i.e.,
++ * the contents/mode haven't changed). This ensures that we reflect the
++ * 'ctime' of the rename in the index without (incorrectly) updating
++ * the cached stat info to reflect unstaged changes on disk.
++ */
++ refreshed = refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
++ if (refreshed && refreshed != new_entry) {
++ add_index_entry(istate, refreshed, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
++ discard_cache_entry(new_entry);
++ } else
++ add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
}
void fill_stat_data(struct stat_data *sd, struct stat *st)
@@ t/t7001-mv.sh: test_description='git mv in subdirs'
+
+ echo foo >foo &&
+ git add foo &&
++
++ # Wait one second to ensure ctime of rename will differ from original
++ # file creation ctime.
++ sleep 1 &&
+ git mv -f foo bar &&
-+ git reset --merge HEAD
++ git reset --merge HEAD &&
++
++ # Verify the index has been reset
++ git diff-files >out &&
++ test_must_be_empty out
+'
+
test_expect_success 'prepare reference tree' '
read-cache.c | 17 +++++++++++++++--
t/t7001-mv.sh | 19 +++++++++++++++++++
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index 3e0e7d41837..4df97e185e9 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -134,7 +134,7 @@ static void replace_index_entry(struct index_state *istate, int nr, struct cache
void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
{
- struct cache_entry *old_entry = istate->cache[nr], *new_entry;
+ struct cache_entry *old_entry = istate->cache[nr], *new_entry, *refreshed;
int namelen = strlen(new_name);
new_entry = make_empty_cache_entry(istate, namelen);
@@ -147,7 +147,20 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
cache_tree_invalidate_path(istate, old_entry->name);
untracked_cache_remove_from_index(istate, old_entry->name);
remove_index_entry_at(istate, nr);
- add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
+
+ /*
+ * Refresh the new index entry. Using 'refresh_cache_entry' ensures
+ * we only update stat info if the entry is otherwise up-to-date (i.e.,
+ * the contents/mode haven't changed). This ensures that we reflect the
+ * 'ctime' of the rename in the index without (incorrectly) updating
+ * the cached stat info to reflect unstaged changes on disk.
+ */
+ refreshed = refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
+ if (refreshed && refreshed != new_entry) {
+ add_index_entry(istate, refreshed, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
+ discard_cache_entry(new_entry);
+ } else
+ add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
}
void fill_stat_data(struct stat_data *sd, struct stat *st)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 963356ba5f9..a402908142d 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -4,6 +4,25 @@ test_description='git mv in subdirs'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff-data.sh
+test_expect_success 'mv -f refreshes updated index entry' '
+ echo test >bar &&
+ git add bar &&
+ git commit -m test &&
+
+ echo foo >foo &&
+ git add foo &&
+
+ # Wait one second to ensure ctime of rename will differ from original
+ # file creation ctime.
+ sleep 1 &&
+ git mv -f foo bar &&
+ git reset --merge HEAD &&
+
+ # Verify the index has been reset
+ git diff-files >out &&
+ test_must_be_empty out
+'
+
test_expect_success 'prepare reference tree' '
mkdir path0 path1 &&
COPYING_test_data >path0/COPYING &&
base-commit: abf474a5dd901f28013c52155411a48fd4c09922
--
gitgitgadget
^ permalink raw reply related [relevance 9%]
* [PATCH] mv: refresh stat info for moved entry
@ 2022-03-25 1:56 11% Victoria Dye via GitGitGadget
2022-03-29 1:07 9% ` [PATCH v2] " Victoria Dye via GitGitGadget
0 siblings, 1 reply; 200+ results
From: Victoria Dye via GitGitGadget @ 2022-03-25 1:56 UTC (permalink / raw)
To: git; +Cc: reichemn, gitster, Victoria Dye, Victoria Dye
From: Victoria Dye <vdye@github.com>
Add 'refresh_cache_entry()' after moving the index entry in
'rename_index_entry_at()'. Internally, 'git mv' uses
'rename_index_entry_at()' to move the source index entry to the destination,
overwriting the old entry if '-f' is specified. However, it does not refresh
the stat information on destination index entry, making its 'CE_UPTODATE'
flag out-of-date until the index is refreshed (e.g., by 'git status').
Some commands, such as 'git reset', assume the 'CE_UPTODATE' information
they read from the index is accurate, and use that information to determine
whether the operation can be done successfully or not. In order to ensure
the index is correct for commands such as these, explicitly refresh the
destination index entry in 'git mv' before exiting.
Reported-by: Maximilian Reichel <reichemn@icloud.com>
Signed-off-by: Victoria Dye <vdye@github.com>
---
mv: refresh stat info for moved entry
This patch fixes a bug [1] encountered when executing 'git reset --merge
HEAD' immediately after 'git mv -f' overwrites an existing index entry.
Because the 'CE_UPTODATE' flag is not refreshed on the destination entry
(and therefore incorrectly appeared to not be "up-to-date"), 'git reset
--merge HEAD' fails when it should otherwise succeed.
To avoid exiting 'git mv' with a stale index that may affect subsequent
commands, 'rename_index_entry_at()' (used internally by 'git mv') is
updated to refresh the destination index entry's stat information after
the move is complete.
[1]
https://lore.kernel.org/git/84FF8F9A-3A9A-4F2A-8D8E-5D50F2F06203@icloud.com/
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1187%2Fvdye%2Freset%2Fmerge-inconsistency-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1187/vdye/reset/merge-inconsistency-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1187
read-cache.c | 1 +
t/t7001-mv.sh | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/read-cache.c b/read-cache.c
index 1ad56d02e1d..2c5ccc48d6c 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -148,6 +148,7 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
untracked_cache_remove_from_index(istate, old_entry->name);
remove_index_entry_at(istate, nr);
add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
+ refresh_cache_entry(istate, new_entry, CE_MATCH_REFRESH);
}
void fill_stat_data(struct stat_data *sd, struct stat *st)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 963356ba5f9..ab8607678e7 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -4,6 +4,17 @@ test_description='git mv in subdirs'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff-data.sh
+test_expect_success 'mv -f refreshes updated index entry' '
+ echo test >bar &&
+ git add bar &&
+ git commit -m test &&
+
+ echo foo >foo &&
+ git add foo &&
+ git mv -f foo bar &&
+ git reset --merge HEAD
+'
+
test_expect_success 'prepare reference tree' '
mkdir path0 path1 &&
COPYING_test_data >path0/COPYING &&
base-commit: a68dfadae5e95c7f255cf38c9efdcbc2e36d1931
--
gitgitgadget
^ permalink raw reply related [relevance 11%]
* [PATCH v3 2/2] tests: stop using top-level "README" and "COPYING" files
2021-10-15 9:30 4% ` [PATCH v3 0/2] tests: stop relying on top-level COPYING and README Ævar Arnfjörð Bjarmason
@ 2021-10-15 9:30 10% ` Ævar Arnfjörð Bjarmason
0 siblings, 0 replies; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-10-15 9:30 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jeff King, Han-Wen Nienhuys,
Ævar Arnfjörð Bjarmason
In 459b8d22e54 (tests: do not borrow from COPYING and README from the
real source, 2015-02-15) tests that used "lib-diff.sh" (called
"diff-lib.sh" then) were made to stop relying on the top-level COPYING
file, but we still had other tests that referenced it.
Let's move them over to use the "COPYING_test_data" utility function
introduced in the preceding commit, and in the case of the one test
that needed the "README" file use a ROT 13 version of that "COPYING"
test data. That test added in afd222967c6 (Extend testing git-mv for
renaming of subdirectories, 2006-07-26) just needs more test data that's not the same as the "COPYING" test data, so a ROT 13 version will do.
This change removes the last references to ../{README,COPYING} in the
test suite.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
t/t4022-diff-rewrite.sh | 6 ++++--
t/t4023-diff-rename-typechange.sh | 11 ++++++-----
t/t7001-mv.sh | 5 +++--
t/t7101-reset-empty-subdirs.sh | 11 ++++++-----
4 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
index 6d1c3d949c7..1c89050a974 100755
--- a/t/t4022-diff-rewrite.sh
+++ b/t/t4022-diff-rewrite.sh
@@ -3,15 +3,17 @@
test_description='rewrite diff'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success setup '
- cat "$TEST_DIRECTORY"/../COPYING >test &&
+ COPYING_test_data >test.data &&
+ cp test.data test &&
git add test &&
tr \
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
"nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
- <"$TEST_DIRECTORY"/../COPYING >test &&
+ <test.data >test &&
echo "to be deleted" >test2 &&
blob=$(git hash-object test2) &&
blob=$(git rev-parse --short $blob) &&
diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 8c9823765e6..47d6f35dcc4 100755
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -3,25 +3,26 @@
test_description='typechange rename detection'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
test_expect_success setup '
rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
test_ln_s_add linklink bar &&
git add foo &&
git commit -a -m Initial &&
git tag one &&
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >bar &&
+ COPYING_test_data >bar &&
test_ln_s_add linklink foo &&
git add bar &&
git commit -a -m Second &&
git tag two &&
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
git add foo &&
git commit -a -m Third &&
git tag three &&
@@ -35,7 +36,7 @@ test_expect_success setup '
# This is purely for sanity check
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
cat "$TEST_DIRECTORY"/../Makefile >bar &&
git add foo bar &&
git commit -a -m Fifth &&
@@ -43,7 +44,7 @@ test_expect_success setup '
git rm -f foo bar &&
cat "$TEST_DIRECTORY"/../Makefile >foo &&
- cat "$TEST_DIRECTORY"/../COPYING >bar &&
+ COPYING_test_data >bar &&
git add foo bar &&
git commit -a -m Sixth &&
git tag six
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 25bb9bbb899..963356ba5f9 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -2,10 +2,11 @@
test_description='git mv in subdirs'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success 'prepare reference tree' '
mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a
'
@@ -107,7 +108,7 @@ test_expect_success 'clean up' '
'
test_expect_success 'adding another file' '
- cp "$TEST_DIRECTORY"/../README.md path0/README &&
+ COPYING_test_data | tr A-Za-z N-ZA-Mn-za-m >path0/README &&
git add path0/README &&
git commit -m add2 -a
'
diff --git a/t/t7101-reset-empty-subdirs.sh b/t/t7101-reset-empty-subdirs.sh
index bfce05ac5de..5530651eea4 100755
--- a/t/t7101-reset-empty-subdirs.sh
+++ b/t/t7101-reset-empty-subdirs.sh
@@ -5,10 +5,11 @@
test_description='git reset should cull empty subdirs'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success 'creating initial files' '
mkdir path0 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a
'
@@ -16,10 +17,10 @@ test_expect_success 'creating initial files' '
test_expect_success 'creating second files' '
mkdir path1 &&
mkdir path1/path2 &&
- cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING-TOO &&
+ COPYING_test_data >path1/path2/COPYING &&
+ COPYING_test_data >path1/COPYING &&
+ COPYING_test_data >COPYING &&
+ COPYING_test_data >path0/COPYING-TOO &&
git add path1/path2/COPYING &&
git add path1/COPYING &&
git add COPYING &&
--
2.33.1.1338.g20da966911a
^ permalink raw reply related [relevance 10%]
* [PATCH v3 0/2] tests: stop relying on top-level COPYING and README
2021-10-05 17:01 3% ` [PATCH v2 0/5] COPYING: modernize, steal boilerplate from linux.git Ævar Arnfjörð Bjarmason
2021-10-05 17:01 10% ` [PATCH v2 2/5] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
@ 2021-10-15 9:30 4% ` Ævar Arnfjörð Bjarmason
2021-10-15 9:30 10% ` [PATCH v3 2/2] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
1 sibling, 1 reply; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-10-15 9:30 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jeff King, Han-Wen Nienhuys,
Ævar Arnfjörð Bjarmason
These are test-only changes to have tests that rely on the contents of
the top-level README and COPYING files use smaller artificial test
data instead.
The v2 of this series proposed to follow this with updates to the
COPYING file. I asked the SFC folks about that and those comments
might result in an eventual update to those files to clarify certain
things with git's licencing.
But let's not have any such future update be larger because we needed
to deal with this test-only implementation detail first, and untangle
the dependency the tests have on those top-level in-tree files.
As the range diff shows this is the exact same series as v2, except
that the previous 3-5/5 patches have been discarded, this is just the
previous 1-2/5.
1. https://lore.kernel.org/git/cover-v2-0.5-00000000000-20211005T170031Z-avarab@gmail.com/
Ævar Arnfjörð Bjarmason (2):
"lib-diff" tests: make "README" and "COPYING" test data smaller
tests: stop using top-level "README" and "COPYING" files
t/.gitattributes | 1 -
t/lib-diff-data.sh | 22 ++
t/lib-diff.sh | 2 +
t/lib-diff/COPYING | 361 ------------------------------
t/lib-diff/README | 46 ----
t/t4003-diff-rename-1.sh | 4 +-
t/t4005-diff-rename-2.sh | 4 +-
t/t4007-rename-3.sh | 5 +-
t/t4008-diff-break-rewrite.sh | 4 +-
t/t4009-diff-rename-4.sh | 4 +-
t/t4022-diff-rewrite.sh | 6 +-
t/t4023-diff-rename-typechange.sh | 11 +-
t/t7001-mv.sh | 5 +-
t/t7101-reset-empty-subdirs.sh | 11 +-
14 files changed, 53 insertions(+), 433 deletions(-)
create mode 100644 t/lib-diff-data.sh
delete mode 100644 t/lib-diff/COPYING
delete mode 100644 t/lib-diff/README
Range-diff against v2:
1: f834cf74873 = 1: 02342124582 "lib-diff" tests: make "README" and "COPYING" test data smaller
2: f7cd2f31ccb = 2: f555ebb7055 tests: stop using top-level "README" and "COPYING" files
3: 44375bece46 < -: ----------- COPYING: remove mention of GPLv3, clarify sub-project COPYING
4: ccb26274cc6 < -: ----------- COPYING: move GPL text to a "GPL-2.0" file
5: 6fe2e601b13 < -: ----------- GPL-2.0: update to byte-for-byte match the FSF's version
--
2.33.1.1338.g20da966911a
^ permalink raw reply [relevance 4%]
* [PATCH v2 2/5] tests: stop using top-level "README" and "COPYING" files
2021-10-05 17:01 3% ` [PATCH v2 0/5] COPYING: modernize, steal boilerplate from linux.git Ævar Arnfjörð Bjarmason
@ 2021-10-05 17:01 10% ` Ævar Arnfjörð Bjarmason
2021-10-15 9:30 4% ` [PATCH v3 0/2] tests: stop relying on top-level COPYING and README Ævar Arnfjörð Bjarmason
1 sibling, 0 replies; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-10-05 17:01 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jeff King, Linus Torvalds, Greg Kroah-Hartman,
Mauro Carvalho Chehab, Han-Wen Nienhuys,
Ævar Arnfjörð Bjarmason
In 459b8d22e54 (tests: do not borrow from COPYING and README from the
real source, 2015-02-15) tests that used "lib-diff.sh" (called
"diff-lib.sh" then) were made to stop relying on the top-level COPYING
file, but we still had other tests that referenced it.
Let's move them over to use the "COPYING_test_data" utility function
introduced in the preceding commit, and in the case of the one test
that needed the "README" file use a ROT 13 version of that "COPYING"
test data. That test added in afd222967c6 (Extend testing git-mv for
renaming of subdirectories, 2006-07-26) just needs more test data that's not the same as the "COPYING" test data, so a ROT 13 version will do.
This change removes the last references to ../{README,COPYING} in the
test suite.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
t/t4022-diff-rewrite.sh | 6 ++++--
t/t4023-diff-rename-typechange.sh | 11 ++++++-----
t/t7001-mv.sh | 5 +++--
t/t7101-reset-empty-subdirs.sh | 11 ++++++-----
4 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
index 6d1c3d949c7..1c89050a974 100755
--- a/t/t4022-diff-rewrite.sh
+++ b/t/t4022-diff-rewrite.sh
@@ -3,15 +3,17 @@
test_description='rewrite diff'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success setup '
- cat "$TEST_DIRECTORY"/../COPYING >test &&
+ COPYING_test_data >test.data &&
+ cp test.data test &&
git add test &&
tr \
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
"nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
- <"$TEST_DIRECTORY"/../COPYING >test &&
+ <test.data >test &&
echo "to be deleted" >test2 &&
blob=$(git hash-object test2) &&
blob=$(git rev-parse --short $blob) &&
diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 8c9823765e6..47d6f35dcc4 100755
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -3,25 +3,26 @@
test_description='typechange rename detection'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
test_expect_success setup '
rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
test_ln_s_add linklink bar &&
git add foo &&
git commit -a -m Initial &&
git tag one &&
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >bar &&
+ COPYING_test_data >bar &&
test_ln_s_add linklink foo &&
git add bar &&
git commit -a -m Second &&
git tag two &&
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
git add foo &&
git commit -a -m Third &&
git tag three &&
@@ -35,7 +36,7 @@ test_expect_success setup '
# This is purely for sanity check
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
cat "$TEST_DIRECTORY"/../Makefile >bar &&
git add foo bar &&
git commit -a -m Fifth &&
@@ -43,7 +44,7 @@ test_expect_success setup '
git rm -f foo bar &&
cat "$TEST_DIRECTORY"/../Makefile >foo &&
- cat "$TEST_DIRECTORY"/../COPYING >bar &&
+ COPYING_test_data >bar &&
git add foo bar &&
git commit -a -m Sixth &&
git tag six
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 25bb9bbb899..963356ba5f9 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -2,10 +2,11 @@
test_description='git mv in subdirs'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success 'prepare reference tree' '
mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a
'
@@ -107,7 +108,7 @@ test_expect_success 'clean up' '
'
test_expect_success 'adding another file' '
- cp "$TEST_DIRECTORY"/../README.md path0/README &&
+ COPYING_test_data | tr A-Za-z N-ZA-Mn-za-m >path0/README &&
git add path0/README &&
git commit -m add2 -a
'
diff --git a/t/t7101-reset-empty-subdirs.sh b/t/t7101-reset-empty-subdirs.sh
index bfce05ac5de..5530651eea4 100755
--- a/t/t7101-reset-empty-subdirs.sh
+++ b/t/t7101-reset-empty-subdirs.sh
@@ -5,10 +5,11 @@
test_description='git reset should cull empty subdirs'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success 'creating initial files' '
mkdir path0 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a
'
@@ -16,10 +17,10 @@ test_expect_success 'creating initial files' '
test_expect_success 'creating second files' '
mkdir path1 &&
mkdir path1/path2 &&
- cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING-TOO &&
+ COPYING_test_data >path1/path2/COPYING &&
+ COPYING_test_data >path1/COPYING &&
+ COPYING_test_data >COPYING &&
+ COPYING_test_data >path0/COPYING-TOO &&
git add path1/path2/COPYING &&
git add path1/COPYING &&
git add COPYING &&
--
2.33.0.1441.gbbcdb4c3c66
^ permalink raw reply related [relevance 10%]
* [PATCH v2 0/5] COPYING: modernize, steal boilerplate from linux.git
2021-10-02 9:19 4% [PATCH 0/5] COPYING: modernize, steal boilerplate from linux.git Ævar Arnfjörð Bjarmason
2021-10-02 9:19 10% ` [PATCH 2/5] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
@ 2021-10-05 17:01 3% ` Ævar Arnfjörð Bjarmason
2021-10-05 17:01 10% ` [PATCH v2 2/5] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
2021-10-15 9:30 4% ` [PATCH v3 0/2] tests: stop relying on top-level COPYING and README Ævar Arnfjörð Bjarmason
1 sibling, 2 replies; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-10-05 17:01 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jeff King, Linus Torvalds, Greg Kroah-Hartman,
Mauro Carvalho Chehab, Han-Wen Nienhuys,
Ævar Arnfjörð Bjarmason
This updates our COPYING file to be in line with linux.git's to
clarify how the licenses of embedded sub-projects are handled. This
doesn't change Git's license in any way (still GPL v2).
See the v1 for a longer summary:
https://lore.kernel.org/git/cover-0.5-00000000000-20211002T091212Z-avarab@gmail.com/
This v2 fixes typos in 3/5, and clarifies why we need to use the
specific "COPYING" data in the lib-diff.sh tests.
Ævar Arnfjörð Bjarmason (5):
"lib-diff" tests: make "README" and "COPYING" test data smaller
tests: stop using top-level "README" and "COPYING" files
COPYING: remove mention of GPLv3, clarify sub-project COPYING
COPYING: move GPL text to a "GPL-2.0" file
GPL-2.0: update to byte-for-byte match the FSF's version
COPYING | 377 ++----------------------------
t/lib-diff/COPYING => GPL-2.0 | 60 ++---
t/.gitattributes | 1 -
t/lib-diff-data.sh | 22 ++
t/lib-diff.sh | 2 +
t/lib-diff/README | 46 ----
t/t4003-diff-rename-1.sh | 4 +-
t/t4005-diff-rename-2.sh | 4 +-
t/t4007-rename-3.sh | 5 +-
t/t4008-diff-break-rewrite.sh | 4 +-
t/t4009-diff-rename-4.sh | 4 +-
t/t4022-diff-rewrite.sh | 6 +-
t/t4023-diff-rename-typechange.sh | 11 +-
t/t7001-mv.sh | 5 +-
t/t7101-reset-empty-subdirs.sh | 11 +-
15 files changed, 89 insertions(+), 473 deletions(-)
rename t/lib-diff/COPYING => GPL-2.0 (92%)
create mode 100644 t/lib-diff-data.sh
delete mode 100644 t/lib-diff/README
Range-diff against v1:
1: 8a4ca06bce0 ! 1: f834cf74873 "lib-diff" tests: make "README" and "COPYING" test data smaller
@@ Commit message
"COPYING" as test data, or mock data that's dissimilar. Let's provide
that with a "COPYING_test_data" function instead.
+ We're not replacing this with some other generic test
+ data (e.g. "lorum ipsum") because these tests require test file header
+ to be the old "COPYING" file. See e.g. "t4003-diff-rename-1.sh" which
+ changes the file, and then does full "test_cmp" comparisons on the
+ resulting "git diff" output.
+
This change only changes tests that used the "lib-diff.sh" library,
but splits up what they need into a new "lib-diff-data.sh". A
subsequent commit will change related tests that were missed in
2: f07025682e1 = 2: f7cd2f31ccb tests: stop using top-level "README" and "COPYING" files
3: e91f8ce6984 ! 3: 44375bece46 COPYING: remove mention of GPLv3, clarify sub-project COPYING
@@ Commit message
The COPYING file added in [1] is a product of its era, at the time
discussions around the GPLv3 were quite active. Since then we have had
- almost on "GPL v2 or later" notices anywhere.
+ almost no "GPL v2 or later" notices anywhere.
Since then[2][3] linux.git has replaced its version of almost the
identical wording with something that's a bit more formal, and which
- isn't mostly addressing a hypothetical future GPL v3 migratin. Let's
+ isn't mostly addressing a hypothetical future GPL v3 migration. Let's
do the same. Now we:
A. Let it suffice to say that things are licensed under GPL v2 unless
4: 7804709f585 = 4: ccb26274cc6 COPYING: move GPL text to a "GPL-2.0" file
5: 0545fd06cac = 5: 6fe2e601b13 GPL-2.0: update to byte-for-byte match the FSF's version
--
2.33.0.1441.gbbcdb4c3c66
^ permalink raw reply [relevance 3%]
* [PATCH 2/5] tests: stop using top-level "README" and "COPYING" files
2021-10-02 9:19 4% [PATCH 0/5] COPYING: modernize, steal boilerplate from linux.git Ævar Arnfjörð Bjarmason
@ 2021-10-02 9:19 10% ` Ævar Arnfjörð Bjarmason
2021-10-05 17:01 3% ` [PATCH v2 0/5] COPYING: modernize, steal boilerplate from linux.git Ævar Arnfjörð Bjarmason
1 sibling, 0 replies; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-10-02 9:19 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jeff King, Linus Torvalds, Greg Kroah-Hartman,
Mauro Carvalho Chehab, Han-Wen Nienhuys,
Ævar Arnfjörð Bjarmason
In 459b8d22e54 (tests: do not borrow from COPYING and README from the
real source, 2015-02-15) tests that used "lib-diff.sh" (called
"diff-lib.sh" then) were made to stop relying on the top-level COPYING
file, but we still had other tests that referenced it.
Let's move them over to use the "COPYING_test_data" utility function
introduced in the preceding commit, and in the case of the one test
that needed the "README" file use a ROT 13 version of that "COPYING"
test data. That test added in afd222967c6 (Extend testing git-mv for
renaming of subdirectories, 2006-07-26) just needs more test data that's not the same as the "COPYING" test data, so a ROT 13 version will do.
This change removes the last references to ../{README,COPYING} in the
test suite.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
t/t4022-diff-rewrite.sh | 6 ++++--
t/t4023-diff-rename-typechange.sh | 11 ++++++-----
t/t7001-mv.sh | 5 +++--
t/t7101-reset-empty-subdirs.sh | 11 ++++++-----
4 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
index 6d1c3d949c7..1c89050a974 100755
--- a/t/t4022-diff-rewrite.sh
+++ b/t/t4022-diff-rewrite.sh
@@ -3,15 +3,17 @@
test_description='rewrite diff'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success setup '
- cat "$TEST_DIRECTORY"/../COPYING >test &&
+ COPYING_test_data >test.data &&
+ cp test.data test &&
git add test &&
tr \
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
"nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
- <"$TEST_DIRECTORY"/../COPYING >test &&
+ <test.data >test &&
echo "to be deleted" >test2 &&
blob=$(git hash-object test2) &&
blob=$(git rev-parse --short $blob) &&
diff --git a/t/t4023-diff-rename-typechange.sh b/t/t4023-diff-rename-typechange.sh
index 8c9823765e6..47d6f35dcc4 100755
--- a/t/t4023-diff-rename-typechange.sh
+++ b/t/t4023-diff-rename-typechange.sh
@@ -3,25 +3,26 @@
test_description='typechange rename detection'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
test_expect_success setup '
rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
test_ln_s_add linklink bar &&
git add foo &&
git commit -a -m Initial &&
git tag one &&
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >bar &&
+ COPYING_test_data >bar &&
test_ln_s_add linklink foo &&
git add bar &&
git commit -a -m Second &&
git tag two &&
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
git add foo &&
git commit -a -m Third &&
git tag three &&
@@ -35,7 +36,7 @@ test_expect_success setup '
# This is purely for sanity check
git rm -f foo bar &&
- cat "$TEST_DIRECTORY"/../COPYING >foo &&
+ COPYING_test_data >foo &&
cat "$TEST_DIRECTORY"/../Makefile >bar &&
git add foo bar &&
git commit -a -m Fifth &&
@@ -43,7 +44,7 @@ test_expect_success setup '
git rm -f foo bar &&
cat "$TEST_DIRECTORY"/../Makefile >foo &&
- cat "$TEST_DIRECTORY"/../COPYING >bar &&
+ COPYING_test_data >bar &&
git add foo bar &&
git commit -a -m Sixth &&
git tag six
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 25bb9bbb899..963356ba5f9 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -2,10 +2,11 @@
test_description='git mv in subdirs'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success 'prepare reference tree' '
mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a
'
@@ -107,7 +108,7 @@ test_expect_success 'clean up' '
'
test_expect_success 'adding another file' '
- cp "$TEST_DIRECTORY"/../README.md path0/README &&
+ COPYING_test_data | tr A-Za-z N-ZA-Mn-za-m >path0/README &&
git add path0/README &&
git commit -m add2 -a
'
diff --git a/t/t7101-reset-empty-subdirs.sh b/t/t7101-reset-empty-subdirs.sh
index bfce05ac5de..5530651eea4 100755
--- a/t/t7101-reset-empty-subdirs.sh
+++ b/t/t7101-reset-empty-subdirs.sh
@@ -5,10 +5,11 @@
test_description='git reset should cull empty subdirs'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff-data.sh
test_expect_success 'creating initial files' '
mkdir path0 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ COPYING_test_data >path0/COPYING &&
git add path0/COPYING &&
git commit -m add -a
'
@@ -16,10 +17,10 @@ test_expect_success 'creating initial files' '
test_expect_success 'creating second files' '
mkdir path1 &&
mkdir path1/path2 &&
- cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING COPYING &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING-TOO &&
+ COPYING_test_data >path1/path2/COPYING &&
+ COPYING_test_data >path1/COPYING &&
+ COPYING_test_data >COPYING &&
+ COPYING_test_data >path0/COPYING-TOO &&
git add path1/path2/COPYING &&
git add path1/COPYING &&
git add COPYING &&
--
2.33.0.1380.g193143c62ce
^ permalink raw reply related [relevance 10%]
* [PATCH 0/5] COPYING: modernize, steal boilerplate from linux.git
@ 2021-10-02 9:19 4% Ævar Arnfjörð Bjarmason
2021-10-02 9:19 10% ` [PATCH 2/5] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
2021-10-05 17:01 3% ` [PATCH v2 0/5] COPYING: modernize, steal boilerplate from linux.git Ævar Arnfjörð Bjarmason
0 siblings, 2 replies; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-10-02 9:19 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jeff King, Linus Torvalds, Greg Kroah-Hartman,
Mauro Carvalho Chehab, Han-Wen Nienhuys,
Ævar Arnfjörð Bjarmason
There's patches to git.git to add a BSD-licensed reftable/ directory
with its own "COPYING" file[1]. I think that for such a thing to be
in-tree we should have some note in the top-level "COPYING" explaining
git's license, but that subdirectories or other files could be under
their own licenses.
This series reaches the end-state of pretty much stealing linux.git's
"COPYING" file, including specific wording they have. linux.git used
to have pretty much git.git's "COPYING" file (as git.git's was derived
from an older version), but has since diverged.
In linux.git there's a reference to
"Documentation/process/license-rules.rst", this new COPYING file
covers the relevant parts inline, but like linux.git's the end-state
is that the GPLv2 is not inline in the "COPYING" file anymore, instead
it's split into a GPL-2.0" and referenced by it.
The "meaty" part of this series (which I've CC'd Linus, Greg & Mauro,
who were involved in the linux.git changes) is 3-5/5. The first two
patches are just dealing with the implementation detail that git.git's
"COPYING" file happened to be used by its test suite as test data, it
couldn't be changed significantly without changing those (mostly "git
diffdiff") tests.
1. https://lore.kernel.org/git/xmqqtui4k1j5.fsf@gitster.g/
Ævar Arnfjörð Bjarmason (5):
"lib-diff" tests: make "README" and "COPYING" test data smaller
tests: stop using top-level "README" and "COPYING" files
COPYING: remove mention of GPLv3, clarify sub-project COPYING
COPYING: move GPL text to a "GPL-2.0" file
GPL-2.0: update to byte-for-byte match the FSF's version
COPYING | 377 ++----------------------------
t/lib-diff/COPYING => GPL-2.0 | 60 ++---
t/.gitattributes | 1 -
t/lib-diff-data.sh | 22 ++
t/lib-diff.sh | 2 +
t/lib-diff/README | 46 ----
t/t4003-diff-rename-1.sh | 4 +-
t/t4005-diff-rename-2.sh | 4 +-
t/t4007-rename-3.sh | 5 +-
t/t4008-diff-break-rewrite.sh | 4 +-
t/t4009-diff-rename-4.sh | 4 +-
t/t4022-diff-rewrite.sh | 6 +-
t/t4023-diff-rename-typechange.sh | 11 +-
t/t7001-mv.sh | 5 +-
t/t7101-reset-empty-subdirs.sh | 11 +-
15 files changed, 89 insertions(+), 473 deletions(-)
rename t/lib-diff/COPYING => GPL-2.0 (92%)
create mode 100644 t/lib-diff-data.sh
delete mode 100644 t/lib-diff/README
--
2.33.0.1380.g193143c62ce
^ permalink raw reply [relevance 4%]
* Re: [PATCH] t2080: fix cp invocation to copy symlinks instead of following them
2021-06-02 11:22 0% ` Đoàn Trần Công Danh
@ 2021-06-02 13:36 0% ` Ævar Arnfjörð Bjarmason
0 siblings, 0 replies; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-06-02 13:36 UTC (permalink / raw)
To: Đoàn Trần Công Danh
Cc: Matheus Tavares, gitster, git, brian m . carlson
On Wed, Jun 02 2021, Đoàn Trần Công Danh wrote:
> On 2021-06-02 12:50:53+0200, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
>>
>> On Wed, Jun 02 2021, Đoàn Trần Công Danh wrote:
>>
>> > On 2021-05-31 16:01:01+0200, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
>> >>
>> >> On Thu, May 27 2021, Ævar Arnfjörð Bjarmason wrote:
>> >>
>> >> > On Wed, May 26 2021, Matheus Tavares wrote:
>> >> >
>> >> >> t2080 makes a few copies of a test repository and later performs a
>> >> >> branch switch on each one of the copies to verify that parallel checkout
>> >> >> and sequential checkout produce the same results. However, the
>> >> >> repository is copied with `cp -R` which, on some systems, defaults to
>> >> >> following symlinks on the directory hierarchy and copying their target
>> >> >> files instead of copying the symlinks themselves. AIX is one example of
>> >> >> system where this happens. Because the symlinks are not preserved, the
>> >> >> copied repositories have paths that do not match what is in the index,
>> >> >> causing git to abort the checkout operation that we want to test. This
>> >> >> makes the test fail on these systems.
>> >> >>
>> >> >> Fix this by copying the repository with the POSIX flag '-P', which
>> >> >> forces cp to copy the symlinks instead of following them. Note that we
>> >> >> already use this flag for other cp invocations in our test suite (see
>> >> >> t7001). With this change, t2080 now passes on AIX.
>> >> >>
>> >> >> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>> >> >> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
>> >> >> ---
>> >> >> t/t2080-parallel-checkout-basics.sh | 2 +-
>> >> >> 1 file changed, 1 insertion(+), 1 deletion(-)
>> >> >>
>> >> >> diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
>> >> >> index 7087818550..3e0f8c675f 100755
>> >> >> --- a/t/t2080-parallel-checkout-basics.sh
>> >> >> +++ b/t/t2080-parallel-checkout-basics.sh
>> >> >> @@ -114,7 +114,7 @@ do
>> >> >>
>> >> >> test_expect_success "$mode checkout" '
>> >> >> repo=various_$mode &&
>> >> >> - cp -R various $repo &&
>> >> >> + cp -R -P various $repo &&
>> >> >>
>> >> >> # The just copied files have more recent timestamps than their
>> >> >> # associated index entries. So refresh the cached timestamps
>> >> >
>> >> > Thanks for the quick fix, I can confirm that this makes the test pass on
>> >> > AIX 7.2.
>> >>
>> >> There's still a failure[1] in t2082-parallel-checkout-attributes.sh
>> >> though, which is new in 2.32.0-rc*. The difference is in an unexpected
>> >> BOM:
>> >>
>> >> avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t2082-parallel-checkout-attributes/encoding/A.internal
>> >> efbbbf74657874
>> >> avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t2082-parallel-checkout-attributes/encoding/utf8-text
>> >> 74657874
>> >>
>> >> I.e. the A.internal starts with 0xefbbbf. The 2nd test of t0028*.sh also
>> >> fails similarly[2], so perhaps it's some old/iconv/whatever issue not
>> >> per-se related to any change of yours.
>> >
>> > The 0xefbbbf looks interesting, it's BOM for utf-8.
>> >
>> >> I tried compiling with both NO_ICONV=Y and ICONV_OMITS_BOM=Y, both have
>> >> the same failure.
>> >
>> > I didn't check the code-path for NO_ICONV=Y but ICONV_OMITS_BOM=Y only
>> > affects output of converting *to* utf-16 and utf-32.
>> >
>> > So, I think AIX iconv implementation automatically add BOM to utf-8?
>> >
>> > Perhap we need to call skip_utf8_bom somewhere?
>>
>> I debugged this a bit more, it's probably *also* an issue in our use of
>> libiconv, but it goes wrong just with our test setup with
>> iconv(1). I.e. on my boring linux box:
>>
>> echo x | iconv -f UTF-8 -t UTF-16 | perl -0777 -MData::Dumper -ne 'my @a = map { sprintf "0x%x", $_ } unpack "C*"; print Dumper \@a'
>> $VAR1 = [
>> '0xff',
>> '0xfe',
>> '0x78',
>> '0x0',
>> '0xa',
>> '0x0'
>> ];
>>
>>
>> On the AIX box to get the same I need to do that as:
>>
>> (printf '\376\377'; echo x | iconv -f UTF-8 -t UTF-16LE) | [...]
>
> FWIW, my Linux with musl-libc also need to be done like this.
>
>> I.e. we omit the BOM *and* AIX's idea of our UTF-16 is little-endian
>> UTF-16, a plain UTF-16 gives you the big-endian version.
>
> Per spec, plain UTF-16 *is* big-endian. [1]
>
> In the table <BOM> indicates that the byte order is determined
> by a byte order mark, if present at the beginning of the data
> stream, otherwise it is big-endian.
>
>> To make things
>> worse the same is true of UTF-32, except "iconv -l" lists no UTF-32LE
>> version. So it seems we can't get the same result at all for that one.
>
> Ditto for UTF-32
>
>> So from the outset the code added around 79444c92943 (utf8: handle
>> systems that don't write BOM for UTF-16, 2019-02-12) needs to be more
>> careful (although this looked broken before), i.e. we should test exact
>> known-good bytes and see if UTF-16 is really what we think it is,
>> etc. This is likely broken on any big-endian non-GNUish iconv
>> implementation.
>
> Linux with musl-libc on little endian also thinks UTF-16 without BOM is UTF-16-BE
>
> I still think we should strip UTF-8 BOM after reencode_string_len
> I.e. something like this, I can't test this, though, since I don't have any AIX box.
> And my Linux with musl-libc doesn't output BOM for utf-8
> It doesn't write BOM for utf-16be and utf-32be, anyway.
>
> -----8<----
> diff --git a/utf8.c b/utf8.c
> index de4ce5c0e6..73631632bd 100644
> --- a/utf8.c
> +++ b/utf8.c
> @@ -8,6 +8,7 @@ static const char utf16_be_bom[] = {'\xFE', '\xFF'};
> static const char utf16_le_bom[] = {'\xFF', '\xFE'};
> static const char utf32_be_bom[] = {'\0', '\0', '\xFE', '\xFF'};
> static const char utf32_le_bom[] = {'\xFF', '\xFE', '\0', '\0'};
> +const char utf8_bom[] = "\357\273\277";
>
> struct interval {
> ucs_char_t first;
> @@ -28,6 +29,12 @@ size_t display_mode_esc_sequence_len(const char *s)
> return p - s;
> }
>
> +static int has_utf8_bom(const char *text, size_t len)
> +{
> + return len >= strlen(utf8_bom) &&
> + memcmp(text, utf8_bom, strlen(utf8_bom)) == 0;
> +}
> +
> /* auxiliary function for binary search in interval table */
> static int bisearch(ucs_char_t ucs, const struct interval *table, int max)
> {
> @@ -539,12 +546,13 @@ static const char *fallback_encoding(const char *name)
>
> char *reencode_string_len(const char *in, size_t insz,
> const char *out_encoding, const char *in_encoding,
> - size_t *outsz)
> + size_t *outsz_p)
> {
> iconv_t conv;
> char *out;
> const char *bom_str = NULL;
> size_t bom_len = 0;
> + size_t outsz = 0;
>
> if (!in_encoding)
> return NULL;
> @@ -590,10 +598,16 @@ char *reencode_string_len(const char *in, size_t insz,
> if (conv == (iconv_t) -1)
> return NULL;
> }
> - out = reencode_string_iconv(in, insz, conv, bom_len, outsz);
> + out = reencode_string_iconv(in, insz, conv, bom_len, &outsz);
> iconv_close(conv);
> if (out && bom_str && bom_len)
> memcpy(out, bom_str, bom_len);
> + if (is_encoding_utf8(out_encoding) && has_utf8_bom(out, outsz)) {
> + outsz -= strlen(utf8_bom);
> + memmove(out, out + strlen(utf8_bom), outsz + 1);
> + }
> + if (outsz_p)
> + *outsz_p = outsz;
> return out;
> }
> #endif
> @@ -782,12 +796,9 @@ int is_hfs_dotmailmap(const char *path)
> return is_hfs_dot_str(path, "mailmap");
> }
>
> -const char utf8_bom[] = "\357\273\277";
> -
> int skip_utf8_bom(char **text, size_t len)
> {
> - if (len < strlen(utf8_bom) ||
> - memcmp(*text, utf8_bom, strlen(utf8_bom)))
> + if (!has_utf8_bom(*text, len))
> return 0;
> *text += strlen(utf8_bom);
> return 1;
> ---->8------
>
> 1: https://unicode.org/faq/utf_bom.html
That's getting us there, now we don't fail on the 2nd test, but do start
failing on the third "re-encode to UTF-16 on checkout" and other
"checkout" tests.
The "test_cmp" at the end of that 3rd tests shows that the difference in
test.utf16.raw and test.utf16 is now that the "raw" one has the BOM, but
not the "test.utf16" file.
^ permalink raw reply [relevance 0%]
* Re: [PATCH] t2080: fix cp invocation to copy symlinks instead of following them
2021-06-02 10:50 0% ` Ævar Arnfjörð Bjarmason
@ 2021-06-02 11:22 0% ` Đoàn Trần Công Danh
2021-06-02 13:36 0% ` Ævar Arnfjörð Bjarmason
0 siblings, 1 reply; 200+ results
From: Đoàn Trần Công Danh @ 2021-06-02 11:22 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason
Cc: Matheus Tavares, gitster, git, brian m . carlson
On 2021-06-02 12:50:53+0200, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
>
> On Wed, Jun 02 2021, Đoàn Trần Công Danh wrote:
>
> > On 2021-05-31 16:01:01+0200, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> >>
> >> On Thu, May 27 2021, Ævar Arnfjörð Bjarmason wrote:
> >>
> >> > On Wed, May 26 2021, Matheus Tavares wrote:
> >> >
> >> >> t2080 makes a few copies of a test repository and later performs a
> >> >> branch switch on each one of the copies to verify that parallel checkout
> >> >> and sequential checkout produce the same results. However, the
> >> >> repository is copied with `cp -R` which, on some systems, defaults to
> >> >> following symlinks on the directory hierarchy and copying their target
> >> >> files instead of copying the symlinks themselves. AIX is one example of
> >> >> system where this happens. Because the symlinks are not preserved, the
> >> >> copied repositories have paths that do not match what is in the index,
> >> >> causing git to abort the checkout operation that we want to test. This
> >> >> makes the test fail on these systems.
> >> >>
> >> >> Fix this by copying the repository with the POSIX flag '-P', which
> >> >> forces cp to copy the symlinks instead of following them. Note that we
> >> >> already use this flag for other cp invocations in our test suite (see
> >> >> t7001). With this change, t2080 now passes on AIX.
> >> >>
> >> >> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> >> >> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
> >> >> ---
> >> >> t/t2080-parallel-checkout-basics.sh | 2 +-
> >> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >> >>
> >> >> diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
> >> >> index 7087818550..3e0f8c675f 100755
> >> >> --- a/t/t2080-parallel-checkout-basics.sh
> >> >> +++ b/t/t2080-parallel-checkout-basics.sh
> >> >> @@ -114,7 +114,7 @@ do
> >> >>
> >> >> test_expect_success "$mode checkout" '
> >> >> repo=various_$mode &&
> >> >> - cp -R various $repo &&
> >> >> + cp -R -P various $repo &&
> >> >>
> >> >> # The just copied files have more recent timestamps than their
> >> >> # associated index entries. So refresh the cached timestamps
> >> >
> >> > Thanks for the quick fix, I can confirm that this makes the test pass on
> >> > AIX 7.2.
> >>
> >> There's still a failure[1] in t2082-parallel-checkout-attributes.sh
> >> though, which is new in 2.32.0-rc*. The difference is in an unexpected
> >> BOM:
> >>
> >> avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t2082-parallel-checkout-attributes/encoding/A.internal
> >> efbbbf74657874
> >> avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t2082-parallel-checkout-attributes/encoding/utf8-text
> >> 74657874
> >>
> >> I.e. the A.internal starts with 0xefbbbf. The 2nd test of t0028*.sh also
> >> fails similarly[2], so perhaps it's some old/iconv/whatever issue not
> >> per-se related to any change of yours.
> >
> > The 0xefbbbf looks interesting, it's BOM for utf-8.
> >
> >> I tried compiling with both NO_ICONV=Y and ICONV_OMITS_BOM=Y, both have
> >> the same failure.
> >
> > I didn't check the code-path for NO_ICONV=Y but ICONV_OMITS_BOM=Y only
> > affects output of converting *to* utf-16 and utf-32.
> >
> > So, I think AIX iconv implementation automatically add BOM to utf-8?
> >
> > Perhap we need to call skip_utf8_bom somewhere?
>
> I debugged this a bit more, it's probably *also* an issue in our use of
> libiconv, but it goes wrong just with our test setup with
> iconv(1). I.e. on my boring linux box:
>
> echo x | iconv -f UTF-8 -t UTF-16 | perl -0777 -MData::Dumper -ne 'my @a = map { sprintf "0x%x", $_ } unpack "C*"; print Dumper \@a'
> $VAR1 = [
> '0xff',
> '0xfe',
> '0x78',
> '0x0',
> '0xa',
> '0x0'
> ];
>
>
> On the AIX box to get the same I need to do that as:
>
> (printf '\376\377'; echo x | iconv -f UTF-8 -t UTF-16LE) | [...]
FWIW, my Linux with musl-libc also need to be done like this.
> I.e. we omit the BOM *and* AIX's idea of our UTF-16 is little-endian
> UTF-16, a plain UTF-16 gives you the big-endian version.
Per spec, plain UTF-16 *is* big-endian. [1]
In the table <BOM> indicates that the byte order is determined
by a byte order mark, if present at the beginning of the data
stream, otherwise it is big-endian.
> To make things
> worse the same is true of UTF-32, except "iconv -l" lists no UTF-32LE
> version. So it seems we can't get the same result at all for that one.
Ditto for UTF-32
> So from the outset the code added around 79444c92943 (utf8: handle
> systems that don't write BOM for UTF-16, 2019-02-12) needs to be more
> careful (although this looked broken before), i.e. we should test exact
> known-good bytes and see if UTF-16 is really what we think it is,
> etc. This is likely broken on any big-endian non-GNUish iconv
> implementation.
Linux with musl-libc on little endian also thinks UTF-16 without BOM is UTF-16-BE
I still think we should strip UTF-8 BOM after reencode_string_len
I.e. something like this, I can't test this, though, since I don't have any AIX box.
And my Linux with musl-libc doesn't output BOM for utf-8
It doesn't write BOM for utf-16be and utf-32be, anyway.
-----8<----
diff --git a/utf8.c b/utf8.c
index de4ce5c0e6..73631632bd 100644
--- a/utf8.c
+++ b/utf8.c
@@ -8,6 +8,7 @@ static const char utf16_be_bom[] = {'\xFE', '\xFF'};
static const char utf16_le_bom[] = {'\xFF', '\xFE'};
static const char utf32_be_bom[] = {'\0', '\0', '\xFE', '\xFF'};
static const char utf32_le_bom[] = {'\xFF', '\xFE', '\0', '\0'};
+const char utf8_bom[] = "\357\273\277";
struct interval {
ucs_char_t first;
@@ -28,6 +29,12 @@ size_t display_mode_esc_sequence_len(const char *s)
return p - s;
}
+static int has_utf8_bom(const char *text, size_t len)
+{
+ return len >= strlen(utf8_bom) &&
+ memcmp(text, utf8_bom, strlen(utf8_bom)) == 0;
+}
+
/* auxiliary function for binary search in interval table */
static int bisearch(ucs_char_t ucs, const struct interval *table, int max)
{
@@ -539,12 +546,13 @@ static const char *fallback_encoding(const char *name)
char *reencode_string_len(const char *in, size_t insz,
const char *out_encoding, const char *in_encoding,
- size_t *outsz)
+ size_t *outsz_p)
{
iconv_t conv;
char *out;
const char *bom_str = NULL;
size_t bom_len = 0;
+ size_t outsz = 0;
if (!in_encoding)
return NULL;
@@ -590,10 +598,16 @@ char *reencode_string_len(const char *in, size_t insz,
if (conv == (iconv_t) -1)
return NULL;
}
- out = reencode_string_iconv(in, insz, conv, bom_len, outsz);
+ out = reencode_string_iconv(in, insz, conv, bom_len, &outsz);
iconv_close(conv);
if (out && bom_str && bom_len)
memcpy(out, bom_str, bom_len);
+ if (is_encoding_utf8(out_encoding) && has_utf8_bom(out, outsz)) {
+ outsz -= strlen(utf8_bom);
+ memmove(out, out + strlen(utf8_bom), outsz + 1);
+ }
+ if (outsz_p)
+ *outsz_p = outsz;
return out;
}
#endif
@@ -782,12 +796,9 @@ int is_hfs_dotmailmap(const char *path)
return is_hfs_dot_str(path, "mailmap");
}
-const char utf8_bom[] = "\357\273\277";
-
int skip_utf8_bom(char **text, size_t len)
{
- if (len < strlen(utf8_bom) ||
- memcmp(*text, utf8_bom, strlen(utf8_bom)))
+ if (!has_utf8_bom(*text, len))
return 0;
*text += strlen(utf8_bom);
return 1;
---->8------
1: https://unicode.org/faq/utf_bom.html
--
Danh
^ permalink raw reply related [relevance 0%]
* Re: [PATCH] t2080: fix cp invocation to copy symlinks instead of following them
2021-06-02 1:36 0% ` Đoàn Trần Công Danh
@ 2021-06-02 10:50 0% ` Ævar Arnfjörð Bjarmason
2021-06-02 11:22 0% ` Đoàn Trần Công Danh
0 siblings, 1 reply; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-06-02 10:50 UTC (permalink / raw)
To: Đoàn Trần Công Danh
Cc: Matheus Tavares, gitster, git, brian m . carlson
On Wed, Jun 02 2021, Đoàn Trần Công Danh wrote:
> On 2021-05-31 16:01:01+0200, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
>>
>> On Thu, May 27 2021, Ævar Arnfjörð Bjarmason wrote:
>>
>> > On Wed, May 26 2021, Matheus Tavares wrote:
>> >
>> >> t2080 makes a few copies of a test repository and later performs a
>> >> branch switch on each one of the copies to verify that parallel checkout
>> >> and sequential checkout produce the same results. However, the
>> >> repository is copied with `cp -R` which, on some systems, defaults to
>> >> following symlinks on the directory hierarchy and copying their target
>> >> files instead of copying the symlinks themselves. AIX is one example of
>> >> system where this happens. Because the symlinks are not preserved, the
>> >> copied repositories have paths that do not match what is in the index,
>> >> causing git to abort the checkout operation that we want to test. This
>> >> makes the test fail on these systems.
>> >>
>> >> Fix this by copying the repository with the POSIX flag '-P', which
>> >> forces cp to copy the symlinks instead of following them. Note that we
>> >> already use this flag for other cp invocations in our test suite (see
>> >> t7001). With this change, t2080 now passes on AIX.
>> >>
>> >> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>> >> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
>> >> ---
>> >> t/t2080-parallel-checkout-basics.sh | 2 +-
>> >> 1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >> diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
>> >> index 7087818550..3e0f8c675f 100755
>> >> --- a/t/t2080-parallel-checkout-basics.sh
>> >> +++ b/t/t2080-parallel-checkout-basics.sh
>> >> @@ -114,7 +114,7 @@ do
>> >>
>> >> test_expect_success "$mode checkout" '
>> >> repo=various_$mode &&
>> >> - cp -R various $repo &&
>> >> + cp -R -P various $repo &&
>> >>
>> >> # The just copied files have more recent timestamps than their
>> >> # associated index entries. So refresh the cached timestamps
>> >
>> > Thanks for the quick fix, I can confirm that this makes the test pass on
>> > AIX 7.2.
>>
>> There's still a failure[1] in t2082-parallel-checkout-attributes.sh
>> though, which is new in 2.32.0-rc*. The difference is in an unexpected
>> BOM:
>>
>> avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t2082-parallel-checkout-attributes/encoding/A.internal
>> efbbbf74657874
>> avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t2082-parallel-checkout-attributes/encoding/utf8-text
>> 74657874
>>
>> I.e. the A.internal starts with 0xefbbbf. The 2nd test of t0028*.sh also
>> fails similarly[2], so perhaps it's some old/iconv/whatever issue not
>> per-se related to any change of yours.
>
> The 0xefbbbf looks interesting, it's BOM for utf-8.
>
>> I tried compiling with both NO_ICONV=Y and ICONV_OMITS_BOM=Y, both have
>> the same failure.
>
> I didn't check the code-path for NO_ICONV=Y but ICONV_OMITS_BOM=Y only
> affects output of converting *to* utf-16 and utf-32.
>
> So, I think AIX iconv implementation automatically add BOM to utf-8?
>
> Perhap we need to call skip_utf8_bom somewhere?
I debugged this a bit more, it's probably *also* an issue in our use of
libiconv, but it goes wrong just with our test setup with
iconv(1). I.e. on my boring linux box:
echo x | iconv -f UTF-8 -t UTF-16 | perl -0777 -MData::Dumper -ne 'my @a = map { sprintf "0x%x", $_ } unpack "C*"; print Dumper \@a'
$VAR1 = [
'0xff',
'0xfe',
'0x78',
'0x0',
'0xa',
'0x0'
];
On the AIX box to get the same I need to do that as:
(printf '\376\377'; echo x | iconv -f UTF-8 -t UTF-16LE) | [...]
I.e. we omit the BOM *and* AIX's idea of our UTF-16 is little-endian
UTF-16, a plain UTF-16 gives you the big-endian version. To make things
worse the same is true of UTF-32, except "iconv -l" lists no UTF-32LE
version. So it seems we can't get the same result at all for that one.
So from the outset the code added around 79444c92943 (utf8: handle
systems that don't write BOM for UTF-16, 2019-02-12) needs to be more
careful (although this looked broken before), i.e. we should test exact
known-good bytes and see if UTF-16 is really what we think it is,
etc. This is likely broken on any big-endian non-GNUish iconv
implementation.
^ permalink raw reply [relevance 0%]
* Re: [PATCH] t2080: fix cp invocation to copy symlinks instead of following them
2021-05-31 14:01 0% ` Ævar Arnfjörð Bjarmason
@ 2021-06-02 1:36 0% ` Đoàn Trần Công Danh
2021-06-02 10:50 0% ` Ævar Arnfjörð Bjarmason
0 siblings, 1 reply; 200+ results
From: Đoàn Trần Công Danh @ 2021-06-02 1:36 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: Matheus Tavares, gitster, git
On 2021-05-31 16:01:01+0200, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
>
> On Thu, May 27 2021, Ævar Arnfjörð Bjarmason wrote:
>
> > On Wed, May 26 2021, Matheus Tavares wrote:
> >
> >> t2080 makes a few copies of a test repository and later performs a
> >> branch switch on each one of the copies to verify that parallel checkout
> >> and sequential checkout produce the same results. However, the
> >> repository is copied with `cp -R` which, on some systems, defaults to
> >> following symlinks on the directory hierarchy and copying their target
> >> files instead of copying the symlinks themselves. AIX is one example of
> >> system where this happens. Because the symlinks are not preserved, the
> >> copied repositories have paths that do not match what is in the index,
> >> causing git to abort the checkout operation that we want to test. This
> >> makes the test fail on these systems.
> >>
> >> Fix this by copying the repository with the POSIX flag '-P', which
> >> forces cp to copy the symlinks instead of following them. Note that we
> >> already use this flag for other cp invocations in our test suite (see
> >> t7001). With this change, t2080 now passes on AIX.
> >>
> >> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> >> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
> >> ---
> >> t/t2080-parallel-checkout-basics.sh | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
> >> index 7087818550..3e0f8c675f 100755
> >> --- a/t/t2080-parallel-checkout-basics.sh
> >> +++ b/t/t2080-parallel-checkout-basics.sh
> >> @@ -114,7 +114,7 @@ do
> >>
> >> test_expect_success "$mode checkout" '
> >> repo=various_$mode &&
> >> - cp -R various $repo &&
> >> + cp -R -P various $repo &&
> >>
> >> # The just copied files have more recent timestamps than their
> >> # associated index entries. So refresh the cached timestamps
> >
> > Thanks for the quick fix, I can confirm that this makes the test pass on
> > AIX 7.2.
>
> There's still a failure[1] in t2082-parallel-checkout-attributes.sh
> though, which is new in 2.32.0-rc*. The difference is in an unexpected
> BOM:
>
> avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t2082-parallel-checkout-attributes/encoding/A.internal
> efbbbf74657874
> avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t2082-parallel-checkout-attributes/encoding/utf8-text
> 74657874
>
> I.e. the A.internal starts with 0xefbbbf. The 2nd test of t0028*.sh also
> fails similarly[2], so perhaps it's some old/iconv/whatever issue not
> per-se related to any change of yours.
The 0xefbbbf looks interesting, it's BOM for utf-8.
> I tried compiling with both NO_ICONV=Y and ICONV_OMITS_BOM=Y, both have
> the same failure.
I didn't check the code-path for NO_ICONV=Y but ICONV_OMITS_BOM=Y only
affects output of converting *to* utf-16 and utf-32.
So, I think AIX iconv implementation automatically add BOM to utf-8?
Perhap we need to call skip_utf8_bom somewhere?
-- Danh
> In any case, I think AIX test failures (or other obscure platforms I
> test) are rather uninteresting per-se, I mainly test on these to smoke
> out bad assumptions elsewhere. E.g. non-POSIX code, perhaps in this case
> we're relying on some unportable iconv assumption, or maybe not...
>
>
> 1.
> Initialized empty Git repository in /scratch/avar/git/t/trash directory.t2082-parallel-checkout-attributes/encoding/.git/
> + cd encoding
> + echo text
> + 1> utf8-text
> + write_utf16
> + 0< utf8-text 1> utf16-text
> checking prerequisite: NO_UTF16_BOM
>
> mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
> (
> cd "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
> test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6
>
> )
> + mkdir -p /scratch/avar/git/t/trash directory.t2082-parallel-checkout-attributes/prereq-test-dir-NO_UTF16_BOM
> + cd /scratch/avar/git/t/trash directory.t2082-parallel-checkout-attributes/prereq-test-dir-NO_UTF16_BOM
> + printf abc
> + iconv -f UTF-8 -t UTF-16
> + wc -c
> + test 6 = 6
> prerequisite NO_UTF16_BOM ok
> + echo A working-tree-encoding=UTF-16
> + 1> .gitattributes
> + cp utf16-text A
> + cp utf8-text B
> + git add A B .gitattributes
> + git commit -m encoding
> [master (root-commit) 65fa7e8] encoding
> Author: A U Thor <author@example.com>
> 3 files changed, 3 insertions(+)
> create mode 100644 .gitattributes
> create mode 100644 A
> create mode 100644 B
> + git cat-file -p :A
> + 1> A.internal
> + test_cmp_bin utf8-text A.internal
> utf8-text A.internal differ: char 1, line 1
> error: last command exited with $?=1
> not ok 2 - parallel-checkout with re-encoding
> #
> # set_checkout_config 2 0 &&
> # git init encoding &&
> # (
> # cd encoding &&
> # echo text >utf8-text &&
> # write_utf16 <utf8-text >utf16-text &&
> #
> # echo "A working-tree-encoding=UTF-16" >.gitattributes &&
> # cp utf16-text A &&
> # cp utf8-text B &&
> # git add A B .gitattributes &&
> # git commit -m encoding &&
> #
> # # Check that A is stored in UTF-8
> # git cat-file -p :A >A.internal &&
> # test_cmp_bin utf8-text A.internal &&
> #
> # rm A B &&
> # test_checkout_workers 2 git checkout A B &&
> #
> # # Check that A (and only A) is re-encoded during checkout
> # test_cmp_bin utf16-text A &&
> # test_cmp_bin utf8-text B
> # )
> #
>
> 2.
>
> avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t0028-working-tree-encoding/test.utf8.raw
> 68616c6c6f20746865726521
> 63616e20796f752072656164206d653f
> avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t0028-working-tree-encoding/test.utf16.git
> efbbbf68616c6c6f20746865726521
> 63616e20796f752072656164206d653f
--
Danh
^ permalink raw reply [relevance 0%]
* Re: [PATCH] t2080: fix cp invocation to copy symlinks instead of following them
2021-05-27 12:51 0% ` Ævar Arnfjörð Bjarmason
@ 2021-05-31 14:01 0% ` Ævar Arnfjörð Bjarmason
2021-06-02 1:36 0% ` Đoàn Trần Công Danh
0 siblings, 1 reply; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-05-31 14:01 UTC (permalink / raw)
To: Matheus Tavares; +Cc: gitster, git
On Thu, May 27 2021, Ævar Arnfjörð Bjarmason wrote:
> On Wed, May 26 2021, Matheus Tavares wrote:
>
>> t2080 makes a few copies of a test repository and later performs a
>> branch switch on each one of the copies to verify that parallel checkout
>> and sequential checkout produce the same results. However, the
>> repository is copied with `cp -R` which, on some systems, defaults to
>> following symlinks on the directory hierarchy and copying their target
>> files instead of copying the symlinks themselves. AIX is one example of
>> system where this happens. Because the symlinks are not preserved, the
>> copied repositories have paths that do not match what is in the index,
>> causing git to abort the checkout operation that we want to test. This
>> makes the test fail on these systems.
>>
>> Fix this by copying the repository with the POSIX flag '-P', which
>> forces cp to copy the symlinks instead of following them. Note that we
>> already use this flag for other cp invocations in our test suite (see
>> t7001). With this change, t2080 now passes on AIX.
>>
>> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
>> ---
>> t/t2080-parallel-checkout-basics.sh | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
>> index 7087818550..3e0f8c675f 100755
>> --- a/t/t2080-parallel-checkout-basics.sh
>> +++ b/t/t2080-parallel-checkout-basics.sh
>> @@ -114,7 +114,7 @@ do
>>
>> test_expect_success "$mode checkout" '
>> repo=various_$mode &&
>> - cp -R various $repo &&
>> + cp -R -P various $repo &&
>>
>> # The just copied files have more recent timestamps than their
>> # associated index entries. So refresh the cached timestamps
>
> Thanks for the quick fix, I can confirm that this makes the test pass on
> AIX 7.2.
There's still a failure[1] in t2082-parallel-checkout-attributes.sh
though, which is new in 2.32.0-rc*. The difference is in an unexpected
BOM:
avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t2082-parallel-checkout-attributes/encoding/A.internal
efbbbf74657874
avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t2082-parallel-checkout-attributes/encoding/utf8-text
74657874
I.e. the A.internal starts with 0xefbbbf. The 2nd test of t0028*.sh also
fails similarly[2], so perhaps it's some old/iconv/whatever issue not
per-se related to any change of yours.
I tried compiling with both NO_ICONV=Y and ICONV_OMITS_BOM=Y, both have
the same failure.
In any case, I think AIX test failures (or other obscure platforms I
test) are rather uninteresting per-se, I mainly test on these to smoke
out bad assumptions elsewhere. E.g. non-POSIX code, perhaps in this case
we're relying on some unportable iconv assumption, or maybe not...
1.
Initialized empty Git repository in /scratch/avar/git/t/trash directory.t2082-parallel-checkout-attributes/encoding/.git/
+ cd encoding
+ echo text
+ 1> utf8-text
+ write_utf16
+ 0< utf8-text 1> utf16-text
checking prerequisite: NO_UTF16_BOM
mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
(
cd "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF16_BOM" &&
test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6
)
+ mkdir -p /scratch/avar/git/t/trash directory.t2082-parallel-checkout-attributes/prereq-test-dir-NO_UTF16_BOM
+ cd /scratch/avar/git/t/trash directory.t2082-parallel-checkout-attributes/prereq-test-dir-NO_UTF16_BOM
+ printf abc
+ iconv -f UTF-8 -t UTF-16
+ wc -c
+ test 6 = 6
prerequisite NO_UTF16_BOM ok
+ echo A working-tree-encoding=UTF-16
+ 1> .gitattributes
+ cp utf16-text A
+ cp utf8-text B
+ git add A B .gitattributes
+ git commit -m encoding
[master (root-commit) 65fa7e8] encoding
Author: A U Thor <author@example.com>
3 files changed, 3 insertions(+)
create mode 100644 .gitattributes
create mode 100644 A
create mode 100644 B
+ git cat-file -p :A
+ 1> A.internal
+ test_cmp_bin utf8-text A.internal
utf8-text A.internal differ: char 1, line 1
error: last command exited with $?=1
not ok 2 - parallel-checkout with re-encoding
#
# set_checkout_config 2 0 &&
# git init encoding &&
# (
# cd encoding &&
# echo text >utf8-text &&
# write_utf16 <utf8-text >utf16-text &&
#
# echo "A working-tree-encoding=UTF-16" >.gitattributes &&
# cp utf16-text A &&
# cp utf8-text B &&
# git add A B .gitattributes &&
# git commit -m encoding &&
#
# # Check that A is stored in UTF-8
# git cat-file -p :A >A.internal &&
# test_cmp_bin utf8-text A.internal &&
#
# rm A B &&
# test_checkout_workers 2 git checkout A B &&
#
# # Check that A (and only A) is re-encoded during checkout
# test_cmp_bin utf16-text A &&
# test_cmp_bin utf8-text B
# )
#
2.
avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t0028-working-tree-encoding/test.utf8.raw
68616c6c6f20746865726521
63616e20796f752072656164206d653f
avar@gcc119:[/scratch/avar/git/t]perl -nle 'print unpack "H*"' trash\ directory.t0028-working-tree-encoding/test.utf16.git
efbbbf68616c6c6f20746865726521
63616e20796f752072656164206d653f
^ permalink raw reply [relevance 0%]
* Re: [PATCH] t2080: fix cp invocation to copy symlinks instead of following them
2021-05-26 23:58 4% [PATCH] t2080: fix cp invocation to copy symlinks instead of following them Matheus Tavares
2021-05-27 7:25 6% ` Christian Couder
@ 2021-05-27 12:51 0% ` Ævar Arnfjörð Bjarmason
2021-05-31 14:01 0% ` Ævar Arnfjörð Bjarmason
1 sibling, 1 reply; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-05-27 12:51 UTC (permalink / raw)
To: Matheus Tavares; +Cc: gitster, git
On Wed, May 26 2021, Matheus Tavares wrote:
> t2080 makes a few copies of a test repository and later performs a
> branch switch on each one of the copies to verify that parallel checkout
> and sequential checkout produce the same results. However, the
> repository is copied with `cp -R` which, on some systems, defaults to
> following symlinks on the directory hierarchy and copying their target
> files instead of copying the symlinks themselves. AIX is one example of
> system where this happens. Because the symlinks are not preserved, the
> copied repositories have paths that do not match what is in the index,
> causing git to abort the checkout operation that we want to test. This
> makes the test fail on these systems.
>
> Fix this by copying the repository with the POSIX flag '-P', which
> forces cp to copy the symlinks instead of following them. Note that we
> already use this flag for other cp invocations in our test suite (see
> t7001). With this change, t2080 now passes on AIX.
>
> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
> ---
> t/t2080-parallel-checkout-basics.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
> index 7087818550..3e0f8c675f 100755
> --- a/t/t2080-parallel-checkout-basics.sh
> +++ b/t/t2080-parallel-checkout-basics.sh
> @@ -114,7 +114,7 @@ do
>
> test_expect_success "$mode checkout" '
> repo=various_$mode &&
> - cp -R various $repo &&
> + cp -R -P various $repo &&
>
> # The just copied files have more recent timestamps than their
> # associated index entries. So refresh the cached timestamps
Thanks for the quick fix, I can confirm that this makes the test pass on
AIX 7.2.
^ permalink raw reply [relevance 0%]
* Re: [PATCH] t2080: fix cp invocation to copy symlinks instead of following them
2021-05-26 23:58 4% [PATCH] t2080: fix cp invocation to copy symlinks instead of following them Matheus Tavares
@ 2021-05-27 7:25 6% ` Christian Couder
2021-05-27 12:51 0% ` Ævar Arnfjörð Bjarmason
1 sibling, 0 replies; 200+ results
From: Christian Couder @ 2021-05-27 7:25 UTC (permalink / raw)
To: Matheus Tavares
Cc: Junio C Hamano, git, Ævar Arnfjörð Bjarmason
Just a few nits that you can take into account if you reroll the patch
for another reason, but I am not sure they are worth rerolling by
themselves.
On Thu, May 27, 2021 at 3:27 AM Matheus Tavares
<matheus.bernardino@usp.br> wrote:
>
> t2080 makes a few copies of a test repository and later performs a
> branch switch on each one of the copies to verify that parallel checkout
> and sequential checkout produce the same results. However, the
> repository is copied with `cp -R` which, on some systems, defaults to
> following symlinks on the directory hierarchy and copying their target
> files instead of copying the symlinks themselves. AIX is one example of
> system where this happens. Because the symlinks are not preserved, the
> copied repositories have paths that do not match what is in the index,
> causing git to abort the checkout operation that we want to test. This
s/git/Git/
> makes the test fail on these systems.
>
> Fix this by copying the repository with the POSIX flag '-P', which
> forces cp to copy the symlinks instead of following them. Note that we
> already use this flag for other cp invocations in our test suite (see
> t7001).
Maybe you could mention 00764ca10e (test: fix t7001 cp to use POSIX
options, 2014-04-11) that also fixed t7001 in a similar way.
> With this change, t2080 now passes on AIX.
Thanks!
^ permalink raw reply [relevance 6%]
* [PATCH] t2080: fix cp invocation to copy symlinks instead of following them
@ 2021-05-26 23:58 4% Matheus Tavares
2021-05-27 7:25 6% ` Christian Couder
2021-05-27 12:51 0% ` Ævar Arnfjörð Bjarmason
0 siblings, 2 replies; 200+ results
From: Matheus Tavares @ 2021-05-26 23:58 UTC (permalink / raw)
To: gitster; +Cc: git, avarab
t2080 makes a few copies of a test repository and later performs a
branch switch on each one of the copies to verify that parallel checkout
and sequential checkout produce the same results. However, the
repository is copied with `cp -R` which, on some systems, defaults to
following symlinks on the directory hierarchy and copying their target
files instead of copying the symlinks themselves. AIX is one example of
system where this happens. Because the symlinks are not preserved, the
copied repositories have paths that do not match what is in the index,
causing git to abort the checkout operation that we want to test. This
makes the test fail on these systems.
Fix this by copying the repository with the POSIX flag '-P', which
forces cp to copy the symlinks instead of following them. Note that we
already use this flag for other cp invocations in our test suite (see
t7001). With this change, t2080 now passes on AIX.
Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
---
t/t2080-parallel-checkout-basics.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
index 7087818550..3e0f8c675f 100755
--- a/t/t2080-parallel-checkout-basics.sh
+++ b/t/t2080-parallel-checkout-basics.sh
@@ -114,7 +114,7 @@ do
test_expect_success "$mode checkout" '
repo=various_$mode &&
- cp -R various $repo &&
+ cp -R -P various $repo &&
# The just copied files have more recent timestamps than their
# associated index entries. So refresh the cached timestamps
--
2.31.1
^ permalink raw reply related [relevance 4%]
* Re: AIX failures on parallel checkout (new in v2.32.0-rc*)
2021-05-26 22:01 5% ` Matheus Tavares Bernardino
@ 2021-05-26 23:00 5% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-05-26 23:00 UTC (permalink / raw)
To: Matheus Tavares Bernardino
Cc: Ævar Arnfjörð Bjarmason, git, Christian Couder,
Jeff Hostetler, Derrick Stolee, Torsten Bögershausen
Matheus Tavares Bernardino <matheus.bernardino@usp.br> writes:
> Hi, Ævar
>
> On Wed, May 26, 2021 at 3:40 PM Ævar Arnfjörð Bjarmason
> <avarab@gmail.com> wrote:
>>
>> + test_checkout_workers 0 git -C various_sequential checkout --recurse-submodules B2
>> error: Your local changes to the following files would be overwritten by checkout:
>> d
>> h
>> j
>> Please commit your changes or stash them before you switch branches.
>> Aborting
>
> I requested an account on the GCC farm to debug this, and the problem
> seems to be that AIX's `cp -R` defaults to following symlinks instead
> of copying them. In the above error message, 'd', 'h' and 'j' are all
> symlinks which were followed when copying the test repo, so these
> paths indeed won't match what's in the index, which makes checkout
> abort.
>
> Fortunately, there is a POSIX option to force cp to copy the symlinks:
> '-P'. Adding this flag to the cp invocation at line 117 of t2080 makes
> all parallel checkout tests pass on AIX.
>
> We also already use `cp -R -P` in the test suite (at t7001), and
> without any prereq, so I guess all platforms we are testing git at do
> support this flag in cp. I'll send a patch adding the flag at t2080.
Thanks for a quick analysis. Very much appreciated.
00764ca1 (test: fix t7001 cp to use POSIX options, 2014-04-11) only
mentions that "-R -P -p" is used now in place of "-a" that we used
to use (the latter of which is not POSIX). Please highlight why we
want -P in the log message (i.e. we want to copy the link in these
tests because ...) for the fixing commit.
Thanks.
^ permalink raw reply [relevance 5%]
* Re: AIX failures on parallel checkout (new in v2.32.0-rc*)
@ 2021-05-26 22:01 5% ` Matheus Tavares Bernardino
2021-05-26 23:00 5% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Matheus Tavares Bernardino @ 2021-05-26 22:01 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason
Cc: git, Christian Couder, Jeff Hostetler, Derrick Stolee,
Torsten Bögershausen
Hi, Ævar
On Wed, May 26, 2021 at 3:40 PM Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
>
> + test_checkout_workers 0 git -C various_sequential checkout --recurse-submodules B2
> error: Your local changes to the following files would be overwritten by checkout:
> d
> h
> j
> Please commit your changes or stash them before you switch branches.
> Aborting
I requested an account on the GCC farm to debug this, and the problem
seems to be that AIX's `cp -R` defaults to following symlinks instead
of copying them. In the above error message, 'd', 'h' and 'j' are all
symlinks which were followed when copying the test repo, so these
paths indeed won't match what's in the index, which makes checkout
abort.
Fortunately, there is a POSIX option to force cp to copy the symlinks:
'-P'. Adding this flag to the cp invocation at line 117 of t2080 makes
all parallel checkout tests pass on AIX.
We also already use `cp -R -P` in the test suite (at t7001), and
without any prereq, so I guess all platforms we are testing git at do
support this flag in cp. I'll send a patch adding the flag at t2080.
^ permalink raw reply [relevance 5%]
* [ANNOUNCE] Git v2.31.0
@ 2021-03-15 19:30 4% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-03-15 19:30 UTC (permalink / raw)
To: git
The latest feature release Git v2.31.0 is now available at the
usual places. It is comprised of 679 non-merge commits since
v2.30.0, contributed by 85 people, 23 of which are new faces [*].
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.31.0'
tag and the 'master' branch that the tag points at:
url = https://git.kernel.org/pub/scm/git/git
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.30.0 are as follows.
Welcome to the Git development community!
Aleksey Kliger, Andreas Bühmann, Andrew Klotz, Andrzej Hunt,
Antonio Russo, Arnaud Morin, Bagas Sanjaya, Christian Walther,
Clement Moyroud, Daniel Levin, Daniel Troger, Harold Kim,
Jacob Vosmaer, LeSeulArtichaut, Mikhail Klyushin, Neeraj Singh,
Sangeeta Jain, Seth House, Shubham Verma, Utku Gultopu, Vasyl
Vavrychuk, Vojtěch Knyttl, and ZheNing Hu.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Abhishek Kumar, Adam Dinwoodie, Ævar Arnfjörð Bjarmason,
Alexander Shopov, Alex Henrie, Arusekk, brian m. carlson,
Christian Couder, Christopher Diaz Riveros, Dana Dahlstrom,
Daniel Santos, Denton Liu, Derrick Stolee, Dimitriy Ryazantcev,
Elijah Newren, Emir Sarı, Eric Sunshine, Eric Wong, Felipe
Contreras, Han-Wen Nienhuys, Hariom Verma, Heba Waly, Jean-Noël
Avila, Jeff Hostetler, Jeff King, Jiang Xin, Joey Salazar,
Johannes Schindelin, Johannes Sixt, Jonathan Nieder, Jonathan
Tan, Jordi Mas, Junio C Hamano, Kevin Daudt, Kevin Willford,
Lars Schneider, Martin Ågren, Martin von Zweigbergk, Matheus
Tavares, Matthias Rüster, Michael Haggerty, Patrick Steinhardt,
Paul Jolly, Peter Kaestle, Peter Krefting, Phil Hord, Philippe
Blain, Phillip Szelat, Phillip Wood, Pranit Bauva, Pratyush
Yadav, Rafael Silva, Ralf Thielow, René Scharfe, Ross Light,
Sergey Organov, SZEDER Gábor, Taylor Blau, Thomas Ackermann,
Torsten Bögershausen, Trần Ngọc Quân, and Yi-Jyun Pan.
[*] We are counting not just the authorship contribution but
issue reporting, testing and reviewing that are recorded
in the commit trailers.
----------------------------------------------------------------
Git 2.31 Release Notes
======================
Updates since v2.30
-------------------
Backward incompatible and other important changes
* The "pack-redundant" command, which has been left stale with almost
unusable performance issues, now warns loudly when it gets used, as
we no longer want to recommend its use (instead just "repack -d"
instead).
* The development community has adopted Contributor Covenant v2.0 to
update from v1.4 that we have been using.
* The support for deprecated PCRE1 library has been dropped.
* Fixes for CVE-2021-21300 in Git 2.30.2 (and earlier) is included.
UI, Workflows & Features
* The "--format=%(trailers)" mechanism gets enhanced to make it
easier to design output for machine consumption.
* When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.
* The configuration variable 'core.abbrev' can be set to 'no' to
force no abbreviation regardless of the hash algorithm.
* "git rev-parse" can be explicitly told to give output as absolute
or relative path with the `--path-format=(absolute|relative)` option.
* Bash completion (in contrib/) update to make it easier for
end-users to add completion for their custom "git" subcommands.
* "git maintenance" learned to drive scheduled maintenance on
platforms whose native scheduling methods are not 'cron'.
* After expiring a reflog and making a single commit, the reflog for
the branch would record a single entry that knows both @{0} and
@{1}, but we failed to answer "what commit were we on?", i.e. @{1}
* "git bundle" learns "--stdin" option to read its refs from the
standard input. Also, it now does not lose refs whey they point
at the same object.
* "git log" learned a new "--diff-merges=<how>" option.
* "git ls-files" can and does show multiple entries when the index is
unmerged, which is a source for confusion unless -s/-u option is in
use. A new option --deduplicate has been introduced.
* `git worktree list` now annotates worktrees as prunable, shows
locked and prunable attributes in --porcelain mode, and gained
a --verbose option.
* "git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
* There are other ways than ".." for a single token to denote a
"commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
range-diff" did not understand them.
* The "git range-diff" command learned "--(left|right)-only" option
to show only one side of the compared range.
* "git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
* The .mailmap is documented to be read only from the root level of a
working tree, but a stray file in a bare repository also was read
by accident, which has been corrected.
* "git maintenance" tool learned a new "pack-refs" maintenance task.
* The error message given when a configuration variable that is
expected to have a boolean value has been improved.
* Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
* "git rev-list" command learned "--disk-usage" option.
* "git {diff,log} --{skip,rotate}-to=<path>" allows the user to
discard diff output for early paths or move them to the end of the
output.
* "git difftool" learned "--skip-to=<path>" option to restart an
interrupted session from an arbitrary path.
* "git grep" has been tweaked to be limited to the sparse checkout
paths.
* "git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.
Performance, Internal Implementation, Development Support etc.
* A 3-year old test that was not testing anything useful has been
corrected.
* Retire more names with "sha1" in it.
* The topological walk codepath is covered by new trace2 stats.
* Update the Code-of-conduct to version 2.0 from the upstream (we've
been using version 1.4).
* "git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
* Two new ways to feed configuration variable-value pairs via
environment variables have been introduced, and the way
GIT_CONFIG_PARAMETERS encodes variable/value pairs has been tweaked
to make it more robust.
* Tests have been updated so that they do not to get affected by the
name of the default branch "git init" creates.
* "git fetch" learns to treat ref updates atomically in all-or-none
fashion, just like "git push" does, with the new "--atomic" option.
* The peel_ref() API has been replaced with peel_iterated_oid().
* The .use_shell flag in struct child_process that is passed to
run_command() API has been clarified with a bit more documentation.
* Document, clean-up and optimize the code around the cache-tree
extension in the index.
* The ls-refs protocol operation has been optimized to narrow the
sub-hierarchy of refs/ it walks to produce response.
* When removing many branches and tags, the code used to do so one
ref at a time. There is another API it can use to delete multiple
refs, and it makes quite a lot of performance difference when the
refs are packed.
* The "pack-objects" command needs to iterate over all the tags when
automatic tag following is enabled, but it actually iterated over
all refs and then discarded everything outside "refs/tags/"
hierarchy, which was quite wasteful.
* A perf script was made more portable.
* Our setting of GitHub CI test jobs were a bit too eager to give up
once there is even one failure found. Tweak the knob to allow
other jobs keep running even when we see a failure, so that we can
find more failures in a single run.
* We've carried compatibility codepaths for compilers without
variadic macros for quite some time, but the world may be ready for
them to be removed. Force compilation failure on exotic platforms
where variadic macros are not available to find out who screams in
such a way that we can easily revert if it turns out that the world
is not yet ready.
* Code clean-up to ensure our use of hashtables using object names as
keys use the "struct object_id" objects, not the raw hash values.
* Lose the debugging aid that may have been useful in the past, but
no longer is, in the "grep" codepaths.
* Some pretty-format specifiers do not need the data in commit object
(e.g. "%H"), but we were over-eager to load and parse it, which has
been made even lazier.
* Get rid of "GETTEXT_POISON" support altogether, which may or may
not be controversial.
* Introduce an on-disk file to record revindex for packdata, which
traditionally was always created on the fly and only in-core.
* The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
* Piecemeal of rewrite of "git bisect" in C continues.
* When a pager spawned by us exited, the trace log did not record its
exit status correctly, which has been corrected.
* Removal of GIT_TEST_GETTEXT_POISON continues.
* The code to implement "git merge-base --independent" was poorly
done and was kept from the very beginning of the feature.
* Preliminary changes to fsmonitor integration.
* Performance improvements for rename detection.
* The common code to deal with "chunked file format" that is shared
by the multi-pack-index and commit-graph files have been factored
out, to help codepaths for both filetypes to become more robust.
* The approach to "fsck" the incoming objects in "index-pack" is
attractive for performance reasons (we have them already in core,
inflated and ready to be inspected), but fundamentally cannot be
applied fully when we receive more than one pack stream, as a tree
object in one pack may refer to a blob object in another pack as
".gitmodules", when we want to inspect blobs that are used as
".gitmodules" file, for example. Teach "index-pack" to emit
objects that must be inspected later and check them in the calling
"fetch-pack" process.
* The logic to handle "trailer" related placeholders in the
"--format=" mechanisms in the "log" family and "for-each-ref"
family is getting unified.
* Raise the buffer size used when writing the index file out from
(obviously too small) 8kB to (clearly sufficiently large) 128kB.
* It is reported that open() on some platforms (e.g. macOS Big Sur)
can return EINTR even though our timers are set up with SA_RESTART.
A workaround has been implemented and enabled for macOS to rerun
open() transparently from the caller when this happens.
Fixes since v2.30
-----------------
* Diagnose command line error of "git rebase" early.
* Clean up option descriptions in "git cmd --help".
* "git stash" did not work well in a sparsely checked out working
tree.
* Some tests expect that "ls -l" output has either '-' or 'x' for
group executable bit, but setgid bit can be inherited from parent
directory and make these fields 'S' or 's' instead, causing test
failures.
* "git for-each-repo --config=<var> <cmd>" should not run <cmd> for
any repository when the configuration variable <var> is not defined
even once.
* Fix 2.29 regression where "git mergetool --tool-help" fails to list
all the available tools.
* Fix for procedure to building CI test environment for mac.
* The implementation of "git branch --sort" wrt the detached HEAD
display has always been hacky, which has been cleaned up.
* Newline characters in the host and path part of git:// URL are
now forbidden.
* "git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
* When more than one commit with the same patch ID appears on one
side, "git log --cherry-pick A...B" did not exclude them all when a
commit with the same patch ID appears on the other side. Now it
does.
* Documentation for "git fsck" lost stale bits that has become
incorrect.
* Doc fix for packfile URI feature.
* When "git rebase -i" processes "fixup" insn, there is no reason to
clean up the commit log message, but we did the usual stripspace
processing. This has been corrected.
(merge f7d42ceec5 js/rebase-i-commit-cleanup-fix later to maint).
* Fix in passing custom args from "git clone" to "upload-pack" on the
other side.
(merge ad6b5fefbd jv/upload-pack-filter-spec-quotefix later to maint).
* The command line completion (in contrib/) completed "git branch -d"
with branch names, but "git branch -D" offered tagnames in addition,
which has been corrected. "git branch -M" had the same problem.
(merge 27dc071b9a jk/complete-branch-force-delete later to maint).
* When commands are started from a subdirectory, they may have to
compare the path to the subdirectory (called prefix and found out
from $(pwd)) with the tracked paths. On macOS, $(pwd) and
readdir() yield decomposed path, while the tracked paths are
usually normalized to the precomposed form, causing mismatch. This
has been fixed by taking the same approach used to normalize the
command line arguments.
(merge 5c327502db tb/precompose-prefix-too later to maint).
* Even though invocations of "die()" were logged to the trace2
system, "BUG()"s were not, which has been corrected.
(merge 0a9dde4a04 jt/trace2-BUG later to maint).
* "git grep --untracked" is meant to be "let's ALSO find in these
files on the filesystem" when looking for matches in the working
tree files, and does not make any sense if the primary search is
done against the index, or the tree objects. The "--cached" and
"--untracked" options have been marked as mutually incompatible.
(merge 0c5d83b248 mt/grep-cached-untracked later to maint).
* Fix "git fsck --name-objects" which apparently has not been used by
anybody who is motivated enough to report breakage.
(merge e89f89361c js/fsck-name-objects-fix later to maint).
* Avoid individual tests in t5411 from getting affected by each other
by forcing them to use separate output files during the test.
(merge 822ee894f6 jx/t5411-unique-filenames later to maint).
* Test to make sure "git rev-parse one-thing one-thing" gives
the same thing twice (when one-thing is --since=X).
(merge a5cdca4520 ew/rev-parse-since-test later to maint).
* When certain features (e.g. grafts) used in the repository are
incompatible with the use of the commit-graph, we used to silently
turned commit-graph off; we now tell the user what we are doing.
(merge c85eec7fc3 js/commit-graph-warning later to maint).
* Objects that lost references can be pruned away, even when they
have notes attached to it (and these notes will become dangling,
which in turn can be pruned with "git notes prune"). This has been
clarified in the documentation.
(merge fa9ab027ba mz/doc-notes-are-not-anchors later to maint).
* The error codepath around the "--temp/--prefix" feature of "git
checkout-index" has been improved.
(merge 3f7ba60350 mt/checkout-index-corner-cases later to maint).
* The "git maintenance register" command had trouble registering bare
repositories, which had been corrected.
* A handful of multi-word configuration variable names in
documentation that are spelled in all lowercase have been corrected
to use the more canonical camelCase.
(merge 7dd0eaa39c dl/doc-config-camelcase later to maint).
* "git push $there --delete ''" should have been diagnosed as an
error, but instead turned into a matching push, which has been
corrected.
(merge 20e416409f jc/push-delete-nothing later to maint).
* Test script modernization.
(merge 488acf15df sv/t7001-modernize later to maint).
* An under-allocation for the untracked cache data has been corrected.
(merge 6347d649bc jh/untracked-cache-fix later to maint).
* Other code cleanup, docfix, build fix, etc.
(merge e3f5da7e60 sg/t7800-difftool-robustify later to maint).
(merge 9d336655ba js/doc-proto-v2-response-end later to maint).
(merge 1b5b8cf072 jc/maint-column-doc-typofix later to maint).
(merge 3a837b58e3 cw/pack-config-doc later to maint).
(merge 01168a9d89 ug/doc-commit-approxidate later to maint).
(merge b865734760 js/params-vs-args later to maint).
----------------------------------------------------------------
Changes since v2.30.0 are as follows:
Abhishek Kumar (11):
commit-graph: fix regression when computing Bloom filters
revision: parse parent in indegree_walk_step()
commit-graph: consolidate fill_commit_graph_info
t6600-test-reach: generalize *_three_modes
commit-graph: add a slab to store topological levels
commit-graph: return 64-bit generation number
commit-graph: implement corrected commit date
commit-graph: implement generation data chunk
commit-graph: use generation v2 only if entire chain does
commit-reach: use corrected commit dates in paint_down_to_common()
doc: add corrected commit date info
Adam Dinwoodie (1):
t4129: fix setfacl-related permissions failure
Alex Henrie (1):
rebase: add a config option for --no-fork-point
Alexander Shopov (1):
l10n: bg.po: Updated Bulgarian translation (5104t)
Andrew Klotz (1):
config: improve error message for boolean config
Andrzej Hunt (1):
commit-graph: avoid leaking topo_levels slab in write_commit_graph()
Antonio Russo (1):
t6016: move to lib-log-graph.sh framework
Arusekk (1):
l10n: pl.po: Update translation
Bagas Sanjaya (2):
l10n: start Indonesian translation
l10n: Add translation team info
Christian Couder (3):
fetch-pack: rename helper to create_promisor_file()
fetch-pack: refactor writing promisor file
pack-write: die on error in write_promisor_file()
Christian Walther (1):
doc: mention bigFileThreshold for packing
Christopher Diaz Riveros (1):
l10n: es: 2.31.0 round 2
Daniel Levin (1):
git-p4: fix syncing file types with pattern
Daniel Santos (1):
l10n: pt_PT: add Portuguese translations part 1
Denton Liu (12):
refs: factor out set_read_ref_cutoffs()
refs: allow @{n} to work with n-sized reflog
test-lib-functions.sh: fix usage for test_commit()
t4203: stop losing return codes of git commands
git-stash.txt: be explicit about subcommand options
t3905: remove spaces after redirect operators
t3905: move all commands into test cases
t3905: remove nested git in command substitution
t3905: replace test -s with test_file_not_empty
t3905: use test_cmp() to check file contents
stash: declare ref_stash as an array
i18n.txt: camel case and monospace "i18n.commitEncoding"
Derrick Stolee (65):
maintenance: extract platform-specific scheduling
maintenance: include 'cron' details in docs
pack-bitmap-write: fill bitmap with commit history
bitmap: implement bitmap_is_subset()
commit: implement commit_list_contains()
t5310: add branch-based checks
pack-bitmap-write: rename children to reverse_edges
pack-bitmap-write: build fewer intermediate bitmaps
pack-bitmap-write: use existing bitmaps
pack-bitmap-write: relax unique revwalk condition
pack-bitmap-write: better reuse bitmaps
revision: trace topo-walk statistics
tree-walk: report recursion counts
unpack-trees: add trace2 regions
cache-tree: use trace2 in cache_tree_update()
maintenance: use launchctl on macOS
maintenance: use Windows scheduled tasks
for-each-repo: do nothing on empty config
cache-tree: trace regions for I/O
cache-tree: trace regions for prime_cache_tree
index-format: use 'cache tree' over 'cached tree'
index-format: update preamble to cache tree extension
index-format: discuss recursion of cache-tree better
cache-tree: speed up consecutive path comparisons
maintenance: set log.excludeDecoration durin prefetch
t7900: clean up some broken refs
cache-tree: clean up cache_tree_update()
cache-tree: simplify verify_cache() prototype
cache-tree: extract subtree_pos()
fsmonitor: de-duplicate BUG()s around dirty bits
repository: add repo reference to index_state
name-hash: use trace2 regions for init
sparse-checkout: load sparse-checkout patterns
test-lib: test_region looks for trace2 regions
t1092: test interesting sparse-checkout scenarios
commit-reach: reduce requirements for remove_redundant()
commit-graph: use repo_parse_commit
commit-graph: always parse before commit_graph_data_at()
commit-graph: validate layers for generation data
commit-graph: compute generations separately
commit-graph: be extra careful about mixed generations
commit-graph: prepare commit graph
commit-graph: anonymize data in chunk_write_fn
maintenance: add pack-refs task
maintenance: incremental strategy runs pack-refs weekly
chunk-format: create chunk format write API
commit-graph: use chunk-format write API
midx: rename pack_info to write_midx_context
midx: use context in write_midx_pack_names()
midx: add entries to write_midx_context
midx: add pack_perm to write_midx_context
midx: add num_large_offsets to write_midx_context
midx: return success/failure in chunk write methods
midx: drop chunk progress during write
midx: use chunk-format API in write_midx_internal()
chunk-format: create read chunk API
commit-graph: use chunk-format read API
midx: use chunk-format read API
midx: use 64-bit multiplication for chunk sizes
chunk-format: restore duplicate chunk checks
chunk-format: add technical docs
commit-reach: use one walk in remove_redundant()
commit-reach: move compare_commits_by_gen
commit-reach: use heuristic in remove_redundant()
commit-reach: stale commits may prune generation further
Dimitriy Ryazantcev (1):
l10n: ru.po: update Russian translation
Elijah Newren (93):
t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
stash: remove unnecessary process forking
stash: fix stash application in sparse-checkouts
merge-ort: setup basic internal data structures
merge-ort: add some high-level algorithm structure
merge-ort: port merge_start() from merge-recursive
merge-ort: use histogram diff
merge-ort: add an err() function similar to one from merge-recursive
merge-ort: implement a very basic collect_merge_info()
merge-ort: avoid repeating fill_tree_descriptor() on the same tree
merge-ort: compute a few more useful fields for collect_merge_info
merge-ort: record stage and auxiliary info for every path
merge-ort: avoid recursing into identical trees
merge-ort: add a preliminary simple process_entries() implementation
merge-ort: have process_entries operate in a defined order
merge-ort: step 1 of tree writing -- record basenames, modes, and oids
merge-ort: step 2 of tree writing -- function to create tree object
merge-ort: step 3 of tree writing -- handling subdirectories as we go
merge-ort: basic outline for merge_switch_to_result()
merge-ort: add implementation of checkout()
tree: enable cmp_cache_name_compare() to be used elsewhere
merge-ort: add implementation of record_conflicted_index_entries()
merge-ort: free data structures in merge_finalize()
merge-ort: add a few includes
merge-ort: add a clear_internal_opts helper
merge-ort: add a path_conflict field to merge_options_internal
merge-ort: add a paths_to_free field to merge_options_internal
merge-ort: add function grouping comments
merge-ort: add die-not-implemented stub handle_content_merge() function
merge-ort: add modify/delete handling and delayed output processing
merge-ort: add basic data structures for handling renames
merge-ort: add initial outline for basic rename detection
merge-ort: implement detect_regular_renames()
merge-ort: implement compare_pairs() and collect_renames()
merge-ort: add basic outline for process_renames()
diffcore-rename: rename num_create to num_destinations
diffcore-rename: avoid usage of global in too_many_rename_candidates()
diffcore-rename: simplify limit check
diffcore-rename: reduce jumpiness in progress counters
t4058: add more tests and documentation for duplicate tree entry handling
t4058: explore duplicate tree entry handling in a bit more detail
diffcore-rename: simplify and accelerate register_rename_src()
diffcore-rename: accelerate rename_dst setup
merge-ort: add implementation of both sides renaming identically
merge-ort: add implementation of both sides renaming differently
merge-ort: add implementation of rename/delete conflicts
merge-ort: add implementation of rename collisions
merge-ort: add implementation of normal rename handling
merge-ort: add implementation of type-changed rename handling
commit: move reverse_commit_list() from merge-recursive
merge-ort: copy a few small helper functions from merge-recursive.c
merge-ort: make clear_internal_opts() aware of partial clearing
merge-ort: implement merge_incore_recursive()
merge-ort: handle D/F conflict where directory disappears due to merge
merge-ort: handle directory/file conflicts that remain
merge-ort: implement unique_path() helper
merge-ort: handle book-keeping around two- and three-way content merge
merge-ort: flesh out implementation of handle_content_merge()
merge-ort: copy and adapt merge_3way() from merge-recursive.c
merge-ort: copy and adapt merge_submodule() from merge-recursive.c
merge-ort: implement format_commit()
merge-ort: copy find_first_merges() implementation from merge-recursive.c
merge-ort: add handling for different types of files at same path
diffcore-rename: remove unnecessary duplicate entry checks
merge-ort: add new data structures for directory rename detection
merge-ort: initialize and free new directory rename data structures
merge-ort: collect which directories are removed in dirs_removed
merge-ort: add outline for computing directory renames
merge-ort: add outline of get_provisional_directory_renames()
merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
merge-ort: implement compute_rename_counts()
merge-ort: implement handle_directory_level_conflicts()
merge-ort: modify collect_renames() for directory rename handling
merge-ort: implement compute_collisions()
merge-ort: implement apply_dir_rename() and check_dir_renamed()
merge-ort: implement check_for_directory_rename()
merge-ort: implement handle_path_level_conflicts()
merge-ort: add a new toplevel_dir field
merge-ort: implement apply_directory_rename_modifications()
merge-ort: process_renames() now needs more defensiveness
merge-ort: fix a directory rename detection bug
merge-ort: fix massive leak
merge-ort: ignore the directory rename split conflict for now
merge-ort: begin performance work; instrument with trace2_region_* calls
diffcore-rename: no point trying to find a match better than exact
diffcore-rename: filter rename_src list when possible
t4001: add a test comparing basename similarity and content similarity
diffcore-rename: compute basenames of source and dest candidates
diffcore-rename: complete find_basename_matches()
diffcore-rename: guide inexact rename detection based on basenames
gitdiffcore doc: mention new preliminary step for rename detection
merge-ort: call diffcore_rename() directly
Documentation/RelNotes: improve release note for rename detection work
Emir Sarı (2):
l10n: tr: v2.31.0-rc0
l10n: tr: v2.31.0-rc1
Eric Sunshine (3):
worktree: teach `repair` to fix multi-directional breakage
t/perf: avoid unnecessary test_export() recursion
maintenance: fix incorrect `maintenance.repo` path with bare repository
Eric Wong (2):
core.abbrev=no disables abbreviations
t1500: ensure current --since= behavior remains
Felipe Contreras (8):
pull: refactor fast-forward check
pull: give the advice for choosing rebase/merge much later
pull: display default warning only when non-ff
test: bisect-porcelain: fix location of files
completion: bash: add __git_have_func helper
completion: bash: improve function detection
test: completion: add tests for __git_complete
completion: add proper public __git_complete
Han-Wen Nienhuys (1):
doc/reftable: document how to handle windows
Hariom Verma (4):
t6300: use function to test trailer options
pretty.c: refactor trailer logic to `format_set_trailers_options()`
pretty.c: capture invalid trailer argument
ref-filter: use pretty.c logic for trailers
Jacob Vosmaer (4):
builtin/pack-objects.c: avoid iterating all refs
ls-refs.c: initialize 'prefixes' before using it
upload-pack.c: fix filter spec quoting bug
t5544: clarify 'hook works with partial clone' test
Jean-Noël Avila (2):
l10n: fr: v2.31.0 rnd 1
l10n: fr: v2.31 rnd 2
Jeff Hostetler (11):
p7519: do not rely on "xargs -d" in test
p7519: fix watchman watch-list test on Windows
p7519: move watchman cleanup earlier in the test
p7519: add trace logging during perf test
preload-index: log the number of lstat calls to trace2
read-cache: log the number of lstat calls to trace2
read-cache: log the number of scanned files to trace2
fsmonitor: log invocation of FSMonitor hook to trace2
fsmonitor: log FSMN token when reading and writing the index
fsmonitor: refactor initialization of fsmonitor_last_update token
dir: fix malloc of root untracked_cache_dir
Jeff King (45):
pack-bitmap: fix header size check
pack-bitmap: bounds-check size of cache extension
t5310: drop size of truncated ewah bitmap
rev-list: die when --test-bitmap detects a mismatch
ewah: factor out bitmap growth
ewah: make bitmap growth less aggressive
ewah: implement bitmap_or()
ewah: add bitmap_dup() function
pack-bitmap-write: reimplement bitmap writing
pack-bitmap-write: pass ownership of intermediate bitmaps
pack-bitmap-write: ignore BITMAP_FLAG_REUSE
git_connect_git(): forbid newlines in host and path
fsck: reject .gitmodules git:// urls with newlines
t5516: loosen "not our ref" error check
patch-ids: handle duplicate hashmap entries
quote: make sq_dequote_step() a public function
for_each_object_in_pack(): clarify pack vs index ordering
config: parse more robust format in GIT_CONFIG_PARAMETERS
refs: switch peel_ref() to peel_iterated_oid()
run-command: document use_shell option
git-svn tests: rewrite brittle tests to use "--[no-]merges".
git-compat-util: always enable variadic macros
commit_graft_pos(): take an oid instead of a bare hash
rerere: check dirname format while iterating rr_cache directory
rerere: tighten rr-cache dirname check
rerere: use strmap to store rerere directories
hash_pos(): convert to oid_pos()
oid_pos(): access table through const pointers
t0000: keep clean-up tests together
t0000: run prereq tests inside sub-test
t0000: run cleaning test inside sub-test
t0000: consistently use single quotes for outer tests
pretty: lazy-load commit data when expanding user-format
p5303: avoid sed GNU-ism
completion: treat "branch -D" the same way as "branch -d"
completion: handle other variants of "branch -m"
doc/git-branch: fix awkward wording for "-c"
t: add --no-tag option to test_commit
mailmap: only look for .mailmap in work tree
rev-list: add --disk-usage option for calculating disk usage
docs/rev-list: add an examples section
docs/rev-list: add some examples of --disk-usage
doc: mention approxidates for git-commit --date
Makefile: add OPEN_RETURNS_EINTR knob
config.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big Sur
Jiang Xin (8):
test: add helper functions for git-bundle
bundle: lost objects when removing duplicate pendings
bundle: arguments can be read from stdin
t5411: use different out file to prevent overwriting
t5411: refactor check of refs using test_cmp_refs
l10n: git.pot: v2.31.0 round 1 (155 new, 89 removed)
l10n: git.pot: v2.31.0 round 2 (9 new, 8 removed)
l10n: zh_CN: for git v2.31.0 l10n round 1 and 2
Joey Salazar (1):
doc: fix naming of response-end-pkt
Johannes Schindelin (58):
tests: mark tests relying on the current default for `init.defaultBranch`
t0060: preemptively adjust alignment
t[01]*: adjust the references to the default branch name "main"
t2*: adjust the references to the default branch name "main"
t3[0-3]*: adjust the references to the default branch name "main"
t3416: preemptively adjust alignment in a comment
t34*: adjust the references to the default branch name "main"
t3[5-9]*: adjust the references to the default branch name "main"
t4*: adjust the references to the default branch name "main"
t5323: prepare centered comment for `master` -> `main`
t5[0-4]*: adjust the references to the default branch name "main"
t5503: prepare aligned comment for replacing `master` with `main`
t550*: adjust the references to the default branch name "main"
t551*: adjust the references to the default branch name "main"
t55[23]*: adjust the references to the default branch name "main"
t55[4-9]*: adjust the references to the default branch name "main"
t5[6-9]*: adjust the references to the default branch name "main"
t6[0-3]*: adjust the references to the default branch name "main"
t64*: preemptively adjust alignment to prepare for `master` -> `main`
t6[4-9]*: adjust the references to the default branch name "main"
t7[0-4]*: adjust the references to the default branch name "main"
t7[5-9]*: adjust the references to the default branch name "main"
t8*: adjust the references to the default branch name "main"
t9[0-4]*: adjust the references to the default branch name "main"
t9[5-7]*: adjust the references to the default branch name "main"
tests(git-p4): transition to the default branch name `main`
t99*: adjust the references to the default branch name "main"
tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
SKIP_DASHED_BUILT_INS: respect `config.mak`
range-diff/format-patch: refactor check for commit range
rebase -i: do leave commit message intact in fixup! chains
range-diff: avoid leaking memory in two error code paths
range-diff: libify the read_patches() function again
range-diff: simplify code spawning `git log`
range-diff: combine all options in a single data structure
range-diff: move the diffopt initialization down one layer
range-diff: offer --left-only/--right-only options
range-diff/format-patch: handle commit ranges other than A..B
range-diff(docs): explain how to specify commit ranges
t1450: robustify `remove_object()`
fsck --name-objects: be more careful parsing generation numbers
reflog expire --stale-fix: be generous about missing objects
commit-graph: when incompatible with graphs, indicate why
run-command: invalidate lstat cache after a command finished
Git 2.17.6
Git 2.18.5
Git 2.19.6
Git 2.20.5
Git 2.21.4
Git 2.22.5
Git 2.23.4
Git 2.24.4
Git 2.25.5
Git 2.26.3
Git 2.27.1
Git 2.28.1
Git 2.29.3
Git 2.30.2
Johannes Sixt (2):
annotate-tests: quote variable expansions containing path names
replace "parameters" by "arguments" in error messages
Jonathan Nieder (2):
mergetool: do not enable hideResolved by default
doc: describe mergetool configuration in git-mergetool(1)
Jonathan Tan (10):
Doc: clarify contents of packfile sent as URI
ls-refs: report unborn targets of symrefs
connect, transport: encapsulate arg in struct
clone: respect remote unborn HEAD
usage: trace2 BUG() invocations
http: allow custom index-pack args
http-fetch: allow custom index-pack args
fetch-pack: with packfile URIs, use index-pack arg
fetch-pack: print and use dangling .gitmodules
fetch-pack: do not mix --pack_header and packfile uri
Jordi Mas (1):
l10n: Update Catalan translation
Junio C Hamano (32):
pack-redundant: gauge the usage before proposing its removal
pull: get rid of unnecessary global variable
pull: correct condition to trigger non-ff advice
CoC: explicitly take any whitespace breakage
parse-options: format argh like error messages
The first batch in 2.31 cycle
SubmittingPatches: tighten wording on "sign-off" procedure
ci/install-depends: attempt to fix "brew cask" stuff
t4203: make blame output massaging more robust
The second batch
The third batch
The fourth batch
The fifth batch
Prepare for 2.30.1
The sixth batch
Git 2.30.1
The seventh batch
The eighth batch
diff: --{rotate,skip}-to=<path>
The ninth batch
Documentation: typofix --column description
The tenth batch
push: do not turn --delete '' into a matching push
blame-options.txt: camelcase blame.blankBoundary
index-format doc: camelCase core.excludesFile
Git 2.31-rc0
Revert "commit-graph: when incompatible with graphs, indicate why"
Hopefully the last batch before -rc1
Git 2.31-rc1
Merged the open-eintr workaround for macOS
Git 2.31-rc2
Git 2.31
Kevin Willford (1):
fsmonitor: allow all entries for a folder to be invalidated
Martin von Zweigbergk (1):
docs: clarify that refs/notes/ do not keep the attached objects alive
Martin Ågren (16):
t1300: remove duplicate test for `--file ../foo`
t1300: remove duplicate test for `--file no-such-file`
t1300: don't needlessly work with `core.foo` configs
pack-format.txt: document sizes at start of delta data
object-name.c: rename from sha1-name.c
object-file.c: rename from sha1-file.c
sha1-lookup: rename `sha1_pos()` as `hash_pos()`
hash-lookup: rename from sha1-lookup
builtin/gc: don't peek into `struct lock_file`
commit-graph: don't peek into `struct lock_file`
midx: don't peek into `struct lock_file`
refs/files-backend: don't peek into `struct lock_file`
read-cache: try not to peek into `struct {lock_,temp}file`
rev-list-options.txt: fix rendering of bonus paragraph
git.txt: fix monospace rendering
gitmailmap.txt: fix rendering of e-mail addresses
Matheus Tavares (10):
t4129: don't fail if setgid is set in the test directory
grep: error out if --untracked is used with --cached
grep: honor sparse-checkout on working tree searches
checkout: fix bug that makes checkout follow symlinks in leading path
unpack_trees(): start with a fresh lstat cache
write_entry(): fix misuses of `path` in error messages
checkout-index: omit entries with no tempname from --temp output
add --chmod: don't update index when --dry-run is used
add: mark --chmod error string for translation
add: propagate --chmod errors to exit status
Matthias Rüster (1):
l10n: de.po: Update German translation for Git v2.31.0
Mikhail Klyushin (1):
git-gui: fix typo in russian locale
Neeraj Singh (1):
read-cache: make the index write buffer size 128K
Patrick Steinhardt (11):
git: add `--super-prefix` to usage string
config: add new way to pass config via `--config-env`
config: extract function to parse config pairs
fetch: extract writing to FETCH_HEAD
fetch: use strbuf to format FETCH_HEAD updates
fetch: refactor `s_update_ref` to use common exit path
fetch: allow passing a transaction to `s_update_ref()`
fetch: implement support for atomic reference updates
config: store "git -c" variables using more robust format
environment: make `getenv_safe()` a public function
config: allow specifying config entries via envvar pairs
Peter Kaestle (1):
submodules: fix of regression on fetching of non-init subsub-repo
Peter Krefting (2):
l10n: sv.po: Update Swedish translation (5103t0f0u)
l10n: sv.po: Update Swedish translation (5104t0f0u)
Phil Hord (1):
use delete_refs when deleting tags or branches
Philippe Blain (4):
gitmodules.txt: fix 'GIT_WORK_TREE' variable name
mergetool--lib: fix '--tool-help' to correctly show available tools
mailmap doc: use correct environment variable 'GIT_WORK_TREE'
ci: do not cancel all jobs of a matrix if one fails
Pranit Bauva (7):
bisect--helper: reimplement `bisect_log` shell function in C
bisect--helper: reimplement `bisect_replay` shell function in C
bisect--helper: retire `--bisect-write` subcommand
bisect--helper: use `res` instead of return in BISECT_RESET case option
bisect--helper: retire `--bisect-auto-next` subcommand
bisect--helper: reimplement `bisect_skip` shell function in C
bisect--helper: retire `--check-and-set-terms` subcommand
Pratyush Yadav (2):
git-gui: remove lines starting with the comment character
Revert "git-gui: remove lines starting with the comment character"
Rafael Silva (8):
worktree: libify should_prune_worktree()
worktree: teach worktree to lazy-load "prunable" reason
worktree: teach worktree_lock_reason() to gently handle main worktree
t2402: ensure locked worktree is properly cleaned up
worktree: teach `list --porcelain` to annotate locked worktree
worktree: teach `list` to annotate prunable worktree
worktree: teach `list` verbose mode
blame: remove unnecessary use of get_commit_info()
René Scharfe (2):
rebase: verify commit parameter
cache-tree: use ce_namelen() instead of strlen()
SZEDER Gábor (2):
t7800-difftool: don't accidentally match tmp dirs
test-lib: prevent '--stress-jobs=X' from being ignored
Sangeeta Jain (1):
diff: do not show submodule with untracked files as "-dirty"
Sergey Organov (32):
revision: factor out parsing of diff-merge related options
revision: factor out setup of diff-merge related settings
revision: factor out initialization of diff-merge related settings
revision: provide implementation for diff merges tweaks
revision: move diff merges functions to its own diff-merges.c
diff-merges: rename all functions to have common prefix
diff-merges: move checks for first_parent_only out of the module
diff-merges: rename diff_merges_default_to_enable() to match semantics
diff-merges: re-arrange functions to match the order they are called in
diff-merges: new function diff_merges_suppress()
diff-merges: new function diff_merges_set_dense_combined_if_unset()
diff-merges: introduce revs->first_parent_merges flag
diff-merges: handle imply -p on -c/--cc logic for log.c
diff-merges: revise revs->diff flag handling
t4013: support test_expect_failure through ':failure' magic
t4013: add tests for -m failing to override -c/--cc
diff-merges: fix -m to properly override -c/--cc
diff-merges: split 'ignore_merges' field
diff-merges: group diff-merge flags next to each other inside 'rev_info'
diff-merges: get rid of now empty diff_merges_init_revs()
diff-merges: refactor opt settings into separate functions
diff-merges: make -m/-c/--cc explicitly mutually exclusive
diff-merges: implement new values for --diff-merges
diff-merges: do not imply -p for new options
diff-merges: let new options enable diff without -p
diff-merges: add old mnemonic counterparts to --diff-merges
diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
doc/git-log: describe new --diff-merges options
doc/diff-generate-patch: mention new --diff-merges option
doc/rev-list-options: document --first-parent changes merges format
doc/git-show: include --diff-merges description
t4013: add tests for --diff-merges=first-parent
Seth House (4):
mergetool: add hideResolved configuration
mergetool: break setup_tool out into separate initialization function
mergetool: add per-tool support and overrides for the hideResolved flag
mergetools/vimdiff: add vimdiff1 merge tool variant
Shubham Verma (10):
t7001: modernize test formatting
t7001: indent with TABs instead of spaces
t7001: remove unnecessary blank lines
t7001: modernize subshell formatting
t7001: remove whitespace after redirect operators
t7001: avoid using `cd` outside of subshells
t7001: use '>' rather than 'touch'
t7001: put each command on a separate line
t7001: use here-docs instead of echo
t7001: use `test` rather than `[`
Taylor Blau (41):
ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
pack-bitmap.c: check reads more aggressively when loading
pack-bitmap: factor out 'bitmap_for_commit()'
pack-bitmap: factor out 'add_commit_to_bitmap()'
p7519: allow running without watchman prereq
Documentation/git-clone.txt: document race with --local
pack-revindex: introduce a new API
write_reuse_object(): convert to new revindex API
write_reused_pack_one(): convert to new revindex API
write_reused_pack_verbatim(): convert to new revindex API
check_object(): convert to new revindex API
bitmap_position_packfile(): convert to new revindex API
show_objects_for_type(): convert to new revindex API
get_size_by_pos(): convert to new revindex API
try_partial_reuse(): convert to new revindex API
rebuild_existing_bitmaps(): convert to new revindex API
get_delta_base_oid(): convert to new revindex API
retry_bad_packed_offset(): convert to new revindex API
packed_object_info(): convert to new revindex API
unpack_entry(): convert to new revindex API
for_each_object_in_pack(): convert to new revindex API
builtin/gc.c: guess the size of the revindex
pack-revindex: remove unused 'find_pack_revindex()'
pack-revindex: remove unused 'find_revindex_position()'
pack-revindex: hide the definition of 'revindex_entry'
pack-revindex.c: avoid direct revindex access in 'offset_to_pack_pos()'
refs: expose 'for_each_fullref_in_prefixes'
ls-refs.c: traverse prefixes of disjoint "ref-prefix" sets
packfile: prepare for the existence of '*.rev' files
pack-write.c: prepare to write 'pack-*.rev' files
builtin/index-pack.c: allow stripping arbitrary extensions
builtin/index-pack.c: write reverse indexes
builtin/pack-objects.c: respect 'pack.writeReverseIndex'
Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'
t: prepare for GIT_TEST_WRITE_REV_INDEX
t: support GIT_TEST_WRITE_REV_INDEX
pack-revindex: ensure that on-disk reverse indexes are given precedence
t5325: check both on-disk and in-memory reverse index
.github/workflows/main.yml: run static-analysis on bionic
commit-graph.c: display correct number of chunks when writing
pack-revindex.c: don't close unopened file descriptors
Thomas Ackermann (7):
doc: fix some typos
doc hash-function-transition: fix asciidoc output
doc hash-function-transition: use SHA-1 and SHA-256 consistently
doc hash-function-transition: use upper case consistently
doc hash-function-transition: fix incomplete sentence
doc hash-function-transition: move rationale upwards
doc: use https links
Torsten Bögershausen (1):
MacOS: precompose_argv_prefix()
Trần Ngọc Quân (1):
l10n: vi.po(5104t): for git v2.31.0 l10n round 2
Utku Gultopu (1):
doc: remove "directory cache" from man pages
Vasyl Vavrychuk (1):
git-send-email.txt: mention less secure app access with Gmail
Yi-Jyun Pan (1):
l10n: zh_TW.po: v2.31.0 round 2 (15 untranslated)
ZheNing Hu (5):
builtin/*: update usage format
ls_files.c: bugfix for --deleted and --modified
ls_files.c: consolidate two for loops into one
ls-files.c: add --deduplicate option
difftool.c: learn a new way start at specified file
brian m. carlson (9):
abspath: add a function to resolve paths with missing components
rev-parse: add option for absolute or relative path formatting
docs: rephrase and clarify the git status --short format
ref-filter: switch some uses of unsigned long to size_t
commit: ignore additional signatures when parsing signed commits
gpg-interface: improve interface for parsing tags
commit: allow parsing arbitrary buffers with headers
ref-filter: hoist signature parsing
gpg-interface: remove other signature headers before verifying
Ævar Arnfjörð Bjarmason (100):
pretty format %(trailers) test: split a long line
pretty format %(trailers) doc: avoid repetition
pretty-format %(trailers): fix broken standalone "valueonly"
pretty format %(trailers): add a "keyonly"
pretty format %(trailers): add a "key_value_separator"
mktag doc: say <hash> not <sha1>
mktag doc: grammar fix, when exists -> when it exists
CoC: Update word-wrapping to match upstream
mktag doc: update to explain why to use this
mktag tests: don't needlessly use a subshell
mktag tests: use "test_commit" helper
mktag tests: remove needless SHA-1 hardcoding
mktag tests: don't redirect stderr to a file needlessly
mktag tests: don't create "mytag" twice
mktag tests: run "fsck" after creating "mytag"
mktag tests: stress test whitespace handling
mktag tests: test "hash-object" compatibility
mktag tests: improve verify_object() test coverage
mktag tests: test verify_object() with replaced objects
mktag: use default strbuf_read() hint
mktag: remove redundant braces in one-line body "if"
mktag: use puts(str) instead of printf("%s\n", str)
mktag: use fsck instead of custom verify_tag()
fsck: make fsck_config() re-usable
mktag: allow turning off fsck.extraHeaderEntry
mktag: allow omitting the header/body \n separator
mktag: convert to parse-options
mktag: mark strings for translation
mktag: add a --[no-]strict option
branch: change "--local" to "--list" in comment
branch tests: add to --sort tests
ref-filter: add braces to if/else if/else chain
ref-filter: move "cmp_fn" assignment into "else if" arm
ref-filter: move ref_sorting flags to a bitfield
branch: sort detached HEAD based on a flag
branch: show "HEAD detached" first under reverse sort
Makefile: remove a warning about old GETTEXT_POISON flag
gettext.c: remove/reword a mostly-useless comment
mailmap doc: create a new "gitmailmap(5)" man page
mailmap doc: quote config variables `like.this`
check-mailmap doc: note config options
mailmap doc: start by mentioning the comment syntax
mailmap tests: use our preferred whitespace syntax
mailmap tests: modernize syntax & test idioms
mailmap tests: improve --stdin tests
mailmap tests: remove redundant entry in test
mailmap tests: add a test for "not a blob" error
mailmap tests: get rid of overly complex blame fuzzing
mailmap: test for silent exiting on missing file/blob
test-lib functions: expand "test_commit" comment template
test-lib functions: document arguments to test_commit
test-lib functions: add --author support to test_commit
test-lib functions: add an --append option to test_commit
tests: refactor a few tests to use "test_commit --append"
mailmap doc + tests: add better examples & test them
mailmap tests: add a test for comment syntax
mailmap tests: add tests for whitespace syntax
mailmap tests: add tests for empty "<>" syntax
mailmap doc + tests: document and test for case-insensitivity
shortlog: remove unused(?) "repo-abbrev" feature
CoC: update to version 2.0 + local changes
fsck doc: remove ancient out-of-date diagnostics
ci: remove GETTEXT_POISON jobs
tests: remove support for GIT_TEST_GETTEXT_POISON
tests: remove uses of GIT_TEST_GETTEXT_POISON=false
cache-tree tests: refactor for modern test style
cache-tree tests: remove unused $2 parameter
cache-tree tests: use a sub-shell with less indirection
cache-tree tests: explicitly test HEAD and index differences
git svn mergeinfo tests: modernize redirection & quoting style
git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty
upload-pack tests: avoid a non-zero "grep" exit status
archive tests: use a cheaper "zipinfo -h" invocation to get header
rm tests: actually test for SIGPIPE in SIGPIPE test
config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag
Remove support for v1 of the PCRE library
grep/pcre2 tests: don't rely on invalid UTF-8 data test
grep/pcre2: better support invalid UTF-8 haystacks
grep/log: remove hidden --debug and --grep-debug options
pager: refactor wait_for_pager() function
pager: test for exit code with and without SIGPIPE
run-command: add braces for "if" block in wait_or_whine()
pager: properly log pager exit code when signalled
test-lib: remove check_var_migration
test lib: change "error" to "BUG" as appropriate
test-lib-functions: move test_set_index_version() to its user
test-lib-functions: remove generate_zero_bytes() wrapper
test libs: rename bundle helper to "lib-bundle.sh"
test libs: rename gitweb-lib.sh to lib-gitweb.sh
test-lib-functions: move function to lib-bitmap.sh
t/.gitattributes: sort lines
tests: remove last uses of GIT_TEST_GETTEXT_POISON=false
tests: remove most uses of C_LOCALE_OUTPUT
tests: remove last uses of C_LOCALE_OUTPUT
tests: remove most uses of test_i18ncmp
diff: add an API for deferred freeing
diff: plug memory leak from regcomp() on {log,diff} -I
test libs: rename "diff-lib" to "lib-diff"
test-lib-functions: remove bug-inducing "diagnostics" helper param
test-lib-functions: assert correct parameter count
^ permalink raw reply [relevance 4%]
* [ANNOUNCE] Git v2.31.0-rc2
@ 2021-03-09 18:05 4% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-03-09 18:05 UTC (permalink / raw)
To: git
A release candidate Git v2.31.0-rc2 is now available for testing at
the usual places. It is comprised of 655 non-merge commits since
v2.30.0, contributed by 68 people, 22 of which are new faces [*].
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.31.0-rc2' tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.30.0 are as follows.
Welcome to the Git development community!
Aleksey Kliger, Andreas Bühmann, Andrew Klotz, Andrzej
Hunt, Antonio Russo, Arnaud Morin, Christian Walther, Clement
Moyroud, Daniel Levin, Daniel Troger, Harold Kim, Jacob Vosmaer,
LeSeulArtichaut, Mikhail Klyushin, Neeraj Singh, Sangeeta Jain,
Seth House, Shubham Verma, Utku Gultopu, Vasyl Vavrychuk,
Vojtěch Knyttl, and ZheNing Hu.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Abhishek Kumar, Adam Dinwoodie, Ævar Arnfjörð Bjarmason,
Alex Henrie, brian m. carlson, Christian Couder, Denton Liu,
Derrick Stolee, Elijah Newren, Eric Sunshine, Eric Wong,
Felipe Contreras, Han-Wen Nienhuys, Hariom Verma, Heba Waly,
Jeff Hostetler, Jeff King, Jiang Xin, Joey Salazar, Johannes
Schindelin, Johannes Sixt, Jonathan Tan, Junio C Hamano,
Kevin Daudt, Kevin Willford, Lars Schneider, Martin Ågren,
Martin von Zweigbergk, Matheus Tavares, Michael Haggerty,
Patrick Steinhardt, Paul Jolly, Peter Kaestle, Phil Hord,
Philippe Blain, Phillip Wood, Pranit Bauva, Pratyush Yadav,
Rafael Silva, René Scharfe, Ross Light, Sergey Organov, SZEDER
Gábor, Taylor Blau, Thomas Ackermann, and Torsten Bögershausen.
[*] We are counting not just the authorship contribution but
issue reporting, testing and reviewing that are recorded
in the commit trailers.
----------------------------------------------------------------
Git 2.31 Release Notes (draft)
==============================
Updates since v2.30
-------------------
Backward incompatible and other important changes
* The "pack-redundant" command, which has been left stale with almost
unusable performance issues, now warns loudly when it gets used, as
we no longer want to recommend its use (instead just "repack -d"
instead).
* The development community has adopted Contributor Covenant v2.0 to
update from v1.4 that we have been using.
* The support for deprecated PCRE1 library has been dropped.
* Fixes for CVE-2021-21300 in Git 2.30.2 (and earlier) is included.
UI, Workflows & Features
* The "--format=%(trailers)" mechanism gets enhanced to make it
easier to design output for machine consumption.
* When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.
* The configuration variable 'core.abbrev' can be set to 'no' to
force no abbreviation regardless of the hash algorithm.
* "git rev-parse" can be explicitly told to give output as absolute
or relative path with the `--path-format=(absolute|relative)` option.
* Bash completion (in contrib/) update to make it easier for
end-users to add completion for their custom "git" subcommands.
* "git maintenance" learned to drive scheduled maintenance on
platforms whose native scheduling methods are not 'cron'.
* After expiring a reflog and making a single commit, the reflog for
the branch would record a single entry that knows both @{0} and
@{1}, but we failed to answer "what commit were we on?", i.e. @{1}
* "git bundle" learns "--stdin" option to read its refs from the
standard input. Also, it now does not lose refs whey they point
at the same object.
* "git log" learned a new "--diff-merges=<how>" option.
* "git ls-files" can and does show multiple entries when the index is
unmerged, which is a source for confusion unless -s/-u option is in
use. A new option --deduplicate has been introduced.
* `git worktree list` now annotates worktrees as prunable, shows
locked and prunable attributes in --porcelain mode, and gained
a --verbose option.
* "git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
* There are other ways than ".." for a single token to denote a
"commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
range-diff" did not understand them.
* The "git range-diff" command learned "--(left|right)-only" option
to show only one side of the compared range.
* "git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
* The .mailmap is documented to be read only from the root level of a
working tree, but a stray file in a bare repository also was read
by accident, which has been corrected.
* "git maintenance" tool learned a new "pack-refs" maintenance task.
* The error message given when a configuration variable that is
expected to have a boolean value has been improved.
* Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
* "git rev-list" command learned "--disk-usage" option.
* "git {diff,log} --{skip,rotate}-to=<path>" allows the user to
discard diff output for early paths or move them to the end of the
output.
* "git difftool" learned "--skip-to=<path>" option to restart an
interrupted session from an arbitrary path.
* "git grep" has been tweaked to be limited to the sparse checkout
paths.
* "git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.
Performance, Internal Implementation, Development Support etc.
* A 3-year old test that was not testing anything useful has been
corrected.
* Retire more names with "sha1" in it.
* The topological walk codepath is covered by new trace2 stats.
* Update the Code-of-conduct to version 2.0 from the upstream (we've
been using version 1.4).
* "git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
* Two new ways to feed configuration variable-value pairs via
environment variables have been introduced, and the way
GIT_CONFIG_PARAMETERS encodes variable/value pairs has been tweaked
to make it more robust.
* Tests have been updated so that they do not to get affected by the
name of the default branch "git init" creates.
* "git fetch" learns to treat ref updates atomically in all-or-none
fashion, just like "git push" does, with the new "--atomic" option.
* The peel_ref() API has been replaced with peel_iterated_oid().
* The .use_shell flag in struct child_process that is passed to
run_command() API has been clarified with a bit more documentation.
* Document, clean-up and optimize the code around the cache-tree
extension in the index.
* The ls-refs protocol operation has been optimized to narrow the
sub-hierarchy of refs/ it walks to produce response.
* When removing many branches and tags, the code used to do so one
ref at a time. There is another API it can use to delete multiple
refs, and it makes quite a lot of performance difference when the
refs are packed.
* The "pack-objects" command needs to iterate over all the tags when
automatic tag following is enabled, but it actually iterated over
all refs and then discarded everything outside "refs/tags/"
hierarchy, which was quite wasteful.
* A perf script was made more portable.
* Our setting of GitHub CI test jobs were a bit too eager to give up
once there is even one failure found. Tweak the knob to allow
other jobs keep running even when we see a failure, so that we can
find more failures in a single run.
* We've carried compatibility codepaths for compilers without
variadic macros for quite some time, but the world may be ready for
them to be removed. Force compilation failure on exotic platforms
where variadic macros are not available to find out who screams in
such a way that we can easily revert if it turns out that the world
is not yet ready.
* Code clean-up to ensure our use of hashtables using object names as
keys use the "struct object_id" objects, not the raw hash values.
* Lose the debugging aid that may have been useful in the past, but
no longer is, in the "grep" codepaths.
* Some pretty-format specifiers do not need the data in commit object
(e.g. "%H"), but we were over-eager to load and parse it, which has
been made even lazier.
* Get rid of "GETTEXT_POISON" support altogether, which may or may
not be controversial.
* Introduce an on-disk file to record revindex for packdata, which
traditionally was always created on the fly and only in-core.
* The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
* Piecemeal of rewrite of "git bisect" in C continues.
* When a pager spawned by us exited, the trace log did not record its
exit status correctly, which has been corrected.
* Removal of GIT_TEST_GETTEXT_POISON continues.
* The code to implement "git merge-base --independent" was poorly
done and was kept from the very beginning of the feature.
* Preliminary changes to fsmonitor integration.
* Performance improvements for rename detection.
* The common code to deal with "chunked file format" that is shared
by the multi-pack-index and commit-graph files have been factored
out, to help codepaths for both filetypes to become more robust.
* The approach to "fsck" the incoming objects in "index-pack" is
attractive for performance reasons (we have them already in core,
inflated and ready to be inspected), but fundamentally cannot be
applied fully when we receive more than one pack stream, as a tree
object in one pack may refer to a blob object in another pack as
".gitmodules", when we want to inspect blobs that are used as
".gitmodules" file, for example. Teach "index-pack" to emit
objects that must be inspected later and check them in the calling
"fetch-pack" process.
* The logic to handle "trailer" related placeholders in the
"--format=" mechanisms in the "log" family and "for-each-ref"
family is getting unified.
* Raise the buffer size used when writing the index file out from
(obviously too small) 8kB to (clearly sufficiently large) 128kB.
* It is reported that open() on some platforms (e.g. macOS Big Sur)
can return EINTR even though our timers are set up with SA_RESTART.
A workaround has been implemented and enabled for macOS to rerun
open() transparently from the caller when this happens.
Fixes since v2.30
-----------------
* Diagnose command line error of "git rebase" early.
* Clean up option descriptions in "git cmd --help".
* "git stash" did not work well in a sparsely checked out working
tree.
* Some tests expect that "ls -l" output has either '-' or 'x' for
group executable bit, but setgid bit can be inherited from parent
directory and make these fields 'S' or 's' instead, causing test
failures.
* "git for-each-repo --config=<var> <cmd>" should not run <cmd> for
any repository when the configuration variable <var> is not defined
even once.
* Fix 2.29 regression where "git mergetool --tool-help" fails to list
all the available tools.
* Fix for procedure to building CI test environment for mac.
* The implementation of "git branch --sort" wrt the detached HEAD
display has always been hacky, which has been cleaned up.
* Newline characters in the host and path part of git:// URL are
now forbidden.
* "git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
* When more than one commit with the same patch ID appears on one
side, "git log --cherry-pick A...B" did not exclude them all when a
commit with the same patch ID appears on the other side. Now it
does.
* Documentation for "git fsck" lost stale bits that has become
incorrect.
* Doc fix for packfile URI feature.
* When "git rebase -i" processes "fixup" insn, there is no reason to
clean up the commit log message, but we did the usual stripspace
processing. This has been corrected.
(merge f7d42ceec5 js/rebase-i-commit-cleanup-fix later to maint).
* Fix in passing custom args from "git clone" to "upload-pack" on the
other side.
(merge ad6b5fefbd jv/upload-pack-filter-spec-quotefix later to maint).
* The command line completion (in contrib/) completed "git branch -d"
with branch names, but "git branch -D" offered tagnames in addition,
which has been corrected. "git branch -M" had the same problem.
(merge 27dc071b9a jk/complete-branch-force-delete later to maint).
* When commands are started from a subdirectory, they may have to
compare the path to the subdirectory (called prefix and found out
from $(pwd)) with the tracked paths. On macOS, $(pwd) and
readdir() yield decomposed path, while the tracked paths are
usually normalized to the precomposed form, causing mismatch. This
has been fixed by taking the same approach used to normalize the
command line arguments.
(merge 5c327502db tb/precompose-prefix-too later to maint).
* Even though invocations of "die()" were logged to the trace2
system, "BUG()"s were not, which has been corrected.
(merge 0a9dde4a04 jt/trace2-BUG later to maint).
* "git grep --untracked" is meant to be "let's ALSO find in these
files on the filesystem" when looking for matches in the working
tree files, and does not make any sense if the primary search is
done against the index, or the tree objects. The "--cached" and
"--untracked" options have been marked as mutually incompatible.
(merge 0c5d83b248 mt/grep-cached-untracked later to maint).
* Fix "git fsck --name-objects" which apparently has not been used by
anybody who is motivated enough to report breakage.
(merge e89f89361c js/fsck-name-objects-fix later to maint).
* Avoid individual tests in t5411 from getting affected by each other
by forcing them to use separate output files during the test.
(merge 822ee894f6 jx/t5411-unique-filenames later to maint).
* Test to make sure "git rev-parse one-thing one-thing" gives
the same thing twice (when one-thing is --since=X).
(merge a5cdca4520 ew/rev-parse-since-test later to maint).
* When certain features (e.g. grafts) used in the repository are
incompatible with the use of the commit-graph, we used to silently
turned commit-graph off; we now tell the user what we are doing.
(merge c85eec7fc3 js/commit-graph-warning later to maint).
* Objects that lost references can be pruned away, even when they
have notes attached to it (and these notes will become dangling,
which in turn can be pruned with "git notes prune"). This has been
clarified in the documentation.
(merge fa9ab027ba mz/doc-notes-are-not-anchors later to maint).
* The error codepath around the "--temp/--prefix" feature of "git
checkout-index" has been improved.
(merge 3f7ba60350 mt/checkout-index-corner-cases later to maint).
* The "git maintenance register" command had trouble registering bare
repositories, which had been corrected.
* A handful of multi-word configuration variable names in
documentation that are spelled in all lowercase have been corrected
to use the more canonical camelCase.
(merge 7dd0eaa39c dl/doc-config-camelcase later to maint).
* "git push $there --delete ''" should have been diagnosed as an
error, but instead turned into a matching push, which has been
corrected.
(merge 20e416409f jc/push-delete-nothing later to maint).
* Test script modernization.
(merge 488acf15df sv/t7001-modernize later to maint).
* An under-allocation for the untracked cache data has been corrected.
(merge 6347d649bc jh/untracked-cache-fix later to maint).
* Other code cleanup, docfix, build fix, etc.
(merge e3f5da7e60 sg/t7800-difftool-robustify later to maint).
(merge 9d336655ba js/doc-proto-v2-response-end later to maint).
(merge 1b5b8cf072 jc/maint-column-doc-typofix later to maint).
(merge 3a837b58e3 cw/pack-config-doc later to maint).
(merge 01168a9d89 ug/doc-commit-approxidate later to maint).
(merge b865734760 js/params-vs-args later to maint).
----------------------------------------------------------------
Changes since v2.30.0 are as follows:
Abhishek Kumar (11):
commit-graph: fix regression when computing Bloom filters
revision: parse parent in indegree_walk_step()
commit-graph: consolidate fill_commit_graph_info
t6600-test-reach: generalize *_three_modes
commit-graph: add a slab to store topological levels
commit-graph: return 64-bit generation number
commit-graph: implement corrected commit date
commit-graph: implement generation data chunk
commit-graph: use generation v2 only if entire chain does
commit-reach: use corrected commit dates in paint_down_to_common()
doc: add corrected commit date info
Adam Dinwoodie (1):
t4129: fix setfacl-related permissions failure
Alex Henrie (1):
rebase: add a config option for --no-fork-point
Andrew Klotz (1):
config: improve error message for boolean config
Andrzej Hunt (1):
commit-graph: avoid leaking topo_levels slab in write_commit_graph()
Antonio Russo (1):
t6016: move to lib-log-graph.sh framework
Christian Couder (3):
fetch-pack: rename helper to create_promisor_file()
fetch-pack: refactor writing promisor file
pack-write: die on error in write_promisor_file()
Christian Walther (1):
doc: mention bigFileThreshold for packing
Daniel Levin (1):
git-p4: fix syncing file types with pattern
Denton Liu (12):
refs: factor out set_read_ref_cutoffs()
refs: allow @{n} to work with n-sized reflog
test-lib-functions.sh: fix usage for test_commit()
t4203: stop losing return codes of git commands
git-stash.txt: be explicit about subcommand options
t3905: remove spaces after redirect operators
t3905: move all commands into test cases
t3905: remove nested git in command substitution
t3905: replace test -s with test_file_not_empty
t3905: use test_cmp() to check file contents
stash: declare ref_stash as an array
i18n.txt: camel case and monospace "i18n.commitEncoding"
Derrick Stolee (65):
maintenance: extract platform-specific scheduling
maintenance: include 'cron' details in docs
pack-bitmap-write: fill bitmap with commit history
bitmap: implement bitmap_is_subset()
commit: implement commit_list_contains()
t5310: add branch-based checks
pack-bitmap-write: rename children to reverse_edges
pack-bitmap-write: build fewer intermediate bitmaps
pack-bitmap-write: use existing bitmaps
pack-bitmap-write: relax unique revwalk condition
pack-bitmap-write: better reuse bitmaps
revision: trace topo-walk statistics
tree-walk: report recursion counts
unpack-trees: add trace2 regions
cache-tree: use trace2 in cache_tree_update()
maintenance: use launchctl on macOS
maintenance: use Windows scheduled tasks
for-each-repo: do nothing on empty config
cache-tree: trace regions for I/O
cache-tree: trace regions for prime_cache_tree
index-format: use 'cache tree' over 'cached tree'
index-format: update preamble to cache tree extension
index-format: discuss recursion of cache-tree better
cache-tree: speed up consecutive path comparisons
maintenance: set log.excludeDecoration durin prefetch
t7900: clean up some broken refs
cache-tree: clean up cache_tree_update()
cache-tree: simplify verify_cache() prototype
cache-tree: extract subtree_pos()
fsmonitor: de-duplicate BUG()s around dirty bits
repository: add repo reference to index_state
name-hash: use trace2 regions for init
sparse-checkout: load sparse-checkout patterns
test-lib: test_region looks for trace2 regions
t1092: test interesting sparse-checkout scenarios
commit-reach: reduce requirements for remove_redundant()
commit-graph: use repo_parse_commit
commit-graph: always parse before commit_graph_data_at()
commit-graph: validate layers for generation data
commit-graph: compute generations separately
commit-graph: be extra careful about mixed generations
commit-graph: prepare commit graph
commit-graph: anonymize data in chunk_write_fn
maintenance: add pack-refs task
maintenance: incremental strategy runs pack-refs weekly
chunk-format: create chunk format write API
commit-graph: use chunk-format write API
midx: rename pack_info to write_midx_context
midx: use context in write_midx_pack_names()
midx: add entries to write_midx_context
midx: add pack_perm to write_midx_context
midx: add num_large_offsets to write_midx_context
midx: return success/failure in chunk write methods
midx: drop chunk progress during write
midx: use chunk-format API in write_midx_internal()
chunk-format: create read chunk API
commit-graph: use chunk-format read API
midx: use chunk-format read API
midx: use 64-bit multiplication for chunk sizes
chunk-format: restore duplicate chunk checks
chunk-format: add technical docs
commit-reach: use one walk in remove_redundant()
commit-reach: move compare_commits_by_gen
commit-reach: use heuristic in remove_redundant()
commit-reach: stale commits may prune generation further
Elijah Newren (93):
t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
stash: remove unnecessary process forking
stash: fix stash application in sparse-checkouts
merge-ort: setup basic internal data structures
merge-ort: add some high-level algorithm structure
merge-ort: port merge_start() from merge-recursive
merge-ort: use histogram diff
merge-ort: add an err() function similar to one from merge-recursive
merge-ort: implement a very basic collect_merge_info()
merge-ort: avoid repeating fill_tree_descriptor() on the same tree
merge-ort: compute a few more useful fields for collect_merge_info
merge-ort: record stage and auxiliary info for every path
merge-ort: avoid recursing into identical trees
merge-ort: add a preliminary simple process_entries() implementation
merge-ort: have process_entries operate in a defined order
merge-ort: step 1 of tree writing -- record basenames, modes, and oids
merge-ort: step 2 of tree writing -- function to create tree object
merge-ort: step 3 of tree writing -- handling subdirectories as we go
merge-ort: basic outline for merge_switch_to_result()
merge-ort: add implementation of checkout()
tree: enable cmp_cache_name_compare() to be used elsewhere
merge-ort: add implementation of record_conflicted_index_entries()
merge-ort: free data structures in merge_finalize()
merge-ort: add a few includes
merge-ort: add a clear_internal_opts helper
merge-ort: add a path_conflict field to merge_options_internal
merge-ort: add a paths_to_free field to merge_options_internal
merge-ort: add function grouping comments
merge-ort: add die-not-implemented stub handle_content_merge() function
merge-ort: add modify/delete handling and delayed output processing
merge-ort: add basic data structures for handling renames
merge-ort: add initial outline for basic rename detection
merge-ort: implement detect_regular_renames()
merge-ort: implement compare_pairs() and collect_renames()
merge-ort: add basic outline for process_renames()
diffcore-rename: rename num_create to num_destinations
diffcore-rename: avoid usage of global in too_many_rename_candidates()
diffcore-rename: simplify limit check
diffcore-rename: reduce jumpiness in progress counters
t4058: add more tests and documentation for duplicate tree entry handling
t4058: explore duplicate tree entry handling in a bit more detail
diffcore-rename: simplify and accelerate register_rename_src()
diffcore-rename: accelerate rename_dst setup
merge-ort: add implementation of both sides renaming identically
merge-ort: add implementation of both sides renaming differently
merge-ort: add implementation of rename/delete conflicts
merge-ort: add implementation of rename collisions
merge-ort: add implementation of normal rename handling
merge-ort: add implementation of type-changed rename handling
commit: move reverse_commit_list() from merge-recursive
merge-ort: copy a few small helper functions from merge-recursive.c
merge-ort: make clear_internal_opts() aware of partial clearing
merge-ort: implement merge_incore_recursive()
merge-ort: handle D/F conflict where directory disappears due to merge
merge-ort: handle directory/file conflicts that remain
merge-ort: implement unique_path() helper
merge-ort: handle book-keeping around two- and three-way content merge
merge-ort: flesh out implementation of handle_content_merge()
merge-ort: copy and adapt merge_3way() from merge-recursive.c
merge-ort: copy and adapt merge_submodule() from merge-recursive.c
merge-ort: implement format_commit()
merge-ort: copy find_first_merges() implementation from merge-recursive.c
merge-ort: add handling for different types of files at same path
diffcore-rename: remove unnecessary duplicate entry checks
merge-ort: add new data structures for directory rename detection
merge-ort: initialize and free new directory rename data structures
merge-ort: collect which directories are removed in dirs_removed
merge-ort: add outline for computing directory renames
merge-ort: add outline of get_provisional_directory_renames()
merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
merge-ort: implement compute_rename_counts()
merge-ort: implement handle_directory_level_conflicts()
merge-ort: modify collect_renames() for directory rename handling
merge-ort: implement compute_collisions()
merge-ort: implement apply_dir_rename() and check_dir_renamed()
merge-ort: implement check_for_directory_rename()
merge-ort: implement handle_path_level_conflicts()
merge-ort: add a new toplevel_dir field
merge-ort: implement apply_directory_rename_modifications()
merge-ort: process_renames() now needs more defensiveness
merge-ort: fix a directory rename detection bug
merge-ort: fix massive leak
merge-ort: ignore the directory rename split conflict for now
merge-ort: begin performance work; instrument with trace2_region_* calls
diffcore-rename: no point trying to find a match better than exact
diffcore-rename: filter rename_src list when possible
t4001: add a test comparing basename similarity and content similarity
diffcore-rename: compute basenames of source and dest candidates
diffcore-rename: complete find_basename_matches()
diffcore-rename: guide inexact rename detection based on basenames
gitdiffcore doc: mention new preliminary step for rename detection
merge-ort: call diffcore_rename() directly
Documentation/RelNotes: improve release note for rename detection work
Eric Sunshine (3):
worktree: teach `repair` to fix multi-directional breakage
t/perf: avoid unnecessary test_export() recursion
maintenance: fix incorrect `maintenance.repo` path with bare repository
Eric Wong (2):
core.abbrev=no disables abbreviations
t1500: ensure current --since= behavior remains
Felipe Contreras (8):
pull: refactor fast-forward check
pull: give the advice for choosing rebase/merge much later
pull: display default warning only when non-ff
test: bisect-porcelain: fix location of files
completion: bash: add __git_have_func helper
completion: bash: improve function detection
test: completion: add tests for __git_complete
completion: add proper public __git_complete
Han-Wen Nienhuys (1):
doc/reftable: document how to handle windows
Hariom Verma (4):
t6300: use function to test trailer options
pretty.c: refactor trailer logic to `format_set_trailers_options()`
pretty.c: capture invalid trailer argument
ref-filter: use pretty.c logic for trailers
Jacob Vosmaer (4):
builtin/pack-objects.c: avoid iterating all refs
ls-refs.c: initialize 'prefixes' before using it
upload-pack.c: fix filter spec quoting bug
t5544: clarify 'hook works with partial clone' test
Jeff Hostetler (11):
p7519: do not rely on "xargs -d" in test
p7519: fix watchman watch-list test on Windows
p7519: move watchman cleanup earlier in the test
p7519: add trace logging during perf test
preload-index: log the number of lstat calls to trace2
read-cache: log the number of lstat calls to trace2
read-cache: log the number of scanned files to trace2
fsmonitor: log invocation of FSMonitor hook to trace2
fsmonitor: log FSMN token when reading and writing the index
fsmonitor: refactor initialization of fsmonitor_last_update token
dir: fix malloc of root untracked_cache_dir
Jeff King (45):
pack-bitmap: fix header size check
pack-bitmap: bounds-check size of cache extension
t5310: drop size of truncated ewah bitmap
rev-list: die when --test-bitmap detects a mismatch
ewah: factor out bitmap growth
ewah: make bitmap growth less aggressive
ewah: implement bitmap_or()
ewah: add bitmap_dup() function
pack-bitmap-write: reimplement bitmap writing
pack-bitmap-write: pass ownership of intermediate bitmaps
pack-bitmap-write: ignore BITMAP_FLAG_REUSE
git_connect_git(): forbid newlines in host and path
fsck: reject .gitmodules git:// urls with newlines
t5516: loosen "not our ref" error check
patch-ids: handle duplicate hashmap entries
quote: make sq_dequote_step() a public function
for_each_object_in_pack(): clarify pack vs index ordering
config: parse more robust format in GIT_CONFIG_PARAMETERS
refs: switch peel_ref() to peel_iterated_oid()
run-command: document use_shell option
git-svn tests: rewrite brittle tests to use "--[no-]merges".
git-compat-util: always enable variadic macros
commit_graft_pos(): take an oid instead of a bare hash
rerere: check dirname format while iterating rr_cache directory
rerere: tighten rr-cache dirname check
rerere: use strmap to store rerere directories
hash_pos(): convert to oid_pos()
oid_pos(): access table through const pointers
t0000: keep clean-up tests together
t0000: run prereq tests inside sub-test
t0000: run cleaning test inside sub-test
t0000: consistently use single quotes for outer tests
pretty: lazy-load commit data when expanding user-format
p5303: avoid sed GNU-ism
completion: treat "branch -D" the same way as "branch -d"
completion: handle other variants of "branch -m"
doc/git-branch: fix awkward wording for "-c"
t: add --no-tag option to test_commit
mailmap: only look for .mailmap in work tree
rev-list: add --disk-usage option for calculating disk usage
docs/rev-list: add an examples section
docs/rev-list: add some examples of --disk-usage
doc: mention approxidates for git-commit --date
Makefile: add OPEN_RETURNS_EINTR knob
config.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big Sur
Jiang Xin (5):
test: add helper functions for git-bundle
bundle: lost objects when removing duplicate pendings
bundle: arguments can be read from stdin
t5411: use different out file to prevent overwriting
t5411: refactor check of refs using test_cmp_refs
Joey Salazar (1):
doc: fix naming of response-end-pkt
Johannes Schindelin (58):
tests: mark tests relying on the current default for `init.defaultBranch`
t0060: preemptively adjust alignment
t[01]*: adjust the references to the default branch name "main"
t2*: adjust the references to the default branch name "main"
t3[0-3]*: adjust the references to the default branch name "main"
t3416: preemptively adjust alignment in a comment
t34*: adjust the references to the default branch name "main"
t3[5-9]*: adjust the references to the default branch name "main"
t4*: adjust the references to the default branch name "main"
t5323: prepare centered comment for `master` -> `main`
t5[0-4]*: adjust the references to the default branch name "main"
t5503: prepare aligned comment for replacing `master` with `main`
t550*: adjust the references to the default branch name "main"
t551*: adjust the references to the default branch name "main"
t55[23]*: adjust the references to the default branch name "main"
t55[4-9]*: adjust the references to the default branch name "main"
t5[6-9]*: adjust the references to the default branch name "main"
t6[0-3]*: adjust the references to the default branch name "main"
t64*: preemptively adjust alignment to prepare for `master` -> `main`
t6[4-9]*: adjust the references to the default branch name "main"
t7[0-4]*: adjust the references to the default branch name "main"
t7[5-9]*: adjust the references to the default branch name "main"
t8*: adjust the references to the default branch name "main"
t9[0-4]*: adjust the references to the default branch name "main"
t9[5-7]*: adjust the references to the default branch name "main"
tests(git-p4): transition to the default branch name `main`
t99*: adjust the references to the default branch name "main"
tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
SKIP_DASHED_BUILT_INS: respect `config.mak`
range-diff/format-patch: refactor check for commit range
rebase -i: do leave commit message intact in fixup! chains
range-diff: avoid leaking memory in two error code paths
range-diff: libify the read_patches() function again
range-diff: simplify code spawning `git log`
range-diff: combine all options in a single data structure
range-diff: move the diffopt initialization down one layer
range-diff: offer --left-only/--right-only options
range-diff/format-patch: handle commit ranges other than A..B
range-diff(docs): explain how to specify commit ranges
t1450: robustify `remove_object()`
fsck --name-objects: be more careful parsing generation numbers
reflog expire --stale-fix: be generous about missing objects
commit-graph: when incompatible with graphs, indicate why
run-command: invalidate lstat cache after a command finished
Git 2.17.6
Git 2.18.5
Git 2.19.6
Git 2.20.5
Git 2.21.4
Git 2.22.5
Git 2.23.4
Git 2.24.4
Git 2.25.5
Git 2.26.3
Git 2.27.1
Git 2.28.1
Git 2.29.3
Git 2.30.2
Johannes Sixt (2):
annotate-tests: quote variable expansions containing path names
replace "parameters" by "arguments" in error messages
Jonathan Tan (10):
Doc: clarify contents of packfile sent as URI
ls-refs: report unborn targets of symrefs
connect, transport: encapsulate arg in struct
clone: respect remote unborn HEAD
usage: trace2 BUG() invocations
http: allow custom index-pack args
http-fetch: allow custom index-pack args
fetch-pack: with packfile URIs, use index-pack arg
fetch-pack: print and use dangling .gitmodules
fetch-pack: do not mix --pack_header and packfile uri
Junio C Hamano (31):
pack-redundant: gauge the usage before proposing its removal
pull: get rid of unnecessary global variable
pull: correct condition to trigger non-ff advice
CoC: explicitly take any whitespace breakage
parse-options: format argh like error messages
The first batch in 2.31 cycle
SubmittingPatches: tighten wording on "sign-off" procedure
ci/install-depends: attempt to fix "brew cask" stuff
t4203: make blame output massaging more robust
The second batch
The third batch
The fourth batch
The fifth batch
Prepare for 2.30.1
The sixth batch
Git 2.30.1
The seventh batch
The eighth batch
diff: --{rotate,skip}-to=<path>
The ninth batch
Documentation: typofix --column description
The tenth batch
push: do not turn --delete '' into a matching push
blame-options.txt: camelcase blame.blankBoundary
index-format doc: camelCase core.excludesFile
Git 2.31-rc0
Revert "commit-graph: when incompatible with graphs, indicate why"
Hopefully the last batch before -rc1
Git 2.31-rc1
Merged the open-eintr workaround for macOS
Git 2.31-rc2
Kevin Willford (1):
fsmonitor: allow all entries for a folder to be invalidated
Martin von Zweigbergk (1):
docs: clarify that refs/notes/ do not keep the attached objects alive
Martin Ågren (16):
t1300: remove duplicate test for `--file ../foo`
t1300: remove duplicate test for `--file no-such-file`
t1300: don't needlessly work with `core.foo` configs
pack-format.txt: document sizes at start of delta data
object-name.c: rename from sha1-name.c
object-file.c: rename from sha1-file.c
sha1-lookup: rename `sha1_pos()` as `hash_pos()`
hash-lookup: rename from sha1-lookup
builtin/gc: don't peek into `struct lock_file`
commit-graph: don't peek into `struct lock_file`
midx: don't peek into `struct lock_file`
refs/files-backend: don't peek into `struct lock_file`
read-cache: try not to peek into `struct {lock_,temp}file`
rev-list-options.txt: fix rendering of bonus paragraph
git.txt: fix monospace rendering
gitmailmap.txt: fix rendering of e-mail addresses
Matheus Tavares (10):
t4129: don't fail if setgid is set in the test directory
grep: error out if --untracked is used with --cached
grep: honor sparse-checkout on working tree searches
checkout: fix bug that makes checkout follow symlinks in leading path
unpack_trees(): start with a fresh lstat cache
write_entry(): fix misuses of `path` in error messages
checkout-index: omit entries with no tempname from --temp output
add --chmod: don't update index when --dry-run is used
add: mark --chmod error string for translation
add: propagate --chmod errors to exit status
Mikhail Klyushin (1):
git-gui: fix typo in russian locale
Neeraj Singh (1):
read-cache: make the index write buffer size 128K
Patrick Steinhardt (11):
git: add `--super-prefix` to usage string
config: add new way to pass config via `--config-env`
config: extract function to parse config pairs
fetch: extract writing to FETCH_HEAD
fetch: use strbuf to format FETCH_HEAD updates
fetch: refactor `s_update_ref` to use common exit path
fetch: allow passing a transaction to `s_update_ref()`
fetch: implement support for atomic reference updates
config: store "git -c" variables using more robust format
environment: make `getenv_safe()` a public function
config: allow specifying config entries via envvar pairs
Peter Kaestle (1):
submodules: fix of regression on fetching of non-init subsub-repo
Phil Hord (1):
use delete_refs when deleting tags or branches
Philippe Blain (4):
gitmodules.txt: fix 'GIT_WORK_TREE' variable name
mergetool--lib: fix '--tool-help' to correctly show available tools
mailmap doc: use correct environment variable 'GIT_WORK_TREE'
ci: do not cancel all jobs of a matrix if one fails
Pranit Bauva (7):
bisect--helper: reimplement `bisect_log` shell function in C
bisect--helper: reimplement `bisect_replay` shell function in C
bisect--helper: retire `--bisect-write` subcommand
bisect--helper: use `res` instead of return in BISECT_RESET case option
bisect--helper: retire `--bisect-auto-next` subcommand
bisect--helper: reimplement `bisect_skip` shell function in C
bisect--helper: retire `--check-and-set-terms` subcommand
Pratyush Yadav (2):
git-gui: remove lines starting with the comment character
Revert "git-gui: remove lines starting with the comment character"
Rafael Silva (8):
worktree: libify should_prune_worktree()
worktree: teach worktree to lazy-load "prunable" reason
worktree: teach worktree_lock_reason() to gently handle main worktree
t2402: ensure locked worktree is properly cleaned up
worktree: teach `list --porcelain` to annotate locked worktree
worktree: teach `list` to annotate prunable worktree
worktree: teach `list` verbose mode
blame: remove unnecessary use of get_commit_info()
René Scharfe (2):
rebase: verify commit parameter
cache-tree: use ce_namelen() instead of strlen()
SZEDER Gábor (2):
t7800-difftool: don't accidentally match tmp dirs
test-lib: prevent '--stress-jobs=X' from being ignored
Sangeeta Jain (1):
diff: do not show submodule with untracked files as "-dirty"
Sergey Organov (32):
revision: factor out parsing of diff-merge related options
revision: factor out setup of diff-merge related settings
revision: factor out initialization of diff-merge related settings
revision: provide implementation for diff merges tweaks
revision: move diff merges functions to its own diff-merges.c
diff-merges: rename all functions to have common prefix
diff-merges: move checks for first_parent_only out of the module
diff-merges: rename diff_merges_default_to_enable() to match semantics
diff-merges: re-arrange functions to match the order they are called in
diff-merges: new function diff_merges_suppress()
diff-merges: new function diff_merges_set_dense_combined_if_unset()
diff-merges: introduce revs->first_parent_merges flag
diff-merges: handle imply -p on -c/--cc logic for log.c
diff-merges: revise revs->diff flag handling
t4013: support test_expect_failure through ':failure' magic
t4013: add tests for -m failing to override -c/--cc
diff-merges: fix -m to properly override -c/--cc
diff-merges: split 'ignore_merges' field
diff-merges: group diff-merge flags next to each other inside 'rev_info'
diff-merges: get rid of now empty diff_merges_init_revs()
diff-merges: refactor opt settings into separate functions
diff-merges: make -m/-c/--cc explicitly mutually exclusive
diff-merges: implement new values for --diff-merges
diff-merges: do not imply -p for new options
diff-merges: let new options enable diff without -p
diff-merges: add old mnemonic counterparts to --diff-merges
diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
doc/git-log: describe new --diff-merges options
doc/diff-generate-patch: mention new --diff-merges option
doc/rev-list-options: document --first-parent changes merges format
doc/git-show: include --diff-merges description
t4013: add tests for --diff-merges=first-parent
Seth House (4):
mergetool: add hideResolved configuration
mergetool: break setup_tool out into separate initialization function
mergetool: add per-tool support and overrides for the hideResolved flag
mergetools/vimdiff: add vimdiff1 merge tool variant
Shubham Verma (10):
t7001: modernize test formatting
t7001: indent with TABs instead of spaces
t7001: remove unnecessary blank lines
t7001: modernize subshell formatting
t7001: remove whitespace after redirect operators
t7001: avoid using `cd` outside of subshells
t7001: use '>' rather than 'touch'
t7001: put each command on a separate line
t7001: use here-docs instead of echo
t7001: use `test` rather than `[`
Taylor Blau (40):
ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
pack-bitmap.c: check reads more aggressively when loading
pack-bitmap: factor out 'bitmap_for_commit()'
pack-bitmap: factor out 'add_commit_to_bitmap()'
p7519: allow running without watchman prereq
Documentation/git-clone.txt: document race with --local
pack-revindex: introduce a new API
write_reuse_object(): convert to new revindex API
write_reused_pack_one(): convert to new revindex API
write_reused_pack_verbatim(): convert to new revindex API
check_object(): convert to new revindex API
bitmap_position_packfile(): convert to new revindex API
show_objects_for_type(): convert to new revindex API
get_size_by_pos(): convert to new revindex API
try_partial_reuse(): convert to new revindex API
rebuild_existing_bitmaps(): convert to new revindex API
get_delta_base_oid(): convert to new revindex API
retry_bad_packed_offset(): convert to new revindex API
packed_object_info(): convert to new revindex API
unpack_entry(): convert to new revindex API
for_each_object_in_pack(): convert to new revindex API
builtin/gc.c: guess the size of the revindex
pack-revindex: remove unused 'find_pack_revindex()'
pack-revindex: remove unused 'find_revindex_position()'
pack-revindex: hide the definition of 'revindex_entry'
pack-revindex.c: avoid direct revindex access in 'offset_to_pack_pos()'
refs: expose 'for_each_fullref_in_prefixes'
ls-refs.c: traverse prefixes of disjoint "ref-prefix" sets
packfile: prepare for the existence of '*.rev' files
pack-write.c: prepare to write 'pack-*.rev' files
builtin/index-pack.c: allow stripping arbitrary extensions
builtin/index-pack.c: write reverse indexes
builtin/pack-objects.c: respect 'pack.writeReverseIndex'
Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'
t: prepare for GIT_TEST_WRITE_REV_INDEX
t: support GIT_TEST_WRITE_REV_INDEX
pack-revindex: ensure that on-disk reverse indexes are given precedence
t5325: check both on-disk and in-memory reverse index
.github/workflows/main.yml: run static-analysis on bionic
commit-graph.c: display correct number of chunks when writing
Thomas Ackermann (7):
doc: fix some typos
doc hash-function-transition: fix asciidoc output
doc hash-function-transition: use SHA-1 and SHA-256 consistently
doc hash-function-transition: use upper case consistently
doc hash-function-transition: fix incomplete sentence
doc hash-function-transition: move rationale upwards
doc: use https links
Torsten Bögershausen (1):
MacOS: precompose_argv_prefix()
Utku Gultopu (1):
doc: remove "directory cache" from man pages
Vasyl Vavrychuk (1):
git-send-email.txt: mention less secure app access with Gmail
ZheNing Hu (5):
builtin/*: update usage format
ls_files.c: bugfix for --deleted and --modified
ls_files.c: consolidate two for loops into one
ls-files.c: add --deduplicate option
difftool.c: learn a new way start at specified file
brian m. carlson (9):
abspath: add a function to resolve paths with missing components
rev-parse: add option for absolute or relative path formatting
docs: rephrase and clarify the git status --short format
ref-filter: switch some uses of unsigned long to size_t
commit: ignore additional signatures when parsing signed commits
gpg-interface: improve interface for parsing tags
commit: allow parsing arbitrary buffers with headers
ref-filter: hoist signature parsing
gpg-interface: remove other signature headers before verifying
Ævar Arnfjörð Bjarmason (100):
pretty format %(trailers) test: split a long line
pretty format %(trailers) doc: avoid repetition
pretty-format %(trailers): fix broken standalone "valueonly"
pretty format %(trailers): add a "keyonly"
pretty format %(trailers): add a "key_value_separator"
mktag doc: say <hash> not <sha1>
mktag doc: grammar fix, when exists -> when it exists
CoC: Update word-wrapping to match upstream
mktag doc: update to explain why to use this
mktag tests: don't needlessly use a subshell
mktag tests: use "test_commit" helper
mktag tests: remove needless SHA-1 hardcoding
mktag tests: don't redirect stderr to a file needlessly
mktag tests: don't create "mytag" twice
mktag tests: run "fsck" after creating "mytag"
mktag tests: stress test whitespace handling
mktag tests: test "hash-object" compatibility
mktag tests: improve verify_object() test coverage
mktag tests: test verify_object() with replaced objects
mktag: use default strbuf_read() hint
mktag: remove redundant braces in one-line body "if"
mktag: use puts(str) instead of printf("%s\n", str)
mktag: use fsck instead of custom verify_tag()
fsck: make fsck_config() re-usable
mktag: allow turning off fsck.extraHeaderEntry
mktag: allow omitting the header/body \n separator
mktag: convert to parse-options
mktag: mark strings for translation
mktag: add a --[no-]strict option
branch: change "--local" to "--list" in comment
branch tests: add to --sort tests
ref-filter: add braces to if/else if/else chain
ref-filter: move "cmp_fn" assignment into "else if" arm
ref-filter: move ref_sorting flags to a bitfield
branch: sort detached HEAD based on a flag
branch: show "HEAD detached" first under reverse sort
Makefile: remove a warning about old GETTEXT_POISON flag
gettext.c: remove/reword a mostly-useless comment
mailmap doc: create a new "gitmailmap(5)" man page
mailmap doc: quote config variables `like.this`
check-mailmap doc: note config options
mailmap doc: start by mentioning the comment syntax
mailmap tests: use our preferred whitespace syntax
mailmap tests: modernize syntax & test idioms
mailmap tests: improve --stdin tests
mailmap tests: remove redundant entry in test
mailmap tests: add a test for "not a blob" error
mailmap tests: get rid of overly complex blame fuzzing
mailmap: test for silent exiting on missing file/blob
test-lib functions: expand "test_commit" comment template
test-lib functions: document arguments to test_commit
test-lib functions: add --author support to test_commit
test-lib functions: add an --append option to test_commit
tests: refactor a few tests to use "test_commit --append"
mailmap doc + tests: add better examples & test them
mailmap tests: add a test for comment syntax
mailmap tests: add tests for whitespace syntax
mailmap tests: add tests for empty "<>" syntax
mailmap doc + tests: document and test for case-insensitivity
shortlog: remove unused(?) "repo-abbrev" feature
CoC: update to version 2.0 + local changes
fsck doc: remove ancient out-of-date diagnostics
ci: remove GETTEXT_POISON jobs
tests: remove support for GIT_TEST_GETTEXT_POISON
tests: remove uses of GIT_TEST_GETTEXT_POISON=false
cache-tree tests: refactor for modern test style
cache-tree tests: remove unused $2 parameter
cache-tree tests: use a sub-shell with less indirection
cache-tree tests: explicitly test HEAD and index differences
git svn mergeinfo tests: modernize redirection & quoting style
git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty
upload-pack tests: avoid a non-zero "grep" exit status
archive tests: use a cheaper "zipinfo -h" invocation to get header
rm tests: actually test for SIGPIPE in SIGPIPE test
config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag
Remove support for v1 of the PCRE library
grep/pcre2 tests: don't rely on invalid UTF-8 data test
grep/pcre2: better support invalid UTF-8 haystacks
grep/log: remove hidden --debug and --grep-debug options
pager: refactor wait_for_pager() function
pager: test for exit code with and without SIGPIPE
run-command: add braces for "if" block in wait_or_whine()
pager: properly log pager exit code when signalled
test-lib: remove check_var_migration
test lib: change "error" to "BUG" as appropriate
test-lib-functions: move test_set_index_version() to its user
test-lib-functions: remove generate_zero_bytes() wrapper
test libs: rename bundle helper to "lib-bundle.sh"
test libs: rename gitweb-lib.sh to lib-gitweb.sh
test-lib-functions: move function to lib-bitmap.sh
t/.gitattributes: sort lines
tests: remove last uses of GIT_TEST_GETTEXT_POISON=false
tests: remove most uses of C_LOCALE_OUTPUT
tests: remove last uses of C_LOCALE_OUTPUT
tests: remove most uses of test_i18ncmp
diff: add an API for deferred freeing
diff: plug memory leak from regcomp() on {log,diff} -I
test libs: rename "diff-lib" to "lib-diff"
test-lib-functions: remove bug-inducing "diagnostics" helper param
test-lib-functions: assert correct parameter count
^ permalink raw reply [relevance 4%]
* What's cooking in git.git (Mar 2021, #01; Tue, 2)
@ 2021-03-03 10:14 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-03-03 10:14 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
A release candidate Git v2.31.0-rc1 has been tagged.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/detox-gettext-tests (2021-02-10) 4 commits
(merged to 'next' on 2021-02-17 at bd3d771557)
+ tests: remove most uses of test_i18ncmp
+ tests: remove last uses of C_LOCALE_OUTPUT
+ tests: remove most uses of C_LOCALE_OUTPUT
+ tests: remove last uses of GIT_TEST_GETTEXT_POISON=false
Removal of GIT_TEST_GETTEXT_POISON continues.
* ab/diff-deferred-free (2021-02-11) 2 commits
(merged to 'next' on 2021-02-12 at 5e24106122)
+ diff: plug memory leak from regcomp() on {log,diff} -I
+ diff: add an API for deferred freeing
A small memleak in "diff -I<regexp>" has been corrected.
* ab/pager-exit-log (2021-02-01) 4 commits
(merged to 'next' on 2021-02-12 at ffe9f2d364)
+ pager: properly log pager exit code when signalled
+ run-command: add braces for "if" block in wait_or_whine()
+ pager: test for exit code with and without SIGPIPE
+ pager: refactor wait_for_pager() function
When a pager spawned by us exited, the trace log did not record its
exit status correctly, which has been corrected.
The original "what should we do with SIGPIPE?" question remains, though.
* ab/test-lib (2021-02-12) 11 commits
(merged to 'next' on 2021-02-12 at 666a0422dc)
+ test-lib-functions: assert correct parameter count
+ test-lib-functions: remove bug-inducing "diagnostics" helper param
+ test libs: rename "diff-lib" to "lib-diff"
+ t/.gitattributes: sort lines
+ test-lib-functions: move function to lib-bitmap.sh
+ test libs: rename gitweb-lib.sh to lib-gitweb.sh
+ test libs: rename bundle helper to "lib-bundle.sh"
+ test-lib-functions: remove generate_zero_bytes() wrapper
+ test-lib-functions: move test_set_index_version() to its user
+ test lib: change "error" to "BUG" as appropriate
+ test-lib: remove check_var_migration
(this branch is used by ab/pickaxe-pcre2.)
Test framework clean-up.
* ah/commit-graph-leakplug (2021-02-22) 1 commit
(merged to 'next' on 2021-02-22 at 1330b452db)
+ commit-graph: avoid leaking topo_levels slab in write_commit_graph()
Plug a minor memory leak.
* ah/rebase-no-fork-point-config (2021-02-24) 1 commit
(merged to 'next' on 2021-02-24 at 8e56891909)
+ rebase: add a config option for --no-fork-point
"git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.
* bc/signed-objects-with-both-hashes (2021-02-10) 6 commits
(merged to 'next' on 2021-02-11 at 391cc85104)
+ gpg-interface: remove other signature headers before verifying
+ ref-filter: hoist signature parsing
+ commit: allow parsing arbitrary buffers with headers
+ gpg-interface: improve interface for parsing tags
+ commit: ignore additional signatures when parsing signed commits
+ ref-filter: switch some uses of unsigned long to size_t
Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
* cw/pack-config-doc (2021-02-22) 1 commit
(merged to 'next' on 2021-02-22 at cfd2f5ccd1)
+ doc: mention bigFileThreshold for packing
Doc update.
* dl/doc-config-camelcase (2021-02-24) 3 commits
(merged to 'next' on 2021-02-24 at 5315e84c47)
+ index-format doc: camelCase core.excludesFile
+ blame-options.txt: camelcase blame.blankBoundary
+ i18n.txt: camel case and monospace "i18n.commitEncoding"
A handful of multi-word configuration variable names in
documentation that are spelled in all lowercase have been corrected
to use the more canonical camelCase.
* dl/stash-cleanup (2021-02-11) 7 commits
(merged to 'next' on 2021-02-11 at ae1cde1380)
+ stash: declare ref_stash as an array
+ t3905: use test_cmp() to check file contents
+ t3905: replace test -s with test_file_not_empty
+ t3905: remove nested git in command substitution
+ t3905: move all commands into test cases
+ t3905: remove spaces after redirect operators
+ git-stash.txt: be explicit about subcommand options
(this branch is used by dl/stash-show-untracked.)
Documentation, code and test clean-up around "git stash".
This is an early part of a topic that added a new feature to the
command, but the implementation is expected to need a handful of
iterations; I split the preparatory part up to fast-track it.
* ds/chunked-file-api (2021-02-24) 18 commits
(merged to 'next' on 2021-02-24 at 6002da063c)
+ commit-graph.c: display correct number of chunks when writing
(merged to 'next' on 2021-02-22 at 5f0e28cfb2)
+ chunk-format: add technical docs
+ chunk-format: restore duplicate chunk checks
+ midx: use 64-bit multiplication for chunk sizes
+ midx: use chunk-format read API
+ commit-graph: use chunk-format read API
+ chunk-format: create read chunk API
+ midx: use chunk-format API in write_midx_internal()
+ midx: drop chunk progress during write
+ midx: return success/failure in chunk write methods
+ midx: add num_large_offsets to write_midx_context
+ midx: add pack_perm to write_midx_context
+ midx: add entries to write_midx_context
+ midx: use context in write_midx_pack_names()
+ midx: rename pack_info to write_midx_context
+ commit-graph: use chunk-format write API
+ chunk-format: create chunk format write API
+ commit-graph: anonymize data in chunk_write_fn
(this branch is used by ds/commit-graph-generation-config and tb/reverse-midx.)
The common code to deal with "chunked file format" that is shared
by the multi-pack-index and commit-graph files have been factored
out, to help codepaths for both filetypes to become more robust.
* ds/merge-base-independent (2021-02-22) 5 commits
(merged to 'next' on 2021-02-24 at 9fad5352ea)
+ commit-reach: stale commits may prune generation further
+ commit-reach: use heuristic in remove_redundant()
+ commit-reach: move compare_commits_by_gen
+ commit-reach: use one walk in remove_redundant()
+ commit-reach: reduce requirements for remove_redundant()
The code to implement "git merge-base --independent" was poorly
done and was kept from the very beginning of the feature.
* en/diffcore-rename (2021-02-15) 8 commits
(merged to 'next' on 2021-02-22 at 243d0182da)
+ merge-ort: call diffcore_rename() directly
+ gitdiffcore doc: mention new preliminary step for rename detection
+ diffcore-rename: guide inexact rename detection based on basenames
+ diffcore-rename: complete find_basename_matches()
+ diffcore-rename: compute basenames of source and dest candidates
+ t4001: add a test comparing basename similarity and content similarity
+ diffcore-rename: filter rename_src list when possible
+ diffcore-rename: no point trying to find a match better than exact
Performance optimization work on the rename detection continues.
* es/maintenance-of-bare-repositories (2021-02-23) 1 commit
(merged to 'next' on 2021-02-24 at 73a40e23b3)
+ maintenance: fix incorrect `maintenance.repo` path with bare repository
The "git maintenance register" command had trouble registering bare
repositories, which had been corrected.
* hn/reftable-tables-doc-update (2021-02-23) 1 commit
(merged to 'next' on 2021-02-25 at cfeadb4945)
+ doc/reftable: document how to handle windows
Documentation update.
* hv/trailer-formatting (2021-02-15) 4 commits
(merged to 'next' on 2021-02-25 at 7d1d5ecf59)
+ ref-filter: use pretty.c logic for trailers
+ pretty.c: capture invalid trailer argument
+ pretty.c: refactor trailer logic to `format_set_trailers_options()`
+ t6300: use function to test trailer options
The logic to handle "trailer" related placeholders in the
"--format=" mechanisms in the "log" family and "for-each-ref"
family is getting unified.
* jc/diffcore-rotate (2021-02-16) 1 commit
(merged to 'next' on 2021-02-22 at f17c341d20)
+ diff: --{rotate,skip}-to=<path>
(this branch is used by zh/difftool-skip-to.)
"git {diff,log} --{skip,rotate}-to=<path>" allows the user to
discard diff output for early paths or move them to the end of the
output.
* jc/maint-column-doc-typofix (2021-02-19) 1 commit
(merged to 'next' on 2021-02-22 at d927f64824)
+ Documentation: typofix --column description
Doc update.
* jc/push-delete-nothing (2021-02-23) 1 commit
(merged to 'next' on 2021-02-24 at 9d5481ea10)
+ push: do not turn --delete '' into a matching push
"git push $there --delete ''" should have been diagnosed as an
error, but instead turned into a matching push, which has been
corrected.
* jh/fsmonitor-prework (2021-02-16) 11 commits
(merged to 'next' on 2021-02-17 at 1943efb5ac)
+ fsmonitor: refactor initialization of fsmonitor_last_update token
+ fsmonitor: allow all entries for a folder to be invalidated
+ fsmonitor: log FSMN token when reading and writing the index
+ fsmonitor: log invocation of FSMonitor hook to trace2
+ read-cache: log the number of scanned files to trace2
+ read-cache: log the number of lstat calls to trace2
+ preload-index: log the number of lstat calls to trace2
+ p7519: add trace logging during perf test
+ p7519: move watchman cleanup earlier in the test
+ p7519: fix watchman watch-list test on Windows
+ p7519: do not rely on "xargs -d" in test
Preliminary changes to fsmonitor integration.
* jh/untracked-cache-fix (2021-02-24) 1 commit
(merged to 'next' on 2021-02-25 at 79d1e40211)
+ dir: fix malloc of root untracked_cache_dir
An under-allocation for the untracked cache data has been corrected.
* jk/rev-list-disk-usage (2021-02-17) 4 commits
(merged to 'next' on 2021-02-22 at 37a29a3495)
+ docs/rev-list: add some examples of --disk-usage
+ docs/rev-list: add an examples section
(merged to 'next' on 2021-02-11 at 6fb701f287)
+ rev-list: add --disk-usage option for calculating disk usage
+ t: add --no-tag option to test_commit
(this branch is used by ab/pickaxe-pcre2.)
"git rev-list" command learned "--disk-usage" option.
* js/doc-proto-v2-response-end (2021-02-17) 1 commit
(merged to 'next' on 2021-02-17 at 9d5d479469)
+ doc: fix naming of response-end-pkt
Docfix.
* js/params-vs-args (2021-02-23) 1 commit
(merged to 'next' on 2021-02-24 at 0a1ff0bc16)
+ replace "parameters" by "arguments" in error messages
Messages update.
* jt/transfer-fsck-across-packs (2021-02-22) 4 commits
(merged to 'next' on 2021-02-22 at 76f1327431)
+ fetch-pack: print and use dangling .gitmodules
+ fetch-pack: with packfile URIs, use index-pack arg
+ http-fetch: allow custom index-pack args
+ http: allow custom index-pack args
The approach to "fsck" the incoming objects in "index-pack" is
attractive for performance reasons (we have them already in core,
inflated and ready to be inspected), but fundamentally cannot be
applied fully when we receive more than one pack stream, as a tree
object in one pack may refer to a blob object in another pack as
".gitmodules", when we want to inspect blobs that are used as
".gitmodules" file, for example. Teach "index-pack" to emit
objects that must be inspected later and check them in the calling
"fetch-pack" process.
* ma/doc-markup-fix (2021-02-18) 3 commits
(merged to 'next' on 2021-02-22 at a8e9e712c8)
+ gitmailmap.txt: fix rendering of e-mail addresses
+ git.txt: fix monospace rendering
+ rev-list-options.txt: fix rendering of bonus paragraph
Docfix.
* mt/add-chmod-fixes (2021-02-24) 3 commits
(merged to 'next' on 2021-02-24 at 6c0977f3be)
+ add: propagate --chmod errors to exit status
+ add: mark --chmod error string for translation
+ add --chmod: don't update index when --dry-run is used
Various fixes on "git add --chmod".
* mt/checkout-index-corner-cases (2021-02-16) 2 commits
(merged to 'next' on 2021-02-17 at 81dad9735b)
+ checkout-index: omit entries with no tempname from --temp output
+ write_entry(): fix misuses of `path` in error messages
The error codepath around the "--temp/--prefix" feature of "git
checkout-index" has been improved.
* mt/grep-sparse-checkout (2021-02-09) 1 commit
(merged to 'next' on 2021-02-24 at 246fc2ad56)
+ grep: honor sparse-checkout on working tree searches
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* mz/doc-notes-are-not-anchors (2021-02-10) 1 commit
(merged to 'next' on 2021-02-17 at 81f92a74b2)
+ docs: clarify that refs/notes/ do not keep the attached objects alive
Objects that lost references can be pruned away, even when they
have notes attached to it (and these notes will become dangling,
which in turn can be pruned with "git notes prune"). This has been
clarified in the documentation.
* ns/raise-write-index-buffer-size (2021-02-24) 1 commit
(merged to 'next' on 2021-02-25 at 8f43f67ba7)
+ read-cache: make the index write buffer size 128K
Raise the buffer size used when writing the index file out from
(obviously too small) 8kB to (clearly sufficiently large) 128kB.
We may want to extend this to use a value the platform suggests as
the best size with a follow-up patch, but this should do for now.
* rs/blame-optim (2021-02-17) 1 commit
(merged to 'next' on 2021-02-17 at e54665eeb3)
+ blame: remove unnecessary use of get_commit_info()
Optimization in "git blame"
* sh/mergetools-vimdiff1 (2021-02-23) 1 commit
(merged to 'next' on 2021-02-24 at dbd4c6684c)
+ mergetools/vimdiff: add vimdiff1 merge tool variant
Mergetools update.
* sv/t7001-modernize (2021-02-11) 10 commits
(merged to 'next' on 2021-02-25 at 368861a00d)
+ t7001: use `test` rather than `[`
+ t7001: use here-docs instead of echo
+ t7001: put each command on a separate line
+ t7001: use '>' rather than 'touch'
+ t7001: avoid using `cd` outside of subshells
+ t7001: remove whitespace after redirect operators
+ t7001: modernize subshell formatting
+ t7001: remove unnecessary blank lines
+ t7001: indent with TABs instead of spaces
+ t7001: modernize test formatting
Test script modernization.
* ta/hash-function-transition-doc (2021-02-05) 6 commits
(merged to 'next' on 2021-02-12 at f620f3cfd3)
+ doc: use https links
+ doc hash-function-transition: move rationale upwards
+ doc hash-function-transition: fix incomplete sentence
+ doc hash-function-transition: use upper case consistently
+ doc hash-function-transition: use SHA-1 and SHA-256 consistently
+ doc hash-function-transition: fix asciidoc output
Update formatting and grammar of the hash transition plan
documentation, plus some updates.
* ug/doc-commit-approxidate (2021-02-23) 1 commit
(merged to 'next' on 2021-02-24 at 825686380e)
+ doc: mention approxidates for git-commit --date
Doc update.
* zh/difftool-skip-to (2021-02-22) 1 commit
(merged to 'next' on 2021-02-22 at eeff734f2b)
+ difftool.c: learn a new way start at specified file
(this branch uses jc/diffcore-rotate.)
"git difftool" learned "--skip-to=<path>" option to restart an
interrupted session from an arbitrary path.
--------------------------------------------------
[New Topics]
* ab/remote-write-config-in-camel-case (2021-02-24) 2 commits
(merged to 'next' on 2021-03-01 at a01bd0d8e4)
+ remote: write camel-cased *.pushRemote on rename
+ remote: add camel-cased *.tagOpt key, like clone
Update C code that sets a few configuration variables when a remote
is configured so that it spells configuration variable names in the
canonical camelCase.
Will cook in 'next'.
* ds/commit-graph-generation-config (2021-02-25) 2 commits
(merged to 'next' on 2021-03-01 at 926537ea97)
+ commit-graph: use config to specify generation type
+ commit-graph: create local repository pointer
A new configuration variable has been introduced to allow choosing
which version of the generation number gets used in the
commit-graph file.
Will cook in 'next'.
* mt/cleanly-die-upon-missing-required-filter (2021-02-26) 1 commit
(merged to 'next' on 2021-03-01 at 357954af7c)
+ convert: fail gracefully upon missing clean cmd on required filter
We had a code to diagnose and die cleanly when a required
clean/smudge filter is missing, but an assert before that
unnecessarily fired, hiding the end-user facing die() message.
Will cook in 'next'.
* ab/describe-tests-fix (2021-03-01) 10 commits
- test-lib: return 1 from test_expect_{success,failure}
- svn tests: refactor away a "set -e" in test body
- svn tests: remove legacy re-setup from init-clone test
- describe tests: support -C in "check_describe"
- describe tests: fix nested "test_expect_success" call
- describe tests: convert setup to use test_commit
- test-lib functions: add an --annotated-tag option to "test_commit"
- describe tests: always assert empty stderr from "describe"
- describe tests: refactor away from glob matching
- describe tests: improve test for --work-tree & --dirty
Various updates to tests around "git describe"
* en/ort-perf-batch-8 (2021-02-26) 10 commits
- diffcore-rename: compute dir_rename_guess from dir_rename_counts
- diffcore-rename: limit dir_rename_counts computation to relevant dirs
- diffcore-rename: compute dir_rename_counts in stages
- diffcore-rename: extend cleanup_dir_rename_info()
- diffcore-rename: move dir_rename_counts into dir_rename_info struct
- diffcore-rename: add function for clearing dir_rename_count
- Move computation of dir_rename_count from merge-ort to diffcore-rename
- diffcore-rename: add a mapping of destination names to their indices
- diffcore-rename: provide basic implementation of idx_possible_rename()
- diffcore-rename: use directory rename guided basename comparisons
Rename detection rework continues.
* jk/open-returns-eintr (2021-03-01) 2 commits
(merged to 'next' on 2021-03-02 at 7f0218e627)
+ config.mak.uname: enable OPEN_RETURNS_EINTR for macOS Big Sur
+ Makefile: add OPEN_RETURNS_EINTR knob
Work around platforms whose open() is reported to return EINTR (it
shouldn't, as we do our signals with SA_RESTART).
Will cook in 'next'.
* jk/perf-in-worktrees (2021-02-26) 2 commits
(merged to 'next' on 2021-03-02 at ea298cb298)
+ t/perf: avoid copying worktree files from test repo
+ t/perf: handle worktrees as test repos
Perf test update to work better in secondary worktrees.
Will cook in 'next'.
* ps/update-ref-trans-hook-doc (2021-03-01) 2 commits
- githooks.txt: clarify documentation on reference-transaction hook
- githooks.txt: replace mentions of SHA-1 specific properties
* tb/pack-revindex-on-disk (2021-02-26) 1 commit
- pack-revindex.c: don't close unopened file descriptors
* zh/format-patch-fractional-reroll-count (2021-03-01) 1 commit
- format-patch: allow a non-integral version numbers
--------------------------------------------------
[Stalled]
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* es/config-hooks-part-1 (2021-02-16) 17 commits
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
(this branch is used by es/config-hooks.)
A way to specify hooks in the configuration files is introduced.
Expecting another reroll??
cf. <YC7o2rUQOEdiMdqh@google.com>
* dl/stash-show-untracked (2021-02-16) 4 commits
- SQUASH???
- SQUASH???
- stash show: learn stash.showIncludeUntracked
- stash show: teach --include-untracked and --only-untracked
"git stash show" learned to optionally show untracked part of the
stash.
Expecting a reroll.
cf. <cover.1613459474.git.liu.denton@gmail.com>
* ab/fsck-api-cleanup (2021-02-18) 10 commits
- fsck.h: update FSCK_OPTIONS_* for object_name
- fsck.c: give "FOREACH_MSG_ID" a more specific name
- fsck.c: undefine temporary STR macro after use
- fsck.c: call parse_msg_type() early in fsck_set_msg_type()
- fsck.h: move FSCK_{FATAL,INFO,ERROR,WARN,IGNORE} into an enum
- fsck.c: rename remaining fsck_msg_id "id" to "msg_id"
- fsck.c: move definition of msg_id into append_msg_id()
- fsck.c: rename variables in fsck_set_msg_type() for less confusion
- fsck.h: use "enum object_type" instead of "int"
- fsck.h: indent arguments to of fsck_set_msg_type
Preliminary fsck API clean-up.
Expecting a reroll.
cf. <xmqqczwxc8bw.fsf@gitster.g>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
- docs: document symlink restrictions for .git* files
- fsck: complain when .gitattributes or .gitignore is a symlink
- verify_path(): disallow symlinks in .gitattributes and .gitignore
- t0060: test obscured .gitattributes and .gitignore matching
- t7450: test .gitmodules symlink matching against obscured names
- t7450: test verify_path() handling of gitmodules
- t7415: rename to expand scope
- fsck_tree(): wrap some long lines
- fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
has potential consequences that is more/less grave, so that these
projects can opt out of the new checks?
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Got enough review comments to get updated.
--------------------------------------------------
[Cooking]
* ab/make-cleanup (2021-02-23) 6 commits
- Makefile: build "$(FUZZ_OBJS)" in CI, not under "all"
- Makefile: add {program,xdiff,test,git,fuzz}-objs & objects targets
- Makefile: split OBJECTS into OBJECTS and GIT_OBJS
- Makefile: sort OBJECTS assignment for subsequent change
- Makefile: split up long OBJECTS line
- Makefile: guard against TEST_OBJS in the environment
Reorganize Makefile to allow building git.o and other essential
objects without extra stuff needed only for testing.
The last step is of dubious value, but otherwise looked OK.
cf. <YDVJZnmTiBYZ4iPM@coredump.intra.peff.net>
* ab/grep-pcre2-allocfix (2021-02-17) 10 commits
- grep/pcre2: move definitions of pcre2_{malloc,free}
- grep/pcre2: move back to thread-only PCREv2 structures
- grep/pcre2: actually make pcre2 use custom allocator
- grep/pcre2: use pcre2_maketables_free() function
- grep/pcre2: use compile-time PCREv2 version test
- grep/pcre2: add GREP_PCRE2_DEBUG_MALLOC debug mode
- grep/pcre2: prepare to add debugging to pcre2_malloc()
- grep/pcre2: correct reference to grep_init() in comment
- grep/pcre2: drop needless assignment to NULL
- grep/pcre2: drop needless assignment + assert() on opt->pcre2
Updates to memory allocation code around the use of pcre2 library.
Needs review.
cf. <20210218000728.13995-1-avarab@gmail.com>
* tb/reverse-midx (2021-02-24) 16 commits
- pack-revindex: write multi-pack reverse indexes
- pack-write.c: extract 'write_rev_file_order'
- pack-revindex: read multi-pack reverse indexes
- Documentation/technical: describe multi-pack reverse indexes
- midx: make some functions non-static
- midx: keep track of the checksum
- midx: don't free midx_name early
- midx: allow marking a pack as preferred
- t/helper/test-read-midx.c: add '--show-objects'
- builtin/multi-pack-index.c: display usage on unrecognized command
- builtin/multi-pack-index.c: don't enter bogus cmd_mode
- builtin/multi-pack-index.c: split sub-commands
- builtin/multi-pack-index.c: define common usage with a macro
- builtin/multi-pack-index.c: don't handle 'progress' separately
- builtin/multi-pack-index.c: inline 'flags' with options
- Merge branch 'ds/chunked-file-api' into tb/reverse-midx
An on-disk reverse-index to map the in-pack location of an object
back to its object name across multiple packfiles is introduced.
* ab/pickaxe-pcre2 (2021-02-18) 24 commits
- pickaxe -G: don't special-case create/delete
- pickaxe -G: terminate early on matching lines
- xdiff-interface: support early exit in xdiff_outf()
- xdiff-interface: allow early return from xdiff_emit_{line,hunk}_fn
- pickaxe -S: slightly optimize contains()
- pickaxe: rename variables in has_changes() for brevity
- pickaxe -S: support content with NULs under --pickaxe-regex
- pickaxe: assert that we must have a needle under -G or -S
- pickaxe: refactor function selection in diffcore-pickaxe()
- perf: add performance test for pickaxe
- pickaxe/style: consolidate declarations and assignments
- diff.h: move pickaxe fields together again
- pickaxe: die when --find-object and --pickaxe-all are combined
- pickaxe: die when -G and --pickaxe-regex are combined
- pickaxe tests: test for -G, -S and --find-object incompatibility
- pickaxe tests: add test for "log -S" not being a regex
- pickaxe tests: add test for diffgrep_consume() internals
- pickaxe tests: refactor to use test_commit --append --printf
- test-lib functions: add --printf option to test_commit
- test-lib-functions: reword "test_commit --append" docs
- test-lib-functions: document and test test_commit --no-tag
- grep/pcre2 tests: reword comments referring to kwset
- Merge branch 'jk/rev-list-disk-usage' into ab/pickaxe-pcre2
- Merge branch 'ab/test-lib' into ab/pickaxe-pcre2
Rewrite the backend for "diff -G/-S" to use pcre2 engine when
available.
Needs review.
cf. <20210216115801.4773-1-avarab@gmail.com>
* cm/rebase-i-fixup-amend-reword (2021-03-01) 6 commits
- doc/git-commit: add documentation for fixup=[amend|reword] options
- t3437: use --fixup with options to create amend! commit
- t7500: add tests for --fixup=[amend|reword] options
- commit: add a reword suboption to --fixup
- commit: add amend suboption to --fixup to create amend! commit
- sequencer: export subject_length()
(this branch uses cm/rebase-i and cm/rebase-i-updates.)
"git commit --fixup=<commit>", which was to tweak the changes made
to the contents while keeping the original log message intact,
learned "--fixup=(amend|reword):<commit>", that can be used to
tweak both the message and the contents, and only the message,
respectively.
Getting there.
cf. <20210301084512.27170-1-charvi077@gmail.com>
* jk/open-dotgitx-with-nofollow (2021-02-16) 6 commits
(merged to 'next' on 2021-02-25 at a784bf7be6)
+ mailmap: do not respect symlinks for in-tree .mailmap
+ exclude: do not respect symlinks for in-tree .gitignore
+ attr: do not respect symlinks for in-tree .gitattributes
+ exclude: add flags parameter to add_patterns()
+ attr: convert "macro_ok" into a flags field
+ add open_nofollow() helper
It does not make sense to make ".gitattributes", ".gitignore" and
".mailmap" symlinks, as they are supposed to be usable from the
object store (think: bare repositories where HEAD:.mailmap etc. are
used). When these files are symbolic links, we used to read the
contents of the files pointed by them by mistake, which has been
corrected.
Will cook in 'next'.
* rs/pretty-describe (2021-03-01) 4 commits
(merged to 'next' on 2021-03-01 at bee9248828)
+ pretty: document multiple %(describe) being inconsistent
+ t4205: assert %(describe) test coverage
(merged to 'next' on 2021-02-25 at 2347ed8fe6)
+ pretty: add merge and exclude options to %(describe)
+ pretty: add %(describe)
"git log --format='...'" learned "%(describe)" placeholder.
Will cook in 'next'.
* cm/rebase-i-updates (2021-02-10) 11 commits
(merged to 'next' on 2021-02-12 at e29227780b)
+ doc/rebase -i: fix typo in the documentation of 'fixup' command
+ t/t3437: fixup the test 'multiple fixup -c opens editor once'
+ t/t3437: use named commits in the tests
+ t/t3437: simplify and document the test helpers
+ t/t3437: check the author date of fixed up commit
+ t/t3437: remove the dependency of 'expected-message' file from tests
+ t/t3437: fixup here-docs in the 'setup' test
+ t/lib-rebase: update the documentation of FAKE_LINES
+ rebase -i: clarify and fix 'fixup -c' rebase-todo help
+ sequencer: rename a few functions
+ sequencer: fixup the datatype of the 'flag' argument
(this branch is used by cm/rebase-i-fixup-amend-reword; uses cm/rebase-i.)
Follow-up fixes to "cm/rebase-i" topic.
Will cook in 'next', together with "cm/rebase-i".
* jh/simple-ipc (2021-02-17) 12 commits
(merged to 'next' on 2021-03-01 at 6604451f18)
+ t0052: add simple-ipc tests and t/helper/test-simple-ipc tool
+ simple-ipc: add Unix domain socket implementation
+ unix-socket: create `unix_stream_server__listen_with_lock()`
+ unix-socket: disallow chdir() when creating unix domain sockets
+ unix-socket: add backlog size option to unix_stream_listen()
+ unix-socket: elimiate static unix_stream_socket() helper function
+ simple-ipc: add win32 implementation
+ simple-ipc: design documentation for new IPC mechanism
+ pkt-line: add options argument to read_packetized_to_strbuf()
+ pkt-line: (optionally) libify the packet readers
+ pkt-line: do not issue flush packets in write_packetized_*()
+ pkt-line: eliminate the need for static buffer in packet_write_gently()
A simple IPC interface gets introduced to build services like
fsmonitor on top.
Will cook in 'next'.
* cm/rebase-i (2021-01-29) 9 commits
(merged to 'next' on 2021-02-01 at 4f9aa6cec3)
+ doc/git-rebase: add documentation for fixup [-C|-c] options
+ rebase -i: teach --autosquash to work with amend!
+ t3437: test script for fixup [-C|-c] options in interactive rebase
+ rebase -i: add fixup [-C | -c] command
+ sequencer: use const variable for commit message comments
+ sequencer: pass todo_item to do_pick_commit()
+ rebase -i: comment out squash!/fixup! subjects from squash message
+ sequencer: factor out code to append squash message
+ rebase -i: only write fixup-message when it's needed
(this branch is used by cm/rebase-i-fixup-amend-reword and cm/rebase-i-updates.)
"rebase -i" is getting cleaned up and also enhanced.
Will cook in 'next', together with "cm/rebase-i-updates".
* tb/geometric-repack (2021-02-22) 8 commits
(merged to 'next' on 2021-02-25 at a854fdbaff)
+ builtin/repack.c: add '--geometric' option
+ packfile: add kept-pack cache for find_kept_pack_entry()
+ builtin/pack-objects.c: rewrite honor-pack-keep logic
+ p5303: measure time to repack with keep
+ p5303: add missing &&-chains
+ builtin/pack-objects.c: add '--stdin-packs' option
+ revision: learn '--no-kept-objects'
+ packfile: introduce 'find_kept_pack_entry()'
"git repack" so far has been only capable of repacking everything
under the sun into a single pack (or split by size). A cleverer
strategy to reduce the cost of repacking a repository has been
introduced.
Will cook in 'next'.
* es/config-hooks (2021-02-16) 17 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
(this branch uses es/config-hooks-part-1.)
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
--------------------------------------------------
[Discarded]
* cw/pack-vs-bigfilethreashold (2021-02-09) 2 commits
. fixup! doc: mention bigFileThreshold for packing
. doc: mention bigFileThreshold for packing
Doc update.
cw/pack-config-doc supersedes this with a bit more coverage on
related knobs.
^ permalink raw reply [relevance 5%]
* [ANNOUNCE] Git v2.31.0-rc1
@ 2021-03-03 10:14 4% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-03-03 10:14 UTC (permalink / raw)
To: git; +Cc: Linux Kernel, git-packagers
A release candidate Git v2.31.0-rc1 is now available for testing
at the usual places. It is comprised of 631 non-merge commits
since v2.30.0, contributed by 67 people, 21 of which are new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.31.0-rc1' tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.30.0 are as follows.
Welcome to the Git development community!
Andreas Bühmann, Andrew Klotz, Andrzej Hunt, Antonio Russo,
Arnaud Morin, Christian Walther, Clement Moyroud, Daniel Levin,
Daniel Troger, Harold Kim, Jacob Vosmaer, LeSeulArtichaut,
Mikhail Klyushin, Neeraj Singh, Sangeeta Jain, Seth House,
Shubham Verma, Utku Gultopu, Vasyl Vavrychuk, Vojtěch Knyttl,
and ZheNing Hu.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Abhishek Kumar, Adam Dinwoodie, Ævar Arnfjörð Bjarmason,
Alex Henrie, brian m. carlson, Christian Couder, Denton Liu,
Derrick Stolee, Elijah Newren, Eric Sunshine, Eric Wong,
Felipe Contreras, Han-Wen Nienhuys, Hariom Verma, Heba Waly,
Jeff Hostetler, Jeff King, Jiang Xin, Joey Salazar, Johannes
Schindelin, Johannes Sixt, Jonathan Tan, Junio C Hamano,
Kevin Daudt, Kevin Willford, Lars Schneider, Martin Ågren,
Martin von Zweigbergk, Matheus Tavares, Michael Haggerty,
Patrick Steinhardt, Paul Jolly, Peter Kaestle, Phil Hord,
Philippe Blain, Phillip Wood, Pranit Bauva, Pratyush Yadav,
Rafael Silva, René Scharfe, Ross Light, Sergey Organov, SZEDER
Gábor, Taylor Blau, Thomas Ackermann, and Torsten Bögershausen.
[*] We are counting not just the authorship contribution but
issue reporting, testing and reviewing that are recorded
in the commit trailers.
----------------------------------------------------------------
Git 2.31 Release Notes (draft)
==============================
Updates since v2.30
-------------------
Backward incompatible and other important changes
* The "pack-redundant" command, which has been left stale with almost
unusable performance issues, now warns loudly when it gets used, as
we no longer want to recommend its use (instead just "repack -d"
instead).
* The development community has adopted Contributor Covenant v2.0 to
update from v1.4 that we have been using.
* The support for deprecated PCRE1 library has been dropped.
UI, Workflows & Features
* The "--format=%(trailers)" mechanism gets enhanced to make it
easier to design output for machine consumption.
* When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.
* The configuration variable 'core.abbrev' can be set to 'no' to
force no abbreviation regardless of the hash algorithm.
* "git rev-parse" can be explicitly told to give output as absolute
or relative path with the `--path-format=(absolute|relative)` option.
* Bash completion (in contrib/) update to make it easier for
end-users to add completion for their custom "git" subcommands.
* "git maintenance" learned to drive scheduled maintenance on
platforms whose native scheduling methods are not 'cron'.
* After expiring a reflog and making a single commit, the reflog for
the branch would record a single entry that knows both @{0} and
@{1}, but we failed to answer "what commit were we on?", i.e. @{1}
* "git bundle" learns "--stdin" option to read its refs from the
standard input. Also, it now does not lose refs whey they point
at the same object.
* "git log" learned a new "--diff-merges=<how>" option.
* "git ls-files" can and does show multiple entries when the index is
unmerged, which is a source for confusion unless -s/-u option is in
use. A new option --deduplicate has been introduced.
* `git worktree list` now annotates worktrees as prunable, shows
locked and prunable attributes in --porcelain mode, and gained
a --verbose option.
* "git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
* There are other ways than ".." for a single token to denote a
"commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
range-diff" did not understand them.
* The "git range-diff" command learned "--(left|right)-only" option
to show only one side of the compared range.
* "git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
* The .mailmap is documented to be read only from the root level of a
working tree, but a stray file in a bare repository also was read
by accident, which has been corrected.
* "git maintenance" tool learned a new "pack-refs" maintenance task.
* The error message given when a configuration variable that is
expected to have a boolean value has been improved.
* Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
* "git rev-list" command learned "--disk-usage" option.
* "git {diff,log} --{skip,rotate}-to=<path>" allows the user to
discard diff output for early paths or move them to the end of the
output.
* "git difftool" learned "--skip-to=<path>" option to restart an
interrupted session from an arbitrary path.
* "git grep" has been tweaked to be limited to the sparse checkout
paths.
* "git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.
Performance, Internal Implementation, Development Support etc.
* A 3-year old test that was not testing anything useful has been
corrected.
* Retire more names with "sha1" in it.
* The topological walk codepath is covered by new trace2 stats.
* Update the Code-of-conduct to version 2.0 from the upstream (we've
been using version 1.4).
* "git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
* Two new ways to feed configuration variable-value pairs via
environment variables have been introduced, and the way
GIT_CONFIG_PARAMETERS encodes variable/value pairs has been tweaked
to make it more robust.
* Tests have been updated so that they do not to get affected by the
name of the default branch "git init" creates.
* "git fetch" learns to treat ref updates atomically in all-or-none
fashion, just like "git push" does, with the new "--atomic" option.
* The peel_ref() API has been replaced with peel_iterated_oid().
* The .use_shell flag in struct child_process that is passed to
run_command() API has been clarified with a bit more documentation.
* Document, clean-up and optimize the code around the cache-tree
extension in the index.
* The ls-refs protocol operation has been optimized to narrow the
sub-hierarchy of refs/ it walks to produce response.
* When removing many branches and tags, the code used to do so one
ref at a time. There is another API it can use to delete multiple
refs, and it makes quite a lot of performance difference when the
refs are packed.
* The "pack-objects" command needs to iterate over all the tags when
automatic tag following is enabled, but it actually iterated over
all refs and then discarded everything outside "refs/tags/"
hierarchy, which was quite wasteful.
* A perf script was made more portable.
* Our setting of GitHub CI test jobs were a bit too eager to give up
once there is even one failure found. Tweak the knob to allow
other jobs keep running even when we see a failure, so that we can
find more failures in a single run.
* We've carried compatibility codepaths for compilers without
variadic macros for quite some time, but the world may be ready for
them to be removed. Force compilation failure on exotic platforms
where variadic macros are not available to find out who screams in
such a way that we can easily revert if it turns out that the world
is not yet ready.
* Code clean-up to ensure our use of hashtables using object names as
keys use the "struct object_id" objects, not the raw hash values.
* Lose the debugging aid that may have been useful in the past, but
no longer is, in the "grep" codepaths.
* Some pretty-format specifiers do not need the data in commit object
(e.g. "%H"), but we were over-eager to load and parse it, which has
been made even lazier.
* Get rid of "GETTEXT_POISON" support altogether, which may or may
not be controversial.
* Introduce an on-disk file to record revindex for packdata, which
traditionally was always created on the fly and only in-core.
* The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
* Piecemeal of rewrite of "git bisect" in C continues.
* When a pager spawned by us exited, the trace log did not record its
exit status correctly, which has been corrected.
* Removal of GIT_TEST_GETTEXT_POISON continues.
* The code to implement "git merge-base --independent" was poorly
done and was kept from the very beginning of the feature.
* Preliminary changes to fsmonitor integration.
* Performance optimization work on the rename detection continues.
* The common code to deal with "chunked file format" that is shared
by the multi-pack-index and commit-graph files have been factored
out, to help codepaths for both filetypes to become more robust.
* The approach to "fsck" the incoming objects in "index-pack" is
attractive for performance reasons (we have them already in core,
inflated and ready to be inspected), but fundamentally cannot be
applied fully when we receive more than one pack stream, as a tree
object in one pack may refer to a blob object in another pack as
".gitmodules", when we want to inspect blobs that are used as
".gitmodules" file, for example. Teach "index-pack" to emit
objects that must be inspected later and check them in the calling
"fetch-pack" process.
* The logic to handle "trailer" related placeholders in the
"--format=" mechanisms in the "log" family and "for-each-ref"
family is getting unified.
* Raise the buffer size used when writing the index file out from
(obviously too small) 8kB to (clearly sufficiently large) 128kB.
Fixes since v2.30
-----------------
* Diagnose command line error of "git rebase" early.
* Clean up option descriptions in "git cmd --help".
* "git stash" did not work well in a sparsely checked out working
tree.
* Some tests expect that "ls -l" output has either '-' or 'x' for
group executable bit, but setgid bit can be inherited from parent
directory and make these fields 'S' or 's' instead, causing test
failures.
* "git for-each-repo --config=<var> <cmd>" should not run <cmd> for
any repository when the configuration variable <var> is not defined
even once.
* Fix 2.29 regression where "git mergetool --tool-help" fails to list
all the available tools.
* Fix for procedure to building CI test environment for mac.
* The implementation of "git branch --sort" wrt the detached HEAD
display has always been hacky, which has been cleaned up.
* Newline characters in the host and path part of git:// URL are
now forbidden.
* "git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
* When more than one commit with the same patch ID appears on one
side, "git log --cherry-pick A...B" did not exclude them all when a
commit with the same patch ID appears on the other side. Now it
does.
* Documentation for "git fsck" lost stale bits that has become
incorrect.
* Doc fix for packfile URI feature.
* When "git rebase -i" processes "fixup" insn, there is no reason to
clean up the commit log message, but we did the usual stripspace
processing. This has been corrected.
(merge f7d42ceec5 js/rebase-i-commit-cleanup-fix later to maint).
* Fix in passing custom args from "git clone" to "upload-pack" on the
other side.
(merge ad6b5fefbd jv/upload-pack-filter-spec-quotefix later to maint).
* The command line completion (in contrib/) completed "git branch -d"
with branch names, but "git branch -D" offered tagnames in addition,
which has been corrected. "git branch -M" had the same problem.
(merge 27dc071b9a jk/complete-branch-force-delete later to maint).
* When commands are started from a subdirectory, they may have to
compare the path to the subdirectory (called prefix and found out
from $(pwd)) with the tracked paths. On macOS, $(pwd) and
readdir() yield decomposed path, while the tracked paths are
usually normalized to the precomposed form, causing mismatch. This
has been fixed by taking the same approach used to normalize the
command line arguments.
(merge 5c327502db tb/precompose-prefix-too later to maint).
* Even though invocations of "die()" were logged to the trace2
system, "BUG()"s were not, which has been corrected.
(merge 0a9dde4a04 jt/trace2-BUG later to maint).
* "git grep --untracked" is meant to be "let's ALSO find in these
files on the filesystem" when looking for matches in the working
tree files, and does not make any sense if the primary search is
done against the index, or the tree objects. The "--cached" and
"--untracked" options have been marked as mutually incompatible.
(merge 0c5d83b248 mt/grep-cached-untracked later to maint).
* Fix "git fsck --name-objects" which apparently has not been used by
anybody who is motivated enough to report breakage.
(merge e89f89361c js/fsck-name-objects-fix later to maint).
* Avoid individual tests in t5411 from getting affected by each other
by forcing them to use separate output files during the test.
(merge 822ee894f6 jx/t5411-unique-filenames later to maint).
* Test to make sure "git rev-parse one-thing one-thing" gives
the same thing twice (when one-thing is --since=X).
(merge a5cdca4520 ew/rev-parse-since-test later to maint).
* When certain features (e.g. grafts) used in the repository are
incompatible with the use of the commit-graph, we used to silently
turned commit-graph off; we now tell the user what we are doing.
(merge c85eec7fc3 js/commit-graph-warning later to maint).
* Objects that lost references can be pruned away, even when they
have notes attached to it (and these notes will become dangling,
which in turn can be pruned with "git notes prune"). This has been
clarified in the documentation.
(merge fa9ab027ba mz/doc-notes-are-not-anchors later to maint).
* The error codepath around the "--temp/--prefix" feature of "git
checkout-index" has been improved.
(merge 3f7ba60350 mt/checkout-index-corner-cases later to maint).
* The "git maintenance register" command had trouble registering bare
repositories, which had been corrected.
* A handful of multi-word configuration variable names in
documentation that are spelled in all lowercase have been corrected
to use the more canonical camelCase.
(merge 7dd0eaa39c dl/doc-config-camelcase later to maint).
* "git push $there --delete ''" should have been diagnosed as an
error, but instead turned into a matching push, which has been
corrected.
(merge 20e416409f jc/push-delete-nothing later to maint).
* Test script modernization.
(merge 488acf15df sv/t7001-modernize later to maint).
* An under-allocation for the untracked cache data has been corrected.
(merge 6347d649bc jh/untracked-cache-fix later to maint).
* Other code cleanup, docfix, build fix, etc.
(merge e3f5da7e60 sg/t7800-difftool-robustify later to maint).
(merge 9d336655ba js/doc-proto-v2-response-end later to maint).
(merge 1b5b8cf072 jc/maint-column-doc-typofix later to maint).
(merge 3a837b58e3 cw/pack-config-doc later to maint).
(merge 01168a9d89 ug/doc-commit-approxidate later to maint).
(merge b865734760 js/params-vs-args later to maint).
----------------------------------------------------------------
Changes since v2.30.0 are as follows:
Abhishek Kumar (11):
commit-graph: fix regression when computing Bloom filters
revision: parse parent in indegree_walk_step()
commit-graph: consolidate fill_commit_graph_info
t6600-test-reach: generalize *_three_modes
commit-graph: add a slab to store topological levels
commit-graph: return 64-bit generation number
commit-graph: implement corrected commit date
commit-graph: implement generation data chunk
commit-graph: use generation v2 only if entire chain does
commit-reach: use corrected commit dates in paint_down_to_common()
doc: add corrected commit date info
Adam Dinwoodie (1):
t4129: fix setfacl-related permissions failure
Alex Henrie (1):
rebase: add a config option for --no-fork-point
Andrew Klotz (1):
config: improve error message for boolean config
Andrzej Hunt (1):
commit-graph: avoid leaking topo_levels slab in write_commit_graph()
Antonio Russo (1):
t6016: move to lib-log-graph.sh framework
Christian Couder (3):
fetch-pack: rename helper to create_promisor_file()
fetch-pack: refactor writing promisor file
pack-write: die on error in write_promisor_file()
Christian Walther (1):
doc: mention bigFileThreshold for packing
Daniel Levin (1):
git-p4: fix syncing file types with pattern
Denton Liu (12):
refs: factor out set_read_ref_cutoffs()
refs: allow @{n} to work with n-sized reflog
test-lib-functions.sh: fix usage for test_commit()
t4203: stop losing return codes of git commands
git-stash.txt: be explicit about subcommand options
t3905: remove spaces after redirect operators
t3905: move all commands into test cases
t3905: remove nested git in command substitution
t3905: replace test -s with test_file_not_empty
t3905: use test_cmp() to check file contents
stash: declare ref_stash as an array
i18n.txt: camel case and monospace "i18n.commitEncoding"
Derrick Stolee (65):
maintenance: extract platform-specific scheduling
maintenance: include 'cron' details in docs
pack-bitmap-write: fill bitmap with commit history
bitmap: implement bitmap_is_subset()
commit: implement commit_list_contains()
t5310: add branch-based checks
pack-bitmap-write: rename children to reverse_edges
pack-bitmap-write: build fewer intermediate bitmaps
pack-bitmap-write: use existing bitmaps
pack-bitmap-write: relax unique revwalk condition
pack-bitmap-write: better reuse bitmaps
revision: trace topo-walk statistics
tree-walk: report recursion counts
unpack-trees: add trace2 regions
cache-tree: use trace2 in cache_tree_update()
maintenance: use launchctl on macOS
maintenance: use Windows scheduled tasks
for-each-repo: do nothing on empty config
cache-tree: trace regions for I/O
cache-tree: trace regions for prime_cache_tree
index-format: use 'cache tree' over 'cached tree'
index-format: update preamble to cache tree extension
index-format: discuss recursion of cache-tree better
cache-tree: speed up consecutive path comparisons
maintenance: set log.excludeDecoration durin prefetch
t7900: clean up some broken refs
cache-tree: clean up cache_tree_update()
cache-tree: simplify verify_cache() prototype
cache-tree: extract subtree_pos()
fsmonitor: de-duplicate BUG()s around dirty bits
repository: add repo reference to index_state
name-hash: use trace2 regions for init
sparse-checkout: load sparse-checkout patterns
test-lib: test_region looks for trace2 regions
t1092: test interesting sparse-checkout scenarios
commit-reach: reduce requirements for remove_redundant()
commit-graph: use repo_parse_commit
commit-graph: always parse before commit_graph_data_at()
commit-graph: validate layers for generation data
commit-graph: compute generations separately
commit-graph: be extra careful about mixed generations
commit-graph: prepare commit graph
commit-graph: anonymize data in chunk_write_fn
maintenance: add pack-refs task
maintenance: incremental strategy runs pack-refs weekly
chunk-format: create chunk format write API
commit-graph: use chunk-format write API
midx: rename pack_info to write_midx_context
midx: use context in write_midx_pack_names()
midx: add entries to write_midx_context
midx: add pack_perm to write_midx_context
midx: add num_large_offsets to write_midx_context
midx: return success/failure in chunk write methods
midx: drop chunk progress during write
midx: use chunk-format API in write_midx_internal()
chunk-format: create read chunk API
commit-graph: use chunk-format read API
midx: use chunk-format read API
midx: use 64-bit multiplication for chunk sizes
chunk-format: restore duplicate chunk checks
chunk-format: add technical docs
commit-reach: use one walk in remove_redundant()
commit-reach: move compare_commits_by_gen
commit-reach: use heuristic in remove_redundant()
commit-reach: stale commits may prune generation further
Elijah Newren (92):
t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
stash: remove unnecessary process forking
stash: fix stash application in sparse-checkouts
merge-ort: setup basic internal data structures
merge-ort: add some high-level algorithm structure
merge-ort: port merge_start() from merge-recursive
merge-ort: use histogram diff
merge-ort: add an err() function similar to one from merge-recursive
merge-ort: implement a very basic collect_merge_info()
merge-ort: avoid repeating fill_tree_descriptor() on the same tree
merge-ort: compute a few more useful fields for collect_merge_info
merge-ort: record stage and auxiliary info for every path
merge-ort: avoid recursing into identical trees
merge-ort: add a preliminary simple process_entries() implementation
merge-ort: have process_entries operate in a defined order
merge-ort: step 1 of tree writing -- record basenames, modes, and oids
merge-ort: step 2 of tree writing -- function to create tree object
merge-ort: step 3 of tree writing -- handling subdirectories as we go
merge-ort: basic outline for merge_switch_to_result()
merge-ort: add implementation of checkout()
tree: enable cmp_cache_name_compare() to be used elsewhere
merge-ort: add implementation of record_conflicted_index_entries()
merge-ort: free data structures in merge_finalize()
merge-ort: add a few includes
merge-ort: add a clear_internal_opts helper
merge-ort: add a path_conflict field to merge_options_internal
merge-ort: add a paths_to_free field to merge_options_internal
merge-ort: add function grouping comments
merge-ort: add die-not-implemented stub handle_content_merge() function
merge-ort: add modify/delete handling and delayed output processing
merge-ort: add basic data structures for handling renames
merge-ort: add initial outline for basic rename detection
merge-ort: implement detect_regular_renames()
merge-ort: implement compare_pairs() and collect_renames()
merge-ort: add basic outline for process_renames()
diffcore-rename: rename num_create to num_destinations
diffcore-rename: avoid usage of global in too_many_rename_candidates()
diffcore-rename: simplify limit check
diffcore-rename: reduce jumpiness in progress counters
t4058: add more tests and documentation for duplicate tree entry handling
t4058: explore duplicate tree entry handling in a bit more detail
diffcore-rename: simplify and accelerate register_rename_src()
diffcore-rename: accelerate rename_dst setup
merge-ort: add implementation of both sides renaming identically
merge-ort: add implementation of both sides renaming differently
merge-ort: add implementation of rename/delete conflicts
merge-ort: add implementation of rename collisions
merge-ort: add implementation of normal rename handling
merge-ort: add implementation of type-changed rename handling
commit: move reverse_commit_list() from merge-recursive
merge-ort: copy a few small helper functions from merge-recursive.c
merge-ort: make clear_internal_opts() aware of partial clearing
merge-ort: implement merge_incore_recursive()
merge-ort: handle D/F conflict where directory disappears due to merge
merge-ort: handle directory/file conflicts that remain
merge-ort: implement unique_path() helper
merge-ort: handle book-keeping around two- and three-way content merge
merge-ort: flesh out implementation of handle_content_merge()
merge-ort: copy and adapt merge_3way() from merge-recursive.c
merge-ort: copy and adapt merge_submodule() from merge-recursive.c
merge-ort: implement format_commit()
merge-ort: copy find_first_merges() implementation from merge-recursive.c
merge-ort: add handling for different types of files at same path
diffcore-rename: remove unnecessary duplicate entry checks
merge-ort: add new data structures for directory rename detection
merge-ort: initialize and free new directory rename data structures
merge-ort: collect which directories are removed in dirs_removed
merge-ort: add outline for computing directory renames
merge-ort: add outline of get_provisional_directory_renames()
merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
merge-ort: implement compute_rename_counts()
merge-ort: implement handle_directory_level_conflicts()
merge-ort: modify collect_renames() for directory rename handling
merge-ort: implement compute_collisions()
merge-ort: implement apply_dir_rename() and check_dir_renamed()
merge-ort: implement check_for_directory_rename()
merge-ort: implement handle_path_level_conflicts()
merge-ort: add a new toplevel_dir field
merge-ort: implement apply_directory_rename_modifications()
merge-ort: process_renames() now needs more defensiveness
merge-ort: fix a directory rename detection bug
merge-ort: fix massive leak
merge-ort: ignore the directory rename split conflict for now
merge-ort: begin performance work; instrument with trace2_region_* calls
diffcore-rename: no point trying to find a match better than exact
diffcore-rename: filter rename_src list when possible
t4001: add a test comparing basename similarity and content similarity
diffcore-rename: compute basenames of source and dest candidates
diffcore-rename: complete find_basename_matches()
diffcore-rename: guide inexact rename detection based on basenames
gitdiffcore doc: mention new preliminary step for rename detection
merge-ort: call diffcore_rename() directly
Eric Sunshine (3):
worktree: teach `repair` to fix multi-directional breakage
t/perf: avoid unnecessary test_export() recursion
maintenance: fix incorrect `maintenance.repo` path with bare repository
Eric Wong (2):
core.abbrev=no disables abbreviations
t1500: ensure current --since= behavior remains
Felipe Contreras (8):
pull: refactor fast-forward check
pull: give the advice for choosing rebase/merge much later
pull: display default warning only when non-ff
test: bisect-porcelain: fix location of files
completion: bash: add __git_have_func helper
completion: bash: improve function detection
test: completion: add tests for __git_complete
completion: add proper public __git_complete
Han-Wen Nienhuys (1):
doc/reftable: document how to handle windows
Hariom Verma (4):
t6300: use function to test trailer options
pretty.c: refactor trailer logic to `format_set_trailers_options()`
pretty.c: capture invalid trailer argument
ref-filter: use pretty.c logic for trailers
Jacob Vosmaer (4):
builtin/pack-objects.c: avoid iterating all refs
ls-refs.c: initialize 'prefixes' before using it
upload-pack.c: fix filter spec quoting bug
t5544: clarify 'hook works with partial clone' test
Jeff Hostetler (11):
p7519: do not rely on "xargs -d" in test
p7519: fix watchman watch-list test on Windows
p7519: move watchman cleanup earlier in the test
p7519: add trace logging during perf test
preload-index: log the number of lstat calls to trace2
read-cache: log the number of lstat calls to trace2
read-cache: log the number of scanned files to trace2
fsmonitor: log invocation of FSMonitor hook to trace2
fsmonitor: log FSMN token when reading and writing the index
fsmonitor: refactor initialization of fsmonitor_last_update token
dir: fix malloc of root untracked_cache_dir
Jeff King (43):
pack-bitmap: fix header size check
pack-bitmap: bounds-check size of cache extension
t5310: drop size of truncated ewah bitmap
rev-list: die when --test-bitmap detects a mismatch
ewah: factor out bitmap growth
ewah: make bitmap growth less aggressive
ewah: implement bitmap_or()
ewah: add bitmap_dup() function
pack-bitmap-write: reimplement bitmap writing
pack-bitmap-write: pass ownership of intermediate bitmaps
pack-bitmap-write: ignore BITMAP_FLAG_REUSE
git_connect_git(): forbid newlines in host and path
fsck: reject .gitmodules git:// urls with newlines
t5516: loosen "not our ref" error check
patch-ids: handle duplicate hashmap entries
quote: make sq_dequote_step() a public function
for_each_object_in_pack(): clarify pack vs index ordering
config: parse more robust format in GIT_CONFIG_PARAMETERS
refs: switch peel_ref() to peel_iterated_oid()
run-command: document use_shell option
git-svn tests: rewrite brittle tests to use "--[no-]merges".
git-compat-util: always enable variadic macros
commit_graft_pos(): take an oid instead of a bare hash
rerere: check dirname format while iterating rr_cache directory
rerere: tighten rr-cache dirname check
rerere: use strmap to store rerere directories
hash_pos(): convert to oid_pos()
oid_pos(): access table through const pointers
t0000: keep clean-up tests together
t0000: run prereq tests inside sub-test
t0000: run cleaning test inside sub-test
t0000: consistently use single quotes for outer tests
pretty: lazy-load commit data when expanding user-format
p5303: avoid sed GNU-ism
completion: treat "branch -D" the same way as "branch -d"
completion: handle other variants of "branch -m"
doc/git-branch: fix awkward wording for "-c"
t: add --no-tag option to test_commit
mailmap: only look for .mailmap in work tree
rev-list: add --disk-usage option for calculating disk usage
docs/rev-list: add an examples section
docs/rev-list: add some examples of --disk-usage
doc: mention approxidates for git-commit --date
Jiang Xin (5):
test: add helper functions for git-bundle
bundle: lost objects when removing duplicate pendings
bundle: arguments can be read from stdin
t5411: use different out file to prevent overwriting
t5411: refactor check of refs using test_cmp_refs
Joey Salazar (1):
doc: fix naming of response-end-pkt
Johannes Schindelin (43):
tests: mark tests relying on the current default for `init.defaultBranch`
t0060: preemptively adjust alignment
t[01]*: adjust the references to the default branch name "main"
t2*: adjust the references to the default branch name "main"
t3[0-3]*: adjust the references to the default branch name "main"
t3416: preemptively adjust alignment in a comment
t34*: adjust the references to the default branch name "main"
t3[5-9]*: adjust the references to the default branch name "main"
t4*: adjust the references to the default branch name "main"
t5323: prepare centered comment for `master` -> `main`
t5[0-4]*: adjust the references to the default branch name "main"
t5503: prepare aligned comment for replacing `master` with `main`
t550*: adjust the references to the default branch name "main"
t551*: adjust the references to the default branch name "main"
t55[23]*: adjust the references to the default branch name "main"
t55[4-9]*: adjust the references to the default branch name "main"
t5[6-9]*: adjust the references to the default branch name "main"
t6[0-3]*: adjust the references to the default branch name "main"
t64*: preemptively adjust alignment to prepare for `master` -> `main`
t6[4-9]*: adjust the references to the default branch name "main"
t7[0-4]*: adjust the references to the default branch name "main"
t7[5-9]*: adjust the references to the default branch name "main"
t8*: adjust the references to the default branch name "main"
t9[0-4]*: adjust the references to the default branch name "main"
t9[5-7]*: adjust the references to the default branch name "main"
tests(git-p4): transition to the default branch name `main`
t99*: adjust the references to the default branch name "main"
tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
SKIP_DASHED_BUILT_INS: respect `config.mak`
range-diff/format-patch: refactor check for commit range
rebase -i: do leave commit message intact in fixup! chains
range-diff: avoid leaking memory in two error code paths
range-diff: libify the read_patches() function again
range-diff: simplify code spawning `git log`
range-diff: combine all options in a single data structure
range-diff: move the diffopt initialization down one layer
range-diff: offer --left-only/--right-only options
range-diff/format-patch: handle commit ranges other than A..B
range-diff(docs): explain how to specify commit ranges
t1450: robustify `remove_object()`
fsck --name-objects: be more careful parsing generation numbers
reflog expire --stale-fix: be generous about missing objects
commit-graph: when incompatible with graphs, indicate why
Johannes Sixt (2):
annotate-tests: quote variable expansions containing path names
replace "parameters" by "arguments" in error messages
Jonathan Tan (9):
Doc: clarify contents of packfile sent as URI
ls-refs: report unborn targets of symrefs
connect, transport: encapsulate arg in struct
clone: respect remote unborn HEAD
usage: trace2 BUG() invocations
http: allow custom index-pack args
http-fetch: allow custom index-pack args
fetch-pack: with packfile URIs, use index-pack arg
fetch-pack: print and use dangling .gitmodules
Junio C Hamano (29):
pack-redundant: gauge the usage before proposing its removal
pull: get rid of unnecessary global variable
pull: correct condition to trigger non-ff advice
CoC: explicitly take any whitespace breakage
parse-options: format argh like error messages
The first batch in 2.31 cycle
SubmittingPatches: tighten wording on "sign-off" procedure
ci/install-depends: attempt to fix "brew cask" stuff
t4203: make blame output massaging more robust
The second batch
The third batch
The fourth batch
The fifth batch
Prepare for 2.30.1
The sixth batch
Git 2.30.1
The seventh batch
The eighth batch
diff: --{rotate,skip}-to=<path>
The ninth batch
Documentation: typofix --column description
The tenth batch
push: do not turn --delete '' into a matching push
blame-options.txt: camelcase blame.blankBoundary
index-format doc: camelCase core.excludesFile
Git 2.31-rc0
Revert "commit-graph: when incompatible with graphs, indicate why"
Hopefully the last batch before -rc1
Git 2.31-rc1
Kevin Willford (1):
fsmonitor: allow all entries for a folder to be invalidated
Martin von Zweigbergk (1):
docs: clarify that refs/notes/ do not keep the attached objects alive
Martin Ågren (16):
t1300: remove duplicate test for `--file ../foo`
t1300: remove duplicate test for `--file no-such-file`
t1300: don't needlessly work with `core.foo` configs
pack-format.txt: document sizes at start of delta data
object-name.c: rename from sha1-name.c
object-file.c: rename from sha1-file.c
sha1-lookup: rename `sha1_pos()` as `hash_pos()`
hash-lookup: rename from sha1-lookup
builtin/gc: don't peek into `struct lock_file`
commit-graph: don't peek into `struct lock_file`
midx: don't peek into `struct lock_file`
refs/files-backend: don't peek into `struct lock_file`
read-cache: try not to peek into `struct {lock_,temp}file`
rev-list-options.txt: fix rendering of bonus paragraph
git.txt: fix monospace rendering
gitmailmap.txt: fix rendering of e-mail addresses
Matheus Tavares (8):
t4129: don't fail if setgid is set in the test directory
grep: error out if --untracked is used with --cached
grep: honor sparse-checkout on working tree searches
write_entry(): fix misuses of `path` in error messages
checkout-index: omit entries with no tempname from --temp output
add --chmod: don't update index when --dry-run is used
add: mark --chmod error string for translation
add: propagate --chmod errors to exit status
Mikhail Klyushin (1):
git-gui: fix typo in russian locale
Neeraj Singh (1):
read-cache: make the index write buffer size 128K
Patrick Steinhardt (11):
git: add `--super-prefix` to usage string
config: add new way to pass config via `--config-env`
config: extract function to parse config pairs
fetch: extract writing to FETCH_HEAD
fetch: use strbuf to format FETCH_HEAD updates
fetch: refactor `s_update_ref` to use common exit path
fetch: allow passing a transaction to `s_update_ref()`
fetch: implement support for atomic reference updates
config: store "git -c" variables using more robust format
environment: make `getenv_safe()` a public function
config: allow specifying config entries via envvar pairs
Peter Kaestle (1):
submodules: fix of regression on fetching of non-init subsub-repo
Phil Hord (1):
use delete_refs when deleting tags or branches
Philippe Blain (4):
gitmodules.txt: fix 'GIT_WORK_TREE' variable name
mergetool--lib: fix '--tool-help' to correctly show available tools
mailmap doc: use correct environment variable 'GIT_WORK_TREE'
ci: do not cancel all jobs of a matrix if one fails
Pranit Bauva (7):
bisect--helper: reimplement `bisect_log` shell function in C
bisect--helper: reimplement `bisect_replay` shell function in C
bisect--helper: retire `--bisect-write` subcommand
bisect--helper: use `res` instead of return in BISECT_RESET case option
bisect--helper: retire `--bisect-auto-next` subcommand
bisect--helper: reimplement `bisect_skip` shell function in C
bisect--helper: retire `--check-and-set-terms` subcommand
Pratyush Yadav (1):
git-gui: remove lines starting with the comment character
Rafael Silva (8):
worktree: libify should_prune_worktree()
worktree: teach worktree to lazy-load "prunable" reason
worktree: teach worktree_lock_reason() to gently handle main worktree
t2402: ensure locked worktree is properly cleaned up
worktree: teach `list --porcelain` to annotate locked worktree
worktree: teach `list` to annotate prunable worktree
worktree: teach `list` verbose mode
blame: remove unnecessary use of get_commit_info()
René Scharfe (2):
rebase: verify commit parameter
cache-tree: use ce_namelen() instead of strlen()
SZEDER Gábor (2):
t7800-difftool: don't accidentally match tmp dirs
test-lib: prevent '--stress-jobs=X' from being ignored
Sangeeta Jain (1):
diff: do not show submodule with untracked files as "-dirty"
Sergey Organov (32):
revision: factor out parsing of diff-merge related options
revision: factor out setup of diff-merge related settings
revision: factor out initialization of diff-merge related settings
revision: provide implementation for diff merges tweaks
revision: move diff merges functions to its own diff-merges.c
diff-merges: rename all functions to have common prefix
diff-merges: move checks for first_parent_only out of the module
diff-merges: rename diff_merges_default_to_enable() to match semantics
diff-merges: re-arrange functions to match the order they are called in
diff-merges: new function diff_merges_suppress()
diff-merges: new function diff_merges_set_dense_combined_if_unset()
diff-merges: introduce revs->first_parent_merges flag
diff-merges: handle imply -p on -c/--cc logic for log.c
diff-merges: revise revs->diff flag handling
t4013: support test_expect_failure through ':failure' magic
t4013: add tests for -m failing to override -c/--cc
diff-merges: fix -m to properly override -c/--cc
diff-merges: split 'ignore_merges' field
diff-merges: group diff-merge flags next to each other inside 'rev_info'
diff-merges: get rid of now empty diff_merges_init_revs()
diff-merges: refactor opt settings into separate functions
diff-merges: make -m/-c/--cc explicitly mutually exclusive
diff-merges: implement new values for --diff-merges
diff-merges: do not imply -p for new options
diff-merges: let new options enable diff without -p
diff-merges: add old mnemonic counterparts to --diff-merges
diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
doc/git-log: describe new --diff-merges options
doc/diff-generate-patch: mention new --diff-merges option
doc/rev-list-options: document --first-parent changes merges format
doc/git-show: include --diff-merges description
t4013: add tests for --diff-merges=first-parent
Seth House (4):
mergetool: add hideResolved configuration
mergetool: break setup_tool out into separate initialization function
mergetool: add per-tool support and overrides for the hideResolved flag
mergetools/vimdiff: add vimdiff1 merge tool variant
Shubham Verma (10):
t7001: modernize test formatting
t7001: indent with TABs instead of spaces
t7001: remove unnecessary blank lines
t7001: modernize subshell formatting
t7001: remove whitespace after redirect operators
t7001: avoid using `cd` outside of subshells
t7001: use '>' rather than 'touch'
t7001: put each command on a separate line
t7001: use here-docs instead of echo
t7001: use `test` rather than `[`
Taylor Blau (40):
ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
pack-bitmap.c: check reads more aggressively when loading
pack-bitmap: factor out 'bitmap_for_commit()'
pack-bitmap: factor out 'add_commit_to_bitmap()'
p7519: allow running without watchman prereq
Documentation/git-clone.txt: document race with --local
pack-revindex: introduce a new API
write_reuse_object(): convert to new revindex API
write_reused_pack_one(): convert to new revindex API
write_reused_pack_verbatim(): convert to new revindex API
check_object(): convert to new revindex API
bitmap_position_packfile(): convert to new revindex API
show_objects_for_type(): convert to new revindex API
get_size_by_pos(): convert to new revindex API
try_partial_reuse(): convert to new revindex API
rebuild_existing_bitmaps(): convert to new revindex API
get_delta_base_oid(): convert to new revindex API
retry_bad_packed_offset(): convert to new revindex API
packed_object_info(): convert to new revindex API
unpack_entry(): convert to new revindex API
for_each_object_in_pack(): convert to new revindex API
builtin/gc.c: guess the size of the revindex
pack-revindex: remove unused 'find_pack_revindex()'
pack-revindex: remove unused 'find_revindex_position()'
pack-revindex: hide the definition of 'revindex_entry'
pack-revindex.c: avoid direct revindex access in 'offset_to_pack_pos()'
refs: expose 'for_each_fullref_in_prefixes'
ls-refs.c: traverse prefixes of disjoint "ref-prefix" sets
packfile: prepare for the existence of '*.rev' files
pack-write.c: prepare to write 'pack-*.rev' files
builtin/index-pack.c: allow stripping arbitrary extensions
builtin/index-pack.c: write reverse indexes
builtin/pack-objects.c: respect 'pack.writeReverseIndex'
Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'
t: prepare for GIT_TEST_WRITE_REV_INDEX
t: support GIT_TEST_WRITE_REV_INDEX
pack-revindex: ensure that on-disk reverse indexes are given precedence
t5325: check both on-disk and in-memory reverse index
.github/workflows/main.yml: run static-analysis on bionic
commit-graph.c: display correct number of chunks when writing
Thomas Ackermann (7):
doc: fix some typos
doc hash-function-transition: fix asciidoc output
doc hash-function-transition: use SHA-1 and SHA-256 consistently
doc hash-function-transition: use upper case consistently
doc hash-function-transition: fix incomplete sentence
doc hash-function-transition: move rationale upwards
doc: use https links
Torsten Bögershausen (1):
MacOS: precompose_argv_prefix()
Utku Gultopu (1):
doc: remove "directory cache" from man pages
Vasyl Vavrychuk (1):
git-send-email.txt: mention less secure app access with Gmail
ZheNing Hu (5):
builtin/*: update usage format
ls_files.c: bugfix for --deleted and --modified
ls_files.c: consolidate two for loops into one
ls-files.c: add --deduplicate option
difftool.c: learn a new way start at specified file
brian m. carlson (9):
abspath: add a function to resolve paths with missing components
rev-parse: add option for absolute or relative path formatting
docs: rephrase and clarify the git status --short format
ref-filter: switch some uses of unsigned long to size_t
commit: ignore additional signatures when parsing signed commits
gpg-interface: improve interface for parsing tags
commit: allow parsing arbitrary buffers with headers
ref-filter: hoist signature parsing
gpg-interface: remove other signature headers before verifying
Ævar Arnfjörð Bjarmason (100):
pretty format %(trailers) test: split a long line
pretty format %(trailers) doc: avoid repetition
pretty-format %(trailers): fix broken standalone "valueonly"
pretty format %(trailers): add a "keyonly"
pretty format %(trailers): add a "key_value_separator"
mktag doc: say <hash> not <sha1>
mktag doc: grammar fix, when exists -> when it exists
CoC: Update word-wrapping to match upstream
mktag doc: update to explain why to use this
mktag tests: don't needlessly use a subshell
mktag tests: use "test_commit" helper
mktag tests: remove needless SHA-1 hardcoding
mktag tests: don't redirect stderr to a file needlessly
mktag tests: don't create "mytag" twice
mktag tests: run "fsck" after creating "mytag"
mktag tests: stress test whitespace handling
mktag tests: test "hash-object" compatibility
mktag tests: improve verify_object() test coverage
mktag tests: test verify_object() with replaced objects
mktag: use default strbuf_read() hint
mktag: remove redundant braces in one-line body "if"
mktag: use puts(str) instead of printf("%s\n", str)
mktag: use fsck instead of custom verify_tag()
fsck: make fsck_config() re-usable
mktag: allow turning off fsck.extraHeaderEntry
mktag: allow omitting the header/body \n separator
mktag: convert to parse-options
mktag: mark strings for translation
mktag: add a --[no-]strict option
branch: change "--local" to "--list" in comment
branch tests: add to --sort tests
ref-filter: add braces to if/else if/else chain
ref-filter: move "cmp_fn" assignment into "else if" arm
ref-filter: move ref_sorting flags to a bitfield
branch: sort detached HEAD based on a flag
branch: show "HEAD detached" first under reverse sort
Makefile: remove a warning about old GETTEXT_POISON flag
gettext.c: remove/reword a mostly-useless comment
mailmap doc: create a new "gitmailmap(5)" man page
mailmap doc: quote config variables `like.this`
check-mailmap doc: note config options
mailmap doc: start by mentioning the comment syntax
mailmap tests: use our preferred whitespace syntax
mailmap tests: modernize syntax & test idioms
mailmap tests: improve --stdin tests
mailmap tests: remove redundant entry in test
mailmap tests: add a test for "not a blob" error
mailmap tests: get rid of overly complex blame fuzzing
mailmap: test for silent exiting on missing file/blob
test-lib functions: expand "test_commit" comment template
test-lib functions: document arguments to test_commit
test-lib functions: add --author support to test_commit
test-lib functions: add an --append option to test_commit
tests: refactor a few tests to use "test_commit --append"
mailmap doc + tests: add better examples & test them
mailmap tests: add a test for comment syntax
mailmap tests: add tests for whitespace syntax
mailmap tests: add tests for empty "<>" syntax
mailmap doc + tests: document and test for case-insensitivity
shortlog: remove unused(?) "repo-abbrev" feature
CoC: update to version 2.0 + local changes
fsck doc: remove ancient out-of-date diagnostics
ci: remove GETTEXT_POISON jobs
tests: remove support for GIT_TEST_GETTEXT_POISON
tests: remove uses of GIT_TEST_GETTEXT_POISON=false
cache-tree tests: refactor for modern test style
cache-tree tests: remove unused $2 parameter
cache-tree tests: use a sub-shell with less indirection
cache-tree tests: explicitly test HEAD and index differences
git svn mergeinfo tests: modernize redirection & quoting style
git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty
upload-pack tests: avoid a non-zero "grep" exit status
archive tests: use a cheaper "zipinfo -h" invocation to get header
rm tests: actually test for SIGPIPE in SIGPIPE test
config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag
Remove support for v1 of the PCRE library
grep/pcre2 tests: don't rely on invalid UTF-8 data test
grep/pcre2: better support invalid UTF-8 haystacks
grep/log: remove hidden --debug and --grep-debug options
pager: refactor wait_for_pager() function
pager: test for exit code with and without SIGPIPE
run-command: add braces for "if" block in wait_or_whine()
pager: properly log pager exit code when signalled
test-lib: remove check_var_migration
test lib: change "error" to "BUG" as appropriate
test-lib-functions: move test_set_index_version() to its user
test-lib-functions: remove generate_zero_bytes() wrapper
test libs: rename bundle helper to "lib-bundle.sh"
test libs: rename gitweb-lib.sh to lib-gitweb.sh
test-lib-functions: move function to lib-bitmap.sh
t/.gitattributes: sort lines
tests: remove last uses of GIT_TEST_GETTEXT_POISON=false
tests: remove most uses of C_LOCALE_OUTPUT
tests: remove last uses of C_LOCALE_OUTPUT
tests: remove most uses of test_i18ncmp
diff: add an API for deferred freeing
diff: plug memory leak from regcomp() on {log,diff} -I
test libs: rename "diff-lib" to "lib-diff"
test-lib-functions: remove bug-inducing "diagnostics" helper param
test-lib-functions: assert correct parameter count
^ permalink raw reply [relevance 4%]
* Re: [EXTERNAL] [PATCH v2 1/1] git mv foo FOO ; git mv foo bar gave an assert
2021-03-01 20:23 14% ` [EXTERNAL] [PATCH v2 1/1] git mv foo FOO ; git mv foo bar gave an assert Dan Moseley
@ 2021-03-01 21:47 0% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-03-01 21:47 UTC (permalink / raw)
To: Dan Moseley; +Cc: tboegi@web.de, git@vger.kernel.org
Dan Moseley <Dan.Moseley@microsoft.com> writes:
> Thank you Thorsten. This makes sense to me. Do you want to add a test?
> I believe this is what I had in my original patch, that worked pretty well:
Would this succeed unconditionally on all platforms, or only
relevant on case-insensitive filesystems? Lack of any prerequisite
on a new test is a good thing (if it is correct), but the
description of the change talked about case insensitivity, so ...
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> index 63d5f41a12..5c7fee9bd8 100755
> --- a/t/t7001-mv.sh
> +++ b/t/t7001-mv.sh
> @@ -152,6 +152,14 @@ test_expect_success \
> 'move into "."' \
> 'git mv path1/path2/ .'
>
> +test_expect_success \
> + 'fail to move file already in index under different cased name' \
> + 'echo 1 > foo &&
> + git add foo &&
> + git commit -m add_file -- foo &&
> + git mv foo FOO &&
> + test_expect_code 128 git mv foo BAR'
> +
> test_expect_success "Michael Cassar's test case" '
> rm -fr .git papers partA &&
> git init &&
^ permalink raw reply [relevance 0%]
* RE: [EXTERNAL] [PATCH v2 1/1] git mv foo FOO ; git mv foo bar gave an assert
[not found] ` <20210301170425.12154-1-tboegi@web.de>
@ 2021-03-01 20:23 14% ` Dan Moseley
2021-03-01 21:47 0% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Dan Moseley @ 2021-03-01 20:23 UTC (permalink / raw)
To: tboegi@web.de; +Cc: git@vger.kernel.org
> From: Torsten Bögershausen <tboegi@web.de>
>
> The following sequence, on a case-insensitive file system,
> (strictly speeking with core.ignorecase=true)
> leads to an assertion, and leaves .git/index.lock behind.
>
> git init
> echo foo >foo
> git add foo
> git mv foo FOO
> git mv foo bar
>
> This regression was introduced in Commit 9b906af657,
> "git-mv: improve error message for conflicted file"
>
> The bugfix is to change the "file exist case-insensitive in the index"
> into the correct "file exist (case-sensitive) in the index".
> This avoids the "assert".
>
> Reported-By: Dan Moseley <Dan.Moseley@microsoft.com>
>
> This fixes
> https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fgit-for-windows%2Fgit%2Fissues%2F2920&data=04%7C01%7CDan.Moseley%40microsoft.com%7Cb659ba5925c543bcc3e708d8dcd41268%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637502150683596627%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=%2BLjQf5NooTUgOKbsyn10XCFIAgMw9v%2BKlhx8kDD6%2BIg%3D&reserved=0
>
> Signed-off-by: Torsten Bögershausen <tboegi@web.de>
> ---
> builtin/mv.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/mv.c b/builtin/mv.c
> index 7dac714af9..3fccdcb645 100644
> --- a/builtin/mv.c
> +++ b/builtin/mv.c
> @@ -221,7 +221,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
> }
> argc += last - first;
> }
> - } else if (!(ce = cache_file_exists(src, length, ignore_case))) {
> + } else if (!(ce = cache_file_exists(src, length, 0))) {
> bad = _("not under version control");
> } else if (ce_stage(ce)) {
> bad = _("conflicted");
> --
> 2.30.0.155.g66e871b664
>
Thank you Thorsten. This makes sense to me. Do you want to add a test?
I believe this is what I had in my original patch, that worked pretty well:
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 63d5f41a12..5c7fee9bd8 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -152,6 +152,14 @@ test_expect_success \
'move into "."' \
'git mv path1/path2/ .'
+test_expect_success \
+ 'fail to move file already in index under different cased name' \
+ 'echo 1 > foo &&
+ git add foo &&
+ git commit -m add_file -- foo &&
+ git mv foo FOO &&
+ test_expect_code 128 git mv foo BAR'
+
test_expect_success "Michael Cassar's test case" '
rm -fr .git papers partA &&
git init &&
--
2.25.1
^ permalink raw reply related [relevance 14%]
* Re: [PATCH v3 00/10] Modernizing the t7001 test script
2021-02-23 8:26 11% ` Shubham Verma
@ 2021-02-23 17:33 6% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-02-23 17:33 UTC (permalink / raw)
To: Shubham Verma; +Cc: Git List, Eric Sunshine
Shubham Verma <shubhunic@gmail.com> writes:
> Hello Junio,
>
> I already corrected the author-name spelling in this v3 series
> but I looking at the last "What's Cooking" message and saw that
> Modernizing the t7001 test script series described as
> "Expecting the final version with corrected author attribution".
I looked at it on Feb 12 and requeued already, but the entry in the
what's cooking report was left stale by mistake.
Thanks for pinging.
^ permalink raw reply [relevance 6%]
* Re: [PATCH v3 00/10] Modernizing the t7001 test script
2021-02-11 21:44 6% ` [PATCH v3 00/10] Modernizing the t7001 test script Junio C Hamano
@ 2021-02-23 8:26 11% ` Shubham Verma
2021-02-23 17:33 6% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Shubham Verma @ 2021-02-23 8:26 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git List, Eric Sunshine
Hello Junio,
I already corrected the author-name spelling in this v3 series
but I looking at the last "What's Cooking" message and saw that
Modernizing the t7001 test script series described as
"Expecting the final version with corrected author attribution".
Please once look at my patch series.
Thank You!
On Fri, Feb 12, 2021 at 3:14 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Shubham Verma <shubhunic@gmail.com> writes:
>
> > In this patch series modernize the t7001 test script by changing the
> > style of its tests from an old one to the modern one and by cleaning
> > up the test script.
> >
> > Changes since v2:
> >
> > - Correct the author name spelling
> >
> > Thanks everyone for your feedback and suggestions.
>
> I've compared between v2 and v3 and verified the only change is the
> name spelling, so I'll port over Eric's reviewed-by's from the
> previous round.
>
> Thanks.
>
>
>
^ permalink raw reply [relevance 11%]
* What's cooking in git.git (Feb 2021, #04; Thu, 18)
@ 2021-02-19 3:11 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-02-19 3:11 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The ninth batch of topics are in 'master'.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ak/config-bad-bool-error (2021-02-11) 1 commit
(merged to 'next' on 2021-02-12 at 76784be663)
+ config: improve error message for boolean config
The error message given when a configuration variable that is
expected to have a boolean value has been improved.
* ak/corrected-commit-date (2021-01-18) 11 commits
(merged to 'next' on 2021-01-26 at deae33ec7d)
+ doc: add corrected commit date info
+ commit-reach: use corrected commit dates in paint_down_to_common()
+ commit-graph: use generation v2 only if entire chain does
+ commit-graph: implement generation data chunk
+ commit-graph: implement corrected commit date
+ commit-graph: return 64-bit generation number
+ commit-graph: add a slab to store topological levels
+ t6600-test-reach: generalize *_three_modes
+ commit-graph: consolidate fill_commit_graph_info
+ revision: parse parent in indegree_walk_step()
+ commit-graph: fix regression when computing Bloom filters
(this branch is used by ds/chunked-file-api, ds/commit-graph-genno-fix and ds/merge-base-independent.)
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Will merge to 'master', together with "ds/commit-graph-genno-fix".
* ds/commit-graph-genno-fix (2021-02-01) 6 commits
(merged to 'next' on 2021-02-03 at b3a9e11efb)
+ commit-graph: prepare commit graph
+ commit-graph: be extra careful about mixed generations
+ commit-graph: compute generations separately
+ commit-graph: validate layers for generation data
+ commit-graph: always parse before commit_graph_data_at()
+ commit-graph: use repo_parse_commit
(this branch uses ak/corrected-commit-date; is tangled with ds/chunked-file-api and ds/merge-base-independent.)
Fix incremental update of commit-graph file around corrected commit
date data.
Will merge to 'master', together with "ak/corrected-commit-date".
* ds/maintenance-pack-refs (2021-02-09) 2 commits
(merged to 'next' on 2021-02-11 at 36f56bc9ec)
+ maintenance: incremental strategy runs pack-refs weekly
+ maintenance: add pack-refs task
"git maintenance" tool learned a new "pack-refs" maintenance task.
* ew/rev-parse-since-test (2021-02-10) 1 commit
(merged to 'next' on 2021-02-11 at 2490918be8)
+ t1500: ensure current --since= behavior remains
Test to make sure "git rev-parse one-thing one-thing" gives
the same thing twice (when one-thing is --since=X).
* jk/mailmap-only-at-root (2021-02-10) 1 commit
(merged to 'next' on 2021-02-10 at fbd122fd6c)
+ mailmap: only look for .mailmap in work tree
The .mailmap is documented to be read only from the root level of a
working tree, but a stray file in a bare repository also was read
by accident, which has been corrected.
* js/commit-graph-warning (2021-02-11) 1 commit
(merged to 'next' on 2021-02-12 at e9faad550a)
+ commit-graph: when incompatible with graphs, indicate why
When certain features (e.g. grafts) used in the repository are
incompatible with the use of the commit-graph, we used to silently
turned commit-graph off; we now tell the user what we are doing.
* js/fsck-name-objects-fix (2021-02-10) 2 commits
(merged to 'next' on 2021-02-10 at 79afd7ebdc)
+ fsck --name-objects: be more careful parsing generation numbers
+ t1450: robustify `remove_object()`
Fix "git fsck --name-objects" which apparently has not been used by
anybody who is motivated enough to report breakage.
* js/range-diff-one-side-only (2021-02-06) 6 commits
(merged to 'next' on 2021-02-08 at 8c35ed8523)
+ range-diff: offer --left-only/--right-only options
+ range-diff: move the diffopt initialization down one layer
+ range-diff: combine all options in a single data structure
+ range-diff: simplify code spawning `git log`
+ range-diff: libify the read_patches() function again
+ range-diff: avoid leaking memory in two error code paths
The "git range-diff" command learned "--(left|right)-only" option
to show only one side of the compared range.
* js/range-diff-wo-dotdot (2021-02-06) 3 commits
(merged to 'next' on 2021-02-08 at 9ae8b46d99)
+ range-diff(docs): explain how to specify commit ranges
+ range-diff/format-patch: handle commit ranges other than A..B
+ range-diff/format-patch: refactor check for commit range
There are other ways than ".." for a single token to denote a
"commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
range-diff" did not understand them.
* js/reflog-expire-stale-fix (2021-02-11) 1 commit
(merged to 'next' on 2021-02-12 at 899034efca)
+ reflog expire --stale-fix: be generous about missing objects
"git reflog expire --stale-fix" can be used to repair the reflog by
removing entries that refer to objects that have been pruned away,
but was not careful to tolerate missing objects.
* jt/clone-unborn-head (2021-02-05) 3 commits
(merged to 'next' on 2021-02-08 at 3ba9f80e7f)
+ clone: respect remote unborn HEAD
+ connect, transport: encapsulate arg in struct
+ ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
* jt/trace2-BUG (2021-02-09) 1 commit
(merged to 'next' on 2021-02-09 at 94911ad676)
+ usage: trace2 BUG() invocations
Even though invocations of "die()" were logged to the trace2
system, "BUG()"s were not, which has been corrected.
* jx/t5411-unique-filenames (2021-01-22) 2 commits
(merged to 'next' on 2021-02-11 at bc5c67f70f)
+ t5411: refactor check of refs using test_cmp_refs
+ t5411: use different out file to prevent overwriting
Avoid individual tests in t5411 from getting affected by each other
by forcing them to use separate output files during the test.
* mr/bisect-in-c-4 (2021-02-03) 7 commits
(merged to 'next' on 2021-02-05 at ea18026619)
+ bisect--helper: retire `--check-and-set-terms` subcommand
+ bisect--helper: reimplement `bisect_skip` shell function in C
+ bisect--helper: retire `--bisect-auto-next` subcommand
+ bisect--helper: use `res` instead of return in BISECT_RESET case option
+ bisect--helper: retire `--bisect-write` subcommand
+ bisect--helper: reimplement `bisect_replay` shell function in C
+ bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
* mt/grep-cached-untracked (2021-02-09) 1 commit
(merged to 'next' on 2021-02-10 at e1fca79104)
+ grep: error out if --untracked is used with --cached
"git grep --untracked" is meant to be "let's ALSO find in these
files on the filesystem" when looking for matches in the working
tree files, and does not make any sense if the primary search is
done against the index, or the tree objects. The "--cached" and
"--untracked" options have been marked as mutually incompatible.
* sh/mergetool-hideresolved (2021-02-09) 3 commits
(merged to 'next' on 2021-02-09 at c3ed19b2ec)
+ mergetool: add per-tool support and overrides for the hideResolved flag
+ mergetool: break setup_tool out into separate initialization function
+ mergetool: add hideResolved configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
--------------------------------------------------
[New Topics]
* ab/fsck-api-cleanup (2021-02-18) 10 commits
- fsck.h: update FSCK_OPTIONS_* for object_name
- fsck.c: give "FOREACH_MSG_ID" a more specific name
- fsck.c: undefine temporary STR macro after use
- fsck.c: call parse_msg_type() early in fsck_set_msg_type()
- fsck.h: move FSCK_{FATAL,INFO,ERROR,WARN,IGNORE} into an enum
- fsck.c: rename remaining fsck_msg_id "id" to "msg_id"
- fsck.c: move definition of msg_id into append_msg_id()
- fsck.c: rename variables in fsck_set_msg_type() for less confusion
- fsck.h: use "enum object_type" instead of "int"
- fsck.h: indent arguments to of fsck_set_msg_type
Preliminary fsck API clean-up.
Expecting a reroll.
cf. <xmqqczwxc8bw.fsf@gitster.g>
Looking good.
* ab/grep-pcre2-allocfix (2021-02-17) 10 commits
- grep/pcre2: move definitions of pcre2_{malloc,free}
- grep/pcre2: move back to thread-only PCREv2 structures
- grep/pcre2: actually make pcre2 use custom allocator
- grep/pcre2: use pcre2_maketables_free() function
- grep/pcre2: use compile-time PCREv2 version test
- grep/pcre2: add GREP_PCRE2_DEBUG_MALLOC debug mode
- grep/pcre2: prepare to add debugging to pcre2_malloc()
- grep/pcre2: correct reference to grep_init() in comment
- grep/pcre2: drop needless assignment to NULL
- grep/pcre2: drop needless assignment + assert() on opt->pcre2
Updates to memory allocation code around the use of pcre2 library.
Needs review.
cf. <20210218000728.13995-1-avarab@gmail.com>
--------------------------------------------------
[Stalled]
* ab/make-cleanup (2021-02-01) 6 commits
- Makefile: add {program,xdiff,test,git}-objs & objects targets
- Makefile: split OBJECTS into OBJECTS and GIT_OBJS
- Makefile: sort OBJECTS assignment for subsequent change
- Makefile: split up long OBJECTS line
- Makefile: guard against TEST_OBJS in the environment
- Makefile: remove "all" on "$(FUZZ_OBJS)"
Reorganize Makefile to allow building git.o and other essential
objects without extra stuff needed only for testing.
Expecting a reroll (or retraction)
cf. <YBuZVfnc0ECuoKkK@coredump.intra.peff.net>
cf. <xmqq1rdzjuaa.fsf@gitster.c.googlers.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
- docs: document symlink restrictions for .git* files
- fsck: complain when .gitattributes or .gitignore is a symlink
- verify_path(): disallow symlinks in .gitattributes and .gitignore
- t0060: test obscured .gitattributes and .gitignore matching
- t7450: test .gitmodules symlink matching against obscured names
- t7450: test verify_path() handling of gitmodules
- t7415: rename to expand scope
- fsck_tree(): wrap some long lines
- fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
has potential consequences that is more/less grave, so that these
projects can opt out of the new checks?
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Got enough review comments to get updated.
--------------------------------------------------
[Cooking]
* tb/reverse-midx (2021-02-10) 9 commits
- pack-revindex: write multi-pack reverse indexes
- pack-write.c: extract 'write_rev_file_order'
- pack-revindex: read multi-pack reverse indexes
- Documentation/technical: describe multi-pack reverse indexes
- midx: make some functions non-static
- midx: keep track of the checksum
- midx: don't free midx_name early
- midx: allow marking a pack as preferred
- t/helper/test-read-midx.c: add '--show-objects'
An on-disk reverse-index to map the in-pack location of an object
back to its object name across multiple packfiles is introduced.
* ab/detox-gettext-tests (2021-02-10) 4 commits
(merged to 'next' on 2021-02-17 at bd3d771557)
+ tests: remove most uses of test_i18ncmp
+ tests: remove last uses of C_LOCALE_OUTPUT
+ tests: remove most uses of C_LOCALE_OUTPUT
+ tests: remove last uses of GIT_TEST_GETTEXT_POISON=false
Removal of GIT_TEST_GETTEXT_POISON continues.
Will merge to 'master'.
* ab/diff-deferred-free (2021-02-11) 2 commits
(merged to 'next' on 2021-02-12 at 5e24106122)
+ diff: plug memory leak from regcomp() on {log,diff} -I
+ diff: add an API for deferred freeing
A small memleak in "diff -I<regexp>" has been corrected.
Will merge to 'master'.
* jc/diffcore-rotate (2021-02-16) 1 commit
- diff: --{rotate,skip}-to=<path>
"git {diff,log} --{skip,rotate}-to=<path>" allows the user to
discard diff output for early paths or move them to the end of the
output.
Will merge to 'next'.
* mz/doc-notes-are-not-anchors (2021-02-10) 1 commit
(merged to 'next' on 2021-02-17 at 81f92a74b2)
+ docs: clarify that refs/notes/ do not keep the attached objects alive
Objects that lost references can be pruned away, even when they
have notes attached to it (and these notes will become dangling,
which in turn can be pruned with "git notes prune"). This has been
clarified in the documentation.
Will merge to 'master'.
* en/diffcore-rename (2021-02-15) 8 commits
- merge-ort: call diffcore_rename() directly
- gitdiffcore doc: mention new preliminary step for rename detection
- diffcore-rename: guide inexact rename detection based on basenames
- diffcore-rename: complete find_basename_matches()
- diffcore-rename: compute basenames of source and dest candidates
- t4001: add a test comparing basename similarity and content similarity
- diffcore-rename: filter rename_src list when possible
- diffcore-rename: no point trying to find a match better than exact
Performance optimization work on the rename detection continues.
Will merge to 'next'.
* ab/pickaxe-pcre2 (2021-02-18) 24 commits
- pickaxe -G: don't special-case create/delete
- pickaxe -G: terminate early on matching lines
- xdiff-interface: support early exit in xdiff_outf()
- xdiff-interface: allow early return from xdiff_emit_{line,hunk}_fn
- pickaxe -S: slightly optimize contains()
- pickaxe: rename variables in has_changes() for brevity
- pickaxe -S: support content with NULs under --pickaxe-regex
- pickaxe: assert that we must have a needle under -G or -S
- pickaxe: refactor function selection in diffcore-pickaxe()
- perf: add performance test for pickaxe
- pickaxe/style: consolidate declarations and assignments
- diff.h: move pickaxe fields together again
- pickaxe: die when --find-object and --pickaxe-all are combined
- pickaxe: die when -G and --pickaxe-regex are combined
- pickaxe tests: test for -G, -S and --find-object incompatibility
- pickaxe tests: add test for "log -S" not being a regex
- pickaxe tests: add test for diffgrep_consume() internals
- pickaxe tests: refactor to use test_commit --append --printf
- test-lib functions: add --printf option to test_commit
- test-lib-functions: reword "test_commit --append" docs
- test-lib-functions: document and test test_commit --no-tag
- grep/pcre2 tests: reword comments referring to kwset
- Merge branch 'jk/rev-list-disk-usage' into ab/pickaxe-pcre2
- Merge branch 'ab/test-lib' into ab/pickaxe-pcre2
(this branch uses ab/test-lib and jk/rev-list-disk-usage.)
Rewrite the backend for "diff -G/-S" to use pcre2 engine when
available.
Needs review.
cf. <20210216115801.4773-1-avarab@gmail.com>
* cm/rebase-i-fixup-amend-reword (2021-02-17) 6 commits
- doc/git-commit: add documentation for fixup[amend|reword] options
- t3437: use --fixup with options to create amend! commit
- t7500: add tests for --fixup[amend|reword] options
- commit: add a reword suboption to --fixup
- commit: add amend suboption to --fixup to create amend! commit
- sequencer: export subject_length()
(this branch uses cm/rebase-i and cm/rebase-i-updates.)
"git commit --fixup=<commit>", which was to tweak the changes made
to the contents while keeping the original log message intact,
learned "--fixup=(amend|reword):<commit>", that can be used to
tweak both the message and the contents, and only the message,
respectively.
Expecting a reroll.
cf. <20210217072904.16257-1-charvi077@gmail.com>
* dl/stash-show-untracked (2021-02-16) 4 commits
- SQUASH???
- SQUASH???
- stash show: learn stash.showIncludeUntracked
- stash show: teach --include-untracked and --only-untracked
(this branch uses dl/stash-cleanup.)
"git stash show" learned to optionally show untracked part of the
stash.
Expecting a reroll.
cf. <cover.1613459474.git.liu.denton@gmail.com>
* es/config-hooks-part-1 (2021-02-16) 17 commits
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
(this branch is used by es/config-hooks.)
A way to specify hooks in the configuration files is introduced.
Expecting another reroll??
cf. <YC7o2rUQOEdiMdqh@google.com>
* jh/fsmonitor-prework (2021-02-16) 11 commits
(merged to 'next' on 2021-02-17 at 1943efb5ac)
+ fsmonitor: refactor initialization of fsmonitor_last_update token
+ fsmonitor: allow all entries for a folder to be invalidated
+ fsmonitor: log FSMN token when reading and writing the index
+ fsmonitor: log invocation of FSMonitor hook to trace2
+ read-cache: log the number of scanned files to trace2
+ read-cache: log the number of lstat calls to trace2
+ preload-index: log the number of lstat calls to trace2
+ p7519: add trace logging during perf test
+ p7519: move watchman cleanup earlier in the test
+ p7519: fix watchman watch-list test on Windows
+ p7519: do not rely on "xargs -d" in test
Preliminary changes to fsmonitor integration.
Will merge to 'master'.
* jk/open-dotgitx-with-nofollow (2021-02-16) 6 commits
- mailmap: do not respect symlinks for in-tree .mailmap
- exclude: do not respect symlinks for in-tree .gitignore
- attr: do not respect symlinks for in-tree .gitattributes
- exclude: add flags parameter to add_patterns()
- attr: convert "macro_ok" into a flags field
- add open_nofollow() helper
It does not make sense to make ".gitattributes", ".gitignore" and
".mailmap" symlinks, as they are supposed to be usable from the
object store (think: bare repositories where HEAD:.mailmap etc. are
used). When these files are symbolic links, we used to read the
contents of the files pointed by them by mistake, which has been
corrected.
* js/doc-proto-v2-response-end (2021-02-17) 1 commit
(merged to 'next' on 2021-02-17 at 9d5d479469)
+ doc: fix naming of response-end-pkt
Docfix.
Will merge to 'master'.
* ma/doc-markup-fix (2021-02-18) 3 commits
- gitmailmap.txt: fix rendering of e-mail addresses
- git.txt: fix monospace rendering
- rev-list-options.txt: fix rendering of bonus paragraph
Docfix.
Will merge to 'next'.
* rs/blame-optim (2021-02-17) 1 commit
(merged to 'next' on 2021-02-17 at e54665eeb3)
+ blame: remove unnecessary use of get_commit_info()
Optimization in "git blame"
Will merge to 'master'.
* rs/pretty-describe (2021-02-17) 2 commits
- pretty: add merge and exclude options to %(describe)
- pretty: add %(describe)
"git log --format='...'" learned "%(describe)" placeholder.
* cm/rebase-i-updates (2021-02-10) 11 commits
(merged to 'next' on 2021-02-12 at e29227780b)
+ doc/rebase -i: fix typo in the documentation of 'fixup' command
+ t/t3437: fixup the test 'multiple fixup -c opens editor once'
+ t/t3437: use named commits in the tests
+ t/t3437: simplify and document the test helpers
+ t/t3437: check the author date of fixed up commit
+ t/t3437: remove the dependency of 'expected-message' file from tests
+ t/t3437: fixup here-docs in the 'setup' test
+ t/lib-rebase: update the documentation of FAKE_LINES
+ rebase -i: clarify and fix 'fixup -c' rebase-todo help
+ sequencer: rename a few functions
+ sequencer: fixup the datatype of the 'flag' argument
(this branch is used by cm/rebase-i-fixup-amend-reword; uses cm/rebase-i.)
Follow-up fixes to "cm/rebase-i" topic.
Will merge to 'master', together with "cm/rebase-i".
* cw/pack-vs-bigfilethreashold (2021-02-09) 2 commits
- fixup! doc: mention bigFileThreshold for packing
- doc: mention bigFileThreshold for packing
Doc update.
Expecting a reroll.
cf. <F63929A8-7BC9-43A7-9E7B-118433F62588@gmx.ch>
* jk/rev-list-disk-usage (2021-02-17) 4 commits
- docs/rev-list: add some examples of --disk-usage
- docs/rev-list: add an examples section
(merged to 'next' on 2021-02-11 at 6fb701f287)
+ rev-list: add --disk-usage option for calculating disk usage
+ t: add --no-tag option to test_commit
(this branch is used by ab/pickaxe-pcre2.)
"git rev-list" command learned "--disk-usage" option.
Will merge to 'next' and then to 'master'.
* mt/checkout-index-corner-cases (2021-02-16) 2 commits
(merged to 'next' on 2021-02-17 at 81dad9735b)
+ checkout-index: omit entries with no tempname from --temp output
+ write_entry(): fix misuses of `path` in error messages
The error codepath around the "--temp/--prefix" feature of "git
checkout-index" has been improved.
Will merge to 'master'.
* ab/test-lib (2021-02-12) 11 commits
(merged to 'next' on 2021-02-12 at 666a0422dc)
+ test-lib-functions: assert correct parameter count
+ test-lib-functions: remove bug-inducing "diagnostics" helper param
+ test libs: rename "diff-lib" to "lib-diff"
+ t/.gitattributes: sort lines
+ test-lib-functions: move function to lib-bitmap.sh
+ test libs: rename gitweb-lib.sh to lib-gitweb.sh
+ test libs: rename bundle helper to "lib-bundle.sh"
+ test-lib-functions: remove generate_zero_bytes() wrapper
+ test-lib-functions: move test_set_index_version() to its user
+ test lib: change "error" to "BUG" as appropriate
+ test-lib: remove check_var_migration
(this branch is used by ab/pickaxe-pcre2.)
Test framework clean-up.
Will merge to 'master'.
* dl/stash-cleanup (2021-02-11) 7 commits
(merged to 'next' on 2021-02-11 at ae1cde1380)
+ stash: declare ref_stash as an array
+ t3905: use test_cmp() to check file contents
+ t3905: replace test -s with test_file_not_empty
+ t3905: remove nested git in command substitution
+ t3905: move all commands into test cases
+ t3905: remove spaces after redirect operators
+ git-stash.txt: be explicit about subcommand options
(this branch is used by dl/stash-show-untracked.)
Documentation, code and test clean-up around "git stash".
Will merge to 'master'.
This is an early part of a topic that added a new feature to the
command, but the implementation is expected to need a handful of
iterations; I split the preparatory part up to fast-track it.
* sv/t7001-modernize (2021-02-11) 10 commits
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use '>' rather than 'touch'
- t7001: avoid using `cd` outside of subshells
- t7001: remove whitespace after redirect operators
- t7001: modernize subshell formatting
- t7001: remove unnecessary blank lines
- t7001: indent with TABs instead of spaces
- t7001: modernize test formatting
Test script modernization.
Expecting the final version with corrected author attribution.
* mt/grep-sparse-checkout (2021-02-09) 1 commit
- grep: honor sparse-checkout on working tree searches
"git grep" has been tweaked to be limited to the sparse checkout
paths.
Will merge to 'next'.
* jh/simple-ipc (2021-02-17) 12 commits
- t0052: add simple-ipc tests and t/helper/test-simple-ipc tool
- simple-ipc: add Unix domain socket implementation
- unix-socket: create `unix_stream_server__listen_with_lock()`
- unix-socket: disallow chdir() when creating unix domain sockets
- unix-socket: add backlog size option to unix_stream_listen()
- unix-socket: elimiate static unix_stream_socket() helper function
- simple-ipc: add win32 implementation
- simple-ipc: design documentation for new IPC mechanism
- pkt-line: add options argument to read_packetized_to_strbuf()
- pkt-line: (optionally) libify the packet readers
- pkt-line: do not issue flush packets in write_packetized_*()
- pkt-line: eliminate the need for static buffer in packet_write_gently()
A simple IPC interface gets introduced to build services like
fsmonitor on top.
* ab/pager-exit-log (2021-02-01) 4 commits
(merged to 'next' on 2021-02-12 at ffe9f2d364)
+ pager: properly log pager exit code when signalled
+ run-command: add braces for "if" block in wait_or_whine()
+ pager: test for exit code with and without SIGPIPE
+ pager: refactor wait_for_pager() function
When a pager spawned by us exited, the trace log did not record its
exit status correctly, which has been corrected.
Will merge to 'master'.
The original "what should we do with SIGPIPE?" question remains, though.
* ta/hash-function-transition-doc (2021-02-05) 6 commits
(merged to 'next' on 2021-02-12 at f620f3cfd3)
+ doc: use https links
+ doc hash-function-transition: move rationale upwards
+ doc hash-function-transition: fix incomplete sentence
+ doc hash-function-transition: use upper case consistently
+ doc hash-function-transition: use SHA-1 and SHA-256 consistently
+ doc hash-function-transition: fix asciidoc output
Update formatting and grammar of the hash transition plan
documentation, plus some updates.
Will merge to 'master'.
* ds/chunked-file-api (2021-02-18) 17 commits
- chunk-format: add technical docs
- chunk-format: restore duplicate chunk checks
- midx: use 64-bit multiplication for chunk sizes
- midx: use chunk-format read API
- commit-graph: use chunk-format read API
- chunk-format: create read chunk API
- midx: use chunk-format API in write_midx_internal()
- midx: drop chunk progress during write
- midx: return success/failure in chunk write methods
- midx: add num_large_offsets to write_midx_context
- midx: add pack_perm to write_midx_context
- midx: add entries to write_midx_context
- midx: use context in write_midx_pack_names()
- midx: rename pack_info to write_midx_context
- commit-graph: use chunk-format write API
- chunk-format: create chunk format write API
- commit-graph: anonymize data in chunk_write_fn
The common code to deal with "chunked file format" that is shared
by the multi-pack-index and commit-graph files have been factored
out, to help codepaths for both filetypes to become more rebust.
Will merge to 'next'.
* ds/merge-base-independent (2021-02-01) 5 commits
- commit-reach: stale commits may prune generation further
- commit-reach: use heuristic in remove_redundant()
- commit-reach: move compare_commits_by_gen
- commit-reach: use one walk in remove_redundant()
- commit-reach: reduce requirements for remove_redundant()
The code to implement "git merge-base --independent" was poorly
done and was kept from the very beginning of the feature.
Expecting a reroll.
cf. <pull.852.v2.git.1612183647.gitgitgadget@gmail.com>
* hv/trailer-formatting (2021-02-15) 4 commits
- ref-filter: use pretty.c logic for trailers
- pretty.c: capture invalid trailer argument
- pretty.c: refactor trailer logic to `format_set_trailers_options()`
- t6300: use function to test trailer options
The logic to handle "trailer" related placeholders in the
"--format=" mechanisms in the "log" family and "for-each-ref"
family is getting unified.
Ready for 'next'?
* cm/rebase-i (2021-01-29) 9 commits
(merged to 'next' on 2021-02-01 at 4f9aa6cec3)
+ doc/git-rebase: add documentation for fixup [-C|-c] options
+ rebase -i: teach --autosquash to work with amend!
+ t3437: test script for fixup [-C|-c] options in interactive rebase
+ rebase -i: add fixup [-C | -c] command
+ sequencer: use const variable for commit message comments
+ sequencer: pass todo_item to do_pick_commit()
+ rebase -i: comment out squash!/fixup! subjects from squash message
+ sequencer: factor out code to append squash message
+ rebase -i: only write fixup-message when it's needed
(this branch is used by cm/rebase-i-fixup-amend-reword and cm/rebase-i-updates.)
"rebase -i" is getting cleaned up and also enhanced.
Will merge to 'master', together with "cm/rebase-i-updates".
* tb/geometric-repack (2021-02-18) 8 commits
- builtin/repack.c: add '--geometric' option
- packfile: add kept-pack cache for find_kept_pack_entry()
- builtin/pack-objects.c: rewrite honor-pack-keep logic
- p5303: measure time to repack with keep
- p5303: add missing &&-chains
- builtin/pack-objects.c: add '--stdin-packs' option
- revision: learn '--no-kept-objects'
- packfile: introduce 'find_kept_pack_entry()'
"git repack" so far has been only capable of repacking everything
under the sun into a single pack (or split by size). A cleverer
strategy to reduce the cost of repacking a repository has been
introduced.
cf. <cover.1613618042.git.me@ttaylorr.com>
* ah/rebase-no-fork-point-config (2021-01-21) 1 commit
- rebase: add a config option for --no-fork-point
"git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.
Expecting a reroll to update its tests.
cf. <CAMMLpeTDNLUz9UVnL3aVK=J7X50Sq8L-OVGaoEsT5AY6EQON-g@mail.gmail.com>
* jt/transfer-fsck-across-packs (2021-01-25) 5 commits
- SQUASH??? test fix
- fetch-pack: print and use dangling .gitmodules
- fetch-pack: with packfile URIs, use index-pack arg
- http-fetch: allow custom index-pack args
- http: allow custom index-pack args
The approach to "fsck" the incoming objects in "index-pack" is
attractive for performance reasons (we have them already in core,
inflated and ready to be inspected), but fundamentally cannot be
applied fully when we receive more than one pack stream, as a tree
object in one pack may refer to a blob object in another pack as
".gitmodules", when we want to inspect blobs that are used as
".gitmodules" file, for example. Teach "index-pack" to emit
objects that must be inspected later and check them in the calling
"fetch-pack" process.
Expecting an update, but perhaps it may be a good approach to
rebuild the topic on top of ab/fsck-api-cleanup
* bc/signed-objects-with-both-hashes (2021-02-10) 6 commits
(merged to 'next' on 2021-02-11 at 391cc85104)
+ gpg-interface: remove other signature headers before verifying
+ ref-filter: hoist signature parsing
+ commit: allow parsing arbitrary buffers with headers
+ gpg-interface: improve interface for parsing tags
+ commit: ignore additional signatures when parsing signed commits
+ ref-filter: switch some uses of unsigned long to size_t
Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
Will merge to 'master'.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* es/config-hooks (2021-02-16) 17 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
(this branch uses es/config-hooks-part-1.)
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
--------------------------------------------------
[Discarded]
* sm/curl-retry (2020-10-13) 3 commits
. http: automatically retry some requests
. replace CURLOPT_FILE With CURLOPT_WRITEDATA
. remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Stalled for too long without any activity.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
. config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Stalled for too long without any activity.
* jc/war-on-dashed-git (2020-12-21) 2 commits
. fixup??? git: catch an attempt to run "git-foo"
. git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
Stalled for too long without any activity.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
. zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
Stalled for too long without any activity.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Feb 2021, #03; Wed, 17)
@ 2021-02-18 2:11 4% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-02-18 2:11 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The eighth batch of topics are in 'master'.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/tests-various-fixup (2021-01-23) 10 commits
(merged to 'next' on 2021-02-01 at a604a6e217)
+ rm tests: actually test for SIGPIPE in SIGPIPE test
+ archive tests: use a cheaper "zipinfo -h" invocation to get header
+ upload-pack tests: avoid a non-zero "grep" exit status
+ git-svn tests: rewrite brittle tests to use "--[no-]merges".
+ git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty
+ git svn mergeinfo tests: modernize redirection & quoting style
+ cache-tree tests: explicitly test HEAD and index differences
+ cache-tree tests: use a sub-shell with less indirection
+ cache-tree tests: remove unused $2 parameter
+ cache-tree tests: refactor for modern test style
Various test updates.
* en/merge-ort-perf (2021-01-23) 6 commits
(merged to 'next' on 2021-02-01 at ca3c07579b)
+ merge-ort: begin performance work; instrument with trace2_region_* calls
+ merge-ort: ignore the directory rename split conflict for now
+ merge-ort: fix massive leak
+ Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
+ Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
+ Merge branch 'en/diffcore-rename' into en/merge-ort-perf
(this branch uses en/ort-directory-rename.)
The "ort" merge strategy.
* en/ort-directory-rename (2021-01-20) 18 commits
(merged to 'next' on 2021-02-01 at 5c1cdd13a1)
+ merge-ort: fix a directory rename detection bug
+ merge-ort: process_renames() now needs more defensiveness
+ merge-ort: implement apply_directory_rename_modifications()
+ merge-ort: add a new toplevel_dir field
+ merge-ort: implement handle_path_level_conflicts()
+ merge-ort: implement check_for_directory_rename()
+ merge-ort: implement apply_dir_rename() and check_dir_renamed()
+ merge-ort: implement compute_collisions()
+ merge-ort: modify collect_renames() for directory rename handling
+ merge-ort: implement handle_directory_level_conflicts()
+ merge-ort: implement compute_rename_counts()
+ merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
+ merge-ort: add outline of get_provisional_directory_renames()
+ merge-ort: add outline for computing directory renames
+ merge-ort: collect which directories are removed in dirs_removed
+ merge-ort: initialize and free new directory rename data structures
+ merge-ort: add new data structures for directory rename detection
+ Merge branch 'en/merge-ort-3' into en/ort-directory-rename
(this branch is used by en/merge-ort-perf.)
ORT merge strategy learns to infer "renamed directory" while
merging.
* jk/complete-branch-force-delete (2021-02-03) 3 commits
(merged to 'next' on 2021-02-03 at 6454bb89b5)
+ doc/git-branch: fix awkward wording for "-c"
+ completion: handle other variants of "branch -m"
+ completion: treat "branch -D" the same way as "branch -d"
The command line completion (in contrib/) completed "git branch -d"
with branch names, but "git branch -D" offered tagnames in addition,
which has been corrected. "git branch -M" had the same problem.
* jv/upload-pack-filter-spec-quotefix (2021-02-02) 2 commits
(merged to 'next' on 2021-02-03 at 2e34f74e3a)
+ t5544: clarify 'hook works with partial clone' test
(merged to 'next' on 2021-01-31 at 789bf4154e)
+ upload-pack.c: fix filter spec quoting bug
Fix in passing custom args from "git clone" to "upload-pack" on the
other side.
* tb/ci-run-cocci-with-18.04 (2021-02-08) 1 commit
(merged to 'next' on 2021-02-09 at c50bc53527)
+ .github/workflows/main.yml: run static-analysis on bionic
The version of Ubuntu Linux used by default at GitHub Actions CI
has been updated to one that lack coccinelle; until it gets fixed,
work it around by sticking to the previous release (18.04).
* tb/pack-revindex-on-disk (2021-01-28) 10 commits
(merged to 'next' on 2021-02-01 at bd6a780213)
+ t5325: check both on-disk and in-memory reverse index
+ pack-revindex: ensure that on-disk reverse indexes are given precedence
+ t: support GIT_TEST_WRITE_REV_INDEX
+ t: prepare for GIT_TEST_WRITE_REV_INDEX
+ Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'
+ builtin/pack-objects.c: respect 'pack.writeReverseIndex'
+ builtin/index-pack.c: write reverse indexes
+ builtin/index-pack.c: allow stripping arbitrary extensions
+ pack-write.c: prepare to write 'pack-*.rev' files
+ packfile: prepare for the existence of '*.rev' files
(this branch is used by tb/reverse-midx.)
Introduce an on-disk file to record revindex for packdata, which
traditionally was always created on the fly and only in-core.
* tb/precompose-prefix-too (2021-02-03) 1 commit
(merged to 'next' on 2021-02-05 at 1dd43136b1)
+ MacOS: precompose_argv_prefix()
When commands are started from a subdirectory, they may have to
compare the path to the subdirectory (called prefix and found out
from $(pwd)) with the tracked paths. On macOS, $(pwd) and
readdir() yield decomposed path, while the tracked paths are
usually normalized to the precomposed form, causing mismatch. This
has been fixed by taking the same approach used to normalize the
command line arguments.
--------------------------------------------------
[New Topics]
* tb/reverse-midx (2021-02-10) 9 commits
- pack-revindex: write multi-pack reverse indexes
- pack-write.c: extract 'write_rev_file_order'
- pack-revindex: read multi-pack reverse indexes
- Documentation/technical: describe multi-pack reverse indexes
- midx: make some functions non-static
- midx: keep track of the checksum
- midx: don't free midx_name early
- midx: allow marking a pack as preferred
- t/helper/test-read-midx.c: add '--show-objects'
An on-disk reverse-index to map the in-pack location of an object
back to its object name across multiple packfiles is introduced.
* ab/detox-gettext-tests (2021-02-10) 4 commits
- tests: remove most uses of test_i18ncmp
- tests: remove last uses of C_LOCALE_OUTPUT
- tests: remove most uses of C_LOCALE_OUTPUT
- tests: remove last uses of GIT_TEST_GETTEXT_POISON=false
Removal of GIT_TEST_GETTEXT_POISON continues.
Will merge to 'next'.
* ab/diff-deferred-free (2021-02-11) 2 commits
(merged to 'next' on 2021-02-12 at 5e24106122)
+ diff: plug memory leak from regcomp() on {log,diff} -I
+ diff: add an API for deferred freeing
A small memleak in "diff -I<regexp>" has been corrected.
Will merge to 'master'.
* ak/config-bad-bool-error (2021-02-11) 1 commit
(merged to 'next' on 2021-02-12 at 76784be663)
+ config: improve error message for boolean config
The error message given when a configuration variable that is
expected to have a boolean value has been improved.
Will merge to 'master'.
* jc/diffcore-rotate (2021-02-16) 1 commit
- diff: --{rotate,skip}-to=<path>
"git {diff,log} --{skip,rotate}-to=<path>" allows the user to
discard diff output for early paths or move them to the end of the
output.
Will merge to 'next'.
* js/commit-graph-warning (2021-02-11) 1 commit
(merged to 'next' on 2021-02-12 at e9faad550a)
+ commit-graph: when incompatible with graphs, indicate why
When certain features (e.g. grafts) used in the repository are
incompatible with the use of the commit-graph, we used to silently
turned commit-graph off; we now tell the user what we are doing.
Will merge to 'master'.
* js/reflog-expire-stale-fix (2021-02-11) 1 commit
(merged to 'next' on 2021-02-12 at 899034efca)
+ reflog expire --stale-fix: be generous about missing objects
"git reflog expire --stale-fix" can be used to repair the reflog by
removing entries that refer to objects that have been pruned away,
but was not careful to tolerate missing objects.
Will merge to 'master'.
* mz/doc-notes-are-not-anchors (2021-02-10) 1 commit
- docs: clarify that refs/notes/ do not keep the attached objects alive
Objects that lost references can be pruned away, even when they
have notes attached to it (and these notes will become dangling,
which in turn can be pruned with "git notes prune"). This has been
clarified in the documentation.
Will merge to 'next'.
* en/diffcore-rename (2021-02-15) 8 commits
- merge-ort: call diffcore_rename() directly
- gitdiffcore doc: mention new preliminary step for rename detection
- diffcore-rename: guide inexact rename detection based on basenames
- diffcore-rename: complete find_basename_matches()
- diffcore-rename: compute basenames of source and dest candidates
- t4001: add a test comparing basename similarity and content similarity
- diffcore-rename: filter rename_src list when possible
- diffcore-rename: no point trying to find a match better than exact
Performance optimization work on the rename detection continues.
Will merge to 'next'.
* ab/pickaxe-pcre2 (2021-02-16) 24 commits
- pickaxe -G: don't special-case create/delete
- pickaxe -G: terminate early on matching lines
- xdiff-interface: support early exit in xdiff_outf()
- xdiff-interface: allow early return from xdiff_emit_{line,hunk}_fn
- pickaxe -S: slightly optimize contains()
- pickaxe: rename variables in has_changes() for brevity
- pickaxe -S: support content with NULs under --pickaxe-regex
- pickaxe: assert that we must have a needle under -G or -S
- pickaxe: refactor function selection in diffcore-pickaxe()
- perf: add performance test for pickaxe
- pickaxe/style: consolidate declarations and assignments
- diff.h: move pickaxe fields together again
- pickaxe: die when --find-object and --pickaxe-all are combined
- pickaxe: die when -G and --pickaxe-regex are combined
- pickaxe tests: test for -G, -S and --find-object incompatibility
- pickaxe tests: add test for "log -S" not being a regex
- pickaxe tests: add test for diffgrep_consume() internals
- pickaxe tests: refactor to use test_commit --append --printf
- test-lib functions: add --printf option to test_commit
- test-lib-functions: reword "test_commit --append" docs
- test-lib-functions: document and test test_commit --no-tag
- grep/pcre2 tests: reword comments referring to kwset
- Merge branch 'jk/rev-list-disk-usage' into ab/pickaxe-pcre2
- Merge branch 'ab/test-lib' into ab/pickaxe-pcre2
(this branch uses ab/test-lib and jk/rev-list-disk-usage.)
* cm/rebase-i-fixup-amend-reword (2021-02-17) 6 commits
- doc/git-commit: add documentation for fixup[amend|reword] options
- t3437: use --fixup with options to create amend! commit
- t7500: add tests for --fixup[amend|reword] options
- commit: add a reword suboption to --fixup
- commit: add amend suboption to --fixup to create amend! commit
- sequencer: export subject_length()
(this branch uses cm/rebase-i and cm/rebase-i-updates.)
"git commit --fixup" learns to optionally create "amend!" and
"reword!" commits, that use the log message in "fixup" commit
as the message of the resulting commit.
* dl/stash-show-untracked (2021-02-16) 4 commits
- SQUASH???
- SQUASH???
- stash show: learn stash.showIncludeUntracked
- stash show: teach --include-untracked and --only-untracked
(this branch uses dl/stash-cleanup.)
"git stash show" learned to optionally show untracked part of the
stash.
* es/config-hooks-part-1 (2021-02-16) 17 commits
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
(this branch is used by es/config-hooks.)
A way to specify hooks in the configuration files is introduced.
Will merge to 'next'.
* jh/fsmonitor-prework (2021-02-16) 11 commits
- fsmonitor: refactor initialization of fsmonitor_last_update token
- fsmonitor: allow all entries for a folder to be invalidated
- fsmonitor: log FSMN token when reading and writing the index
- fsmonitor: log invocation of FSMonitor hook to trace2
- read-cache: log the number of scanned files to trace2
- read-cache: log the number of lstat calls to trace2
- preload-index: log the number of lstat calls to trace2
- p7519: add trace logging during perf test
- p7519: move watchman cleanup earlier in the test
- p7519: fix watchman watch-list test on Windows
- p7519: do not rely on "xargs -d" in test
Preliminary changes to fsmonitor integration.
Will merge to 'next'.
* jk/open-dotgitx-with-nofollow (2021-02-16) 6 commits
- mailmap: do not respect symlinks for in-tree .mailmap
- exclude: do not respect symlinks for in-tree .gitignore
- attr: do not respect symlinks for in-tree .gitattributes
- exclude: add flags parameter to add_patterns()
- attr: convert "macro_ok" into a flags field
- add open_nofollow() helper
It does not make sense to make ".gitattributes", ".gitignore" and
".mailmap" symlinks, as they are supposed to be usable from the
object store (think: bare repositories where HEAD:.mailmap etc. are
used). When these files are symbolic links, we used to read the
contents of the files pointed by them by mistake, which has been
corrected.
* js/doc-proto-v2-response-end (2021-02-17) 1 commit
- doc: fix naming of response-end-pkt
Docfix.
Will merge to 'next'.
* ma/doc-markup-fix (2021-02-17) 2 commits
- gitmailmap.txt: fix rendering of e-mail addresses
- rev-list-options.txt: fix rendering of bonus paragraph
Docfix.
Will merge to 'next'.
* rs/blame-optim (2021-02-17) 1 commit
- blame: remove unnecessary use of get_commit_info()
Optimization in "git blame"
Will merge to 'next'.
* rs/pretty-describe (2021-02-17) 2 commits
- pretty: add merge and exclude options to %(describe)
- pretty: add %(describe)
"git log --format='...'" learned "%(describe)" placeholder.
--------------------------------------------------
[Stalled]
* ab/make-cleanup (2021-02-01) 6 commits
- Makefile: add {program,xdiff,test,git}-objs & objects targets
- Makefile: split OBJECTS into OBJECTS and GIT_OBJS
- Makefile: sort OBJECTS assignment for subsequent change
- Makefile: split up long OBJECTS line
- Makefile: guard against TEST_OBJS in the environment
- Makefile: remove "all" on "$(FUZZ_OBJS)"
Reorganize Makefile to allow building git.o and other essential
objects without extra stuff needed only for testing.
Expecting a reroll (or retraction)
cf. <YBuZVfnc0ECuoKkK@coredump.intra.peff.net>
cf. <xmqq1rdzjuaa.fsf@gitster.c.googlers.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
- docs: document symlink restrictions for .git* files
- fsck: complain when .gitattributes or .gitignore is a symlink
- verify_path(): disallow symlinks in .gitattributes and .gitignore
- t0060: test obscured .gitattributes and .gitignore matching
- t7450: test .gitmodules symlink matching against obscured names
- t7450: test verify_path() handling of gitmodules
- t7415: rename to expand scope
- fsck_tree(): wrap some long lines
- fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
has potential consequences that is more/less grave, so that these
projects can opt out of the new checks?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* jc/war-on-dashed-git (2020-12-21) 2 commits
- fixup??? git: catch an attempt to run "git-foo"
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Got enough review comments to get updated.
--------------------------------------------------
[Cooking]
* js/range-diff-one-side-only (2021-02-06) 6 commits
(merged to 'next' on 2021-02-08 at 8c35ed8523)
+ range-diff: offer --left-only/--right-only options
+ range-diff: move the diffopt initialization down one layer
+ range-diff: combine all options in a single data structure
+ range-diff: simplify code spawning `git log`
+ range-diff: libify the read_patches() function again
+ range-diff: avoid leaking memory in two error code paths
The "git range-diff" command learned "--(left|right)-only" option
to show only one side of the compared range.
Will merge to 'master'.
* cm/rebase-i-updates (2021-02-10) 11 commits
(merged to 'next' on 2021-02-12 at e29227780b)
+ doc/rebase -i: fix typo in the documentation of 'fixup' command
+ t/t3437: fixup the test 'multiple fixup -c opens editor once'
+ t/t3437: use named commits in the tests
+ t/t3437: simplify and document the test helpers
+ t/t3437: check the author date of fixed up commit
+ t/t3437: remove the dependency of 'expected-message' file from tests
+ t/t3437: fixup here-docs in the 'setup' test
+ t/lib-rebase: update the documentation of FAKE_LINES
+ rebase -i: clarify and fix 'fixup -c' rebase-todo help
+ sequencer: rename a few functions
+ sequencer: fixup the datatype of the 'flag' argument
(this branch is used by cm/rebase-i-fixup-amend-reword; uses cm/rebase-i.)
Follow-up fixes to "cm/rebase-i" topic.
Will merge to 'master', together with "cm/rebase-i".
* cw/pack-vs-bigfilethreashold (2021-02-09) 2 commits
- fixup! doc: mention bigFileThreshold for packing
- doc: mention bigFileThreshold for packing
Doc update.
Expecting a reroll.
cf. <F63929A8-7BC9-43A7-9E7B-118433F62588@gmx.ch>
* ds/maintenance-pack-refs (2021-02-09) 2 commits
(merged to 'next' on 2021-02-11 at 36f56bc9ec)
+ maintenance: incremental strategy runs pack-refs weekly
+ maintenance: add pack-refs task
"git maintenance" tool learned a new "pack-refs" maintenance task.
Will merge to 'master'.
* jk/mailmap-only-at-root (2021-02-10) 1 commit
(merged to 'next' on 2021-02-10 at fbd122fd6c)
+ mailmap: only look for .mailmap in work tree
The .mailmap is documented to be read only from the root level of a
working tree, but a stray file in a bare repository also was read
by accident, which has been corrected.
Will merge to 'master'.
* jk/rev-list-disk-usage (2021-02-11) 2 commits
(merged to 'next' on 2021-02-11 at 6fb701f287)
+ rev-list: add --disk-usage option for calculating disk usage
+ t: add --no-tag option to test_commit
(this branch is used by ab/pickaxe-pcre2.)
"git rev-list" command learned "--disk-usage" option.
Will merge to 'master'.
* jt/trace2-BUG (2021-02-09) 1 commit
(merged to 'next' on 2021-02-09 at 94911ad676)
+ usage: trace2 BUG() invocations
Even though invocations of "die()" were logged to the trace2
system, "BUG()"s were not, which has been corrected.
Will merge to 'master'.
* mt/checkout-index-corner-cases (2021-02-16) 2 commits
- checkout-index: omit entries with no tempname from --temp output
- write_entry(): fix misuses of `path` in error messages
The error codepath around the "--temp/--prefix" feature of "git
checkout-index" has been improved.
Will merge to 'next'.
* mt/grep-cached-untracked (2021-02-09) 1 commit
(merged to 'next' on 2021-02-10 at e1fca79104)
+ grep: error out if --untracked is used with --cached
"git grep --untracked" is meant to be "let's ALSO find in these
files on the filesystem" when looking for matches in the working
tree files, and does not make any sense if the primary search is
done against the index, or the tree objects. The "--cached" and
"--untracked" options have been marked as mutually incompatible.
Will merge to 'master'.
* ab/test-lib (2021-02-12) 11 commits
(merged to 'next' on 2021-02-12 at 666a0422dc)
+ test-lib-functions: assert correct parameter count
+ test-lib-functions: remove bug-inducing "diagnostics" helper param
+ test libs: rename "diff-lib" to "lib-diff"
+ t/.gitattributes: sort lines
+ test-lib-functions: move function to lib-bitmap.sh
+ test libs: rename gitweb-lib.sh to lib-gitweb.sh
+ test libs: rename bundle helper to "lib-bundle.sh"
+ test-lib-functions: remove generate_zero_bytes() wrapper
+ test-lib-functions: move test_set_index_version() to its user
+ test lib: change "error" to "BUG" as appropriate
+ test-lib: remove check_var_migration
(this branch is used by ab/pickaxe-pcre2.)
Test framework clean-up.
Will merge to 'master'.
* dl/stash-cleanup (2021-02-11) 7 commits
(merged to 'next' on 2021-02-11 at ae1cde1380)
+ stash: declare ref_stash as an array
+ t3905: use test_cmp() to check file contents
+ t3905: replace test -s with test_file_not_empty
+ t3905: remove nested git in command substitution
+ t3905: move all commands into test cases
+ t3905: remove spaces after redirect operators
+ git-stash.txt: be explicit about subcommand options
(this branch is used by dl/stash-show-untracked.)
Documentation, code and test clean-up around "git stash".
Will merge to 'master'.
This is an early part of a topic that added a new feature to the
command, but the implementation is expected to need a handful of
iterations; I split the preparatory part up to fast-track it.
* ew/rev-parse-since-test (2021-02-10) 1 commit
(merged to 'next' on 2021-02-11 at 2490918be8)
+ t1500: ensure current --since= behavior remains
Test to make sure "git rev-parse one-thing one-thing" gives
the same thing twice (when one-thing is --since=X).
Will merge to 'master'.
* js/fsck-name-objects-fix (2021-02-10) 2 commits
(merged to 'next' on 2021-02-10 at 79afd7ebdc)
+ fsck --name-objects: be more careful parsing generation numbers
+ t1450: robustify `remove_object()`
Fix "git fsck --name-objects" which apparently has not been used by
anybody who is motivated enough to report breakage.
Will merge to 'master'.
* sv/t7001-modernize (2021-02-11) 10 commits
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use '>' rather than 'touch'
- t7001: avoid using `cd` outside of subshells
- t7001: remove whitespace after redirect operators
- t7001: modernize subshell formatting
- t7001: remove unnecessary blank lines
- t7001: indent with TABs instead of spaces
- t7001: modernize test formatting
Test script modernization.
Expecting the final version with corrected author attribution.
* mt/grep-sparse-checkout (2021-02-09) 1 commit
- grep: honor sparse-checkout on working tree searches
"git grep" has been tweaked to be limited to the sparse checkout
paths.
Break out and fast-track bugfix from the remainder of the topic.
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* ds/commit-graph-genno-fix (2021-02-01) 6 commits
(merged to 'next' on 2021-02-03 at b3a9e11efb)
+ commit-graph: prepare commit graph
+ commit-graph: be extra careful about mixed generations
+ commit-graph: compute generations separately
+ commit-graph: validate layers for generation data
+ commit-graph: always parse before commit_graph_data_at()
+ commit-graph: use repo_parse_commit
(this branch uses ak/corrected-commit-date; is tangled with ds/chunked-file-api and ds/merge-base-independent.)
Fix incremental update of commit-graph file around corrected commit
date data.
Will merge to 'master', together with "ak/corrected-commit-date".
* jh/simple-ipc (2021-02-17) 12 commits
- t0052: add simple-ipc tests and t/helper/test-simple-ipc tool
- simple-ipc: add Unix domain socket implementation
- unix-socket: create `unix_stream_server__listen_with_lock()`
- unix-socket: disallow chdir() when creating unix domain sockets
- unix-socket: add backlog size option to unix_stream_listen()
- unix-socket: elimiate static unix_stream_socket() helper function
- simple-ipc: add win32 implementation
- simple-ipc: design documentation for new IPC mechanism
- pkt-line: add options argument to read_packetized_to_strbuf()
- pkt-line: (optionally) libify the packet readers
- pkt-line: do not issue flush packets in write_packetized_*()
- pkt-line: eliminate the need for static buffer in packet_write_gently()
A simple IPC interface gets introduced to build services like
fsmonitor on top.
* ab/pager-exit-log (2021-02-01) 4 commits
(merged to 'next' on 2021-02-12 at ffe9f2d364)
+ pager: properly log pager exit code when signalled
+ run-command: add braces for "if" block in wait_or_whine()
+ pager: test for exit code with and without SIGPIPE
+ pager: refactor wait_for_pager() function
When a pager spawned by us exited, the trace log did not record its
exit status correctly, which has been corrected.
Will merge to 'master'.
The original "what should we do with SIGPIPE?" question remains, though.
* ta/hash-function-transition-doc (2021-02-05) 6 commits
(merged to 'next' on 2021-02-12 at f620f3cfd3)
+ doc: use https links
+ doc hash-function-transition: move rationale upwards
+ doc hash-function-transition: fix incomplete sentence
+ doc hash-function-transition: use upper case consistently
+ doc hash-function-transition: use SHA-1 and SHA-256 consistently
+ doc hash-function-transition: fix asciidoc output
Update formatting and grammar of the hash transition plan
documentation, plus some updates.
Will merge to 'master'.
* ds/chunked-file-api (2021-02-05) 17 commits
- chunk-format: add technical docs
- chunk-format: restore duplicate chunk checks
- midx: use 64-bit multiplication for chunk sizes
- midx: use chunk-format read API
- commit-graph: use chunk-format read API
- chunk-format: create read chunk API
- midx: use chunk-format API in write_midx_internal()
- midx: drop chunk progress during write
- midx: return success/failure in chunk write methods
- midx: add num_large_offsets to write_midx_context
- midx: add pack_perm to write_midx_context
- midx: add entries to write_midx_context
- midx: use context in write_midx_pack_names()
- midx: rename pack_info to write_midx_context
- commit-graph: use chunk-format write API
- chunk-format: create chunk format write API
- commit-graph: anonymize data in chunk_write_fn
(this branch uses ak/corrected-commit-date; is tangled with ds/commit-graph-genno-fix and ds/merge-base-independent.)
The common code to deal with "chunked file format" that is shared
by the multi-pack-index and commit-graph files have been factored
out, to help codepaths for both filetypes to become more rebust.
Getting there.
* ds/merge-base-independent (2021-02-01) 5 commits
- commit-reach: stale commits may prune generation further
- commit-reach: use heuristic in remove_redundant()
- commit-reach: move compare_commits_by_gen
- commit-reach: use one walk in remove_redundant()
- commit-reach: reduce requirements for remove_redundant()
(this branch uses ak/corrected-commit-date; is tangled with ds/chunked-file-api and ds/commit-graph-genno-fix.)
The code to implement "git merge-base --independent" was poorly
done and was kept from the very beginning of the feature.
* hv/trailer-formatting (2021-02-15) 4 commits
- ref-filter: use pretty.c logic for trailers
- pretty.c: capture invalid trailer argument
- pretty.c: refactor trailer logic to `format_set_trailers_options()`
- t6300: use function to test trailer options
The logic to handle "trailer" related placeholders in the
"--format=" mechanisms in the "log" family and "for-each-ref"
family is getting unified.
Ready for 'next'?
* sh/mergetool-hideresolved (2021-02-09) 3 commits
(merged to 'next' on 2021-02-09 at c3ed19b2ec)
+ mergetool: add per-tool support and overrides for the hideResolved flag
+ mergetool: break setup_tool out into separate initialization function
+ mergetool: add hideResolved configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Will merge to 'master'.
* cm/rebase-i (2021-01-29) 9 commits
(merged to 'next' on 2021-02-01 at 4f9aa6cec3)
+ doc/git-rebase: add documentation for fixup [-C|-c] options
+ rebase -i: teach --autosquash to work with amend!
+ t3437: test script for fixup [-C|-c] options in interactive rebase
+ rebase -i: add fixup [-C | -c] command
+ sequencer: use const variable for commit message comments
+ sequencer: pass todo_item to do_pick_commit()
+ rebase -i: comment out squash!/fixup! subjects from squash message
+ sequencer: factor out code to append squash message
+ rebase -i: only write fixup-message when it's needed
(this branch is used by cm/rebase-i-fixup-amend-reword and cm/rebase-i-updates.)
"rebase -i" is getting cleaned up and also enhanced.
Will merge to 'master', together with "cm/rebase-i-updates".
* tb/geometric-repack (2021-02-03) 8 commits
- builtin/repack.c: add '--geometric' option
- packfile: add kept-pack cache for find_kept_pack_entry()
- builtin/pack-objects.c: rewrite honor-pack-keep logic
- p5303: measure time to repack with keep
- p5303: add missing &&-chains
- builtin/pack-objects.c: add '--stdin-packs' option
- revision: learn '--no-kept-objects'
- packfile: introduce 'find_kept_pack_entry()'
"git repack" so far has been only capable of repacking everything
under the sun into a single pack (or split by size). A cleverer
strategy to reduce the cost of repacking a repository has been
introduced.
* ah/rebase-no-fork-point-config (2021-01-21) 1 commit
- rebase: add a config option for --no-fork-point
"git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.
Expecting a reroll to update its tests.
cf. <CAMMLpeTDNLUz9UVnL3aVK=J7X50Sq8L-OVGaoEsT5AY6EQON-g@mail.gmail.com>
* js/range-diff-wo-dotdot (2021-02-06) 3 commits
(merged to 'next' on 2021-02-08 at 9ae8b46d99)
+ range-diff(docs): explain how to specify commit ranges
+ range-diff/format-patch: handle commit ranges other than A..B
+ range-diff/format-patch: refactor check for commit range
There are other ways than ".." for a single token to denote a
"commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
range-diff" did not understand them.
Will merge to 'master'.
* jx/t5411-unique-filenames (2021-01-22) 2 commits
(merged to 'next' on 2021-02-11 at bc5c67f70f)
+ t5411: refactor check of refs using test_cmp_refs
+ t5411: use different out file to prevent overwriting
Avoid individual tests in t5411 from getting affected by each other
by forcing them to use separate output files during the test.
Will merge to 'master'.
* jt/transfer-fsck-across-packs (2021-01-25) 5 commits
- SQUASH??? test fix
- fetch-pack: print and use dangling .gitmodules
- fetch-pack: with packfile URIs, use index-pack arg
- http-fetch: allow custom index-pack args
- http: allow custom index-pack args
The approach to "fsck" the incoming objects in "index-pack" is
attractive for performance reasons (we have them already in core,
inflated and ready to be inspected), but fundamentally cannot be
applied fully when we receive more than one pack stream, as a tree
object in one pack may refer to a blob object in another pack as
".gitmodules", when we want to inspect blobs that are used as
".gitmodules" file, for example. Teach "index-pack" to emit
objects that must be inspected later and check them in the calling
"fetch-pack" process.
Expecting an update.
* bc/signed-objects-with-both-hashes (2021-02-10) 6 commits
(merged to 'next' on 2021-02-11 at 391cc85104)
+ gpg-interface: remove other signature headers before verifying
+ ref-filter: hoist signature parsing
+ commit: allow parsing arbitrary buffers with headers
+ gpg-interface: improve interface for parsing tags
+ commit: ignore additional signatures when parsing signed commits
+ ref-filter: switch some uses of unsigned long to size_t
Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
Will merge to 'master'.
* ak/corrected-commit-date (2021-01-18) 11 commits
(merged to 'next' on 2021-01-26 at deae33ec7d)
+ doc: add corrected commit date info
+ commit-reach: use corrected commit dates in paint_down_to_common()
+ commit-graph: use generation v2 only if entire chain does
+ commit-graph: implement generation data chunk
+ commit-graph: implement corrected commit date
+ commit-graph: return 64-bit generation number
+ commit-graph: add a slab to store topological levels
+ t6600-test-reach: generalize *_three_modes
+ commit-graph: consolidate fill_commit_graph_info
+ revision: parse parent in indegree_walk_step()
+ commit-graph: fix regression when computing Bloom filters
(this branch is used by ds/chunked-file-api, ds/commit-graph-genno-fix and ds/merge-base-independent.)
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Will merge to 'master', together with "ds/commit-graph-genno-fix".
* mr/bisect-in-c-4 (2021-02-03) 7 commits
(merged to 'next' on 2021-02-05 at ea18026619)
+ bisect--helper: retire `--check-and-set-terms` subcommand
+ bisect--helper: reimplement `bisect_skip` shell function in C
+ bisect--helper: retire `--bisect-auto-next` subcommand
+ bisect--helper: use `res` instead of return in BISECT_RESET case option
+ bisect--helper: retire `--bisect-write` subcommand
+ bisect--helper: reimplement `bisect_replay` shell function in C
+ bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
Will merge to 'master'.
* jt/clone-unborn-head (2021-02-05) 3 commits
(merged to 'next' on 2021-02-08 at 3ba9f80e7f)
+ clone: respect remote unborn HEAD
+ connect, transport: encapsulate arg in struct
+ ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
Will merge to 'master'.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* es/config-hooks (2021-02-16) 17 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
(this branch uses es/config-hooks-part-1.)
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
--------------------------------------------------
[Discarded]
* ds/update-index (2021-01-09) 14 commits
. update-index: remove static globals from callbacks
. update-index: reduce static globals, part 2
. update-index: reduce static globals, part 1
. update-index: remove ce_match_stat(), all macros
. update-index: replace several compatibility macros
. update-index: use add_index_entry()
. update-index: use remove_file_from_index()
. update-index: use index_name_pos() over cache_name_pos()
. update-index: use istate->cache_changed
. update-index: use istate->cache_nr over active_nr
. update-index: use istate->cache over active_cache
. update-index: drop the_index, the_repository
. rm: remove compatilibity macros
. mv: remove index compatibility macros
(this branch uses ag/merge-strategies-in-c.)
The implementation of a few commands lost reliance of "the_index"
compatibility macros by explicitly passing the index_state through
the callchain.
Retracted for now.
cf. <a6906459-3a93-ecad-c460-b6c763819389@gmail.com>
* fc/mergetool-automerge (2021-01-09) 8 commits
. fixup! mergetool: break setup_tool out into separate initialization function
. fixup! fixup! mergetool: add automerge configuration
. fixup! mergetool: add automerge configuration
. mergetool: add automerge_enabled tool-specific override function
. mergetool: break setup_tool out into separate initialization function
. mergetool: add per-tool support for the autoMerge flag
. mergetool: alphabetize the mergetool config docs
. mergetool: add automerge configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Superseded by the sh/mergetool-hideresolved topic.
* mt/rm-sparse-checkout (2020-12-08) 11 commits
. rm: honor sparse checkout patterns
. t7817: do not depend on any specific default branch name
. config: add setting to ignore sparsity patterns in some cmds
. grep: honor sparse checkout patterns
. config: correctly read worktree configs in submodules
. config: make do_git_config_sequence receive a 'struct repository'
. t/helper/test-config: unify exit labels
. t/helper/test-config: diagnose missing arguments
. t/helper/test-config: be consistent with exit codes
. t1308-config-set: avoid false positives when using test-config
. doc: grep: unify info on configuration variables
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Discarded for now, as it depends on an old iteration of
mt/grep-sparse-checkout topic.
* fc/bash-completion-post-2.29 (2020-12-23) 4 commits
. 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.*
Stalled for too long with breakage.
Seems to break tests on Windows
* ss/submodule-add-in-c (2020-12-15) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Stalled for too long with breakage.
The patches are split incorrectly; part of 1/3 belongs to 2/3
cf. <nycvar.QRO.7.76.6.2012190104140.56@tvgsbejvaqbjf.bet>
It seems to introduce a segfault on 'seen'.
cf. <xmqqft3xflw7.fsf@gitster.c.googlers.com>
^ permalink raw reply [relevance 4%]
* Re: [PATCH v3 00/10] Modernizing the t7001 test script
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
` (9 preceding siblings ...)
2021-02-11 19:47 16% ` [PATCH v3 10/10] t7001: use `test` rather than `[` Shubham Verma
@ 2021-02-11 21:44 6% ` Junio C Hamano
2021-02-23 8:26 11% ` Shubham Verma
10 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2021-02-11 21:44 UTC (permalink / raw)
To: Shubham Verma; +Cc: git, Eric Sunshine
Shubham Verma <shubhunic@gmail.com> writes:
> In this patch series modernize the t7001 test script by changing the
> style of its tests from an old one to the modern one and by cleaning
> up the test script.
>
> Changes since v2:
>
> - Correct the author name spelling
>
> Thanks everyone for your feedback and suggestions.
I've compared between v2 and v3 and verified the only change is the
name spelling, so I'll port over Eric's reviewed-by's from the
previous round.
Thanks.
^ permalink raw reply [relevance 6%]
* [PATCH v3 08/10] t7001: put each command on a separate line
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
` (6 preceding siblings ...)
2021-02-11 19:47 19% ` [PATCH v3 07/10] t7001: use '>' rather than 'touch' Shubham Verma
@ 2021-02-11 19:47 19% ` Shubham Verma
2021-02-11 19:47 19% ` [PATCH v3 09/10] t7001: use here-docs instead of echo Shubham Verma
` (2 subsequent siblings)
10 siblings, 0 replies; 200+ results
From: Shubham Verma @ 2021-02-11 19:47 UTC (permalink / raw)
To: git
Modern practice is to avoid multiple commands per line, and
instead place each command on its own line.
Signed-off-by: Shubham Verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index a56580b26d..93d6767951 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -145,7 +145,9 @@ test_expect_success 'checking the commit' '
'
test_expect_success 'do not move directory over existing directory' '
- mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
+ mkdir path0 &&
+ mkdir path0/path2 &&
+ test_must_fail git mv path2 path0
'
test_expect_success 'move into "."' '
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH v3 09/10] t7001: use here-docs instead of echo
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
` (7 preceding siblings ...)
2021-02-11 19:47 19% ` [PATCH v3 08/10] t7001: put each command on a separate line Shubham Verma
@ 2021-02-11 19:47 19% ` Shubham Verma
2021-02-11 19:47 16% ` [PATCH v3 10/10] t7001: use `test` rather than `[` Shubham Verma
2021-02-11 21:44 6% ` [PATCH v3 00/10] Modernizing the t7001 test script Junio C Hamano
10 siblings, 0 replies; 200+ results
From: Shubham Verma @ 2021-02-11 19:47 UTC (permalink / raw)
To: git
Change from old style to current style by taking advantage of
here-docs instead of echo commands.
Signed-off-by: Shubham Verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 93d6767951..36a274e96d 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -228,7 +228,10 @@ test_expect_success 'git mv to move multiple sources into a directory' '
git add dir/?.txt &&
git mv dir/a.txt dir/b.txt other &&
git ls-files >actual &&
- { echo other/a.txt; echo other/b.txt; } >expect &&
+ cat >expect <<-\EOF &&
+ other/a.txt
+ other/b.txt
+ EOF
test_cmp expect actual
'
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH v3 07/10] t7001: use '>' rather than 'touch'
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
` (5 preceding siblings ...)
2021-02-11 19:47 15% ` [PATCH v3 06/10] t7001: avoid using `cd` outside of subshells Shubham Verma
@ 2021-02-11 19:47 19% ` Shubham Verma
2021-02-11 19:47 19% ` [PATCH v3 08/10] t7001: put each command on a separate line Shubham Verma
` (3 subsequent siblings)
10 siblings, 0 replies; 200+ results
From: Shubham Verma @ 2021-02-11 19:47 UTC (permalink / raw)
To: git
Use `>` rather than `touch` to create an empty file when the
timestamp isn't relevant to the test.
Signed-off-by: Shubham Verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 6412c4f882..a56580b26d 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -49,14 +49,14 @@ test_expect_success 'checking -k on non-existing file' '
'
test_expect_success 'checking -k on untracked file' '
- touch untracked1 &&
+ >untracked1 &&
git mv -k untracked1 path0 &&
test -f untracked1 &&
test ! -f path0/untracked1
'
test_expect_success 'checking -k on multiple untracked files' '
- touch untracked2 &&
+ >untracked2 &&
git mv -k untracked1 untracked2 path0 &&
test -f untracked1 &&
test -f untracked2 &&
@@ -65,7 +65,7 @@ test_expect_success 'checking -k on multiple untracked files' '
'
test_expect_success 'checking -f on untracked file with existing target' '
- touch path0/untracked1 &&
+ >path0/untracked1 &&
test_must_fail git mv -f untracked1 path0 &&
test ! -f .git/index.lock &&
test -f untracked1 &&
@@ -488,7 +488,7 @@ test_expect_success 'moving nested submodules' '
mkdir sub_nested_nested &&
(
cd sub_nested_nested &&
- touch nested_level2 &&
+ >nested_level2 &&
git init &&
git add . &&
git commit -m "nested level 2"
@@ -496,7 +496,7 @@ test_expect_success 'moving nested submodules' '
mkdir sub_nested &&
(
cd sub_nested &&
- touch nested_level1 &&
+ >nested_level1 &&
git init &&
git add . &&
git commit -m "nested level 1" &&
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH v3 04/10] t7001: modernize subshell formatting
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
` (2 preceding siblings ...)
2021-02-11 19:46 17% ` [PATCH v3 03/10] t7001: remove unnecessary blank lines Shubham Verma
@ 2021-02-11 19:46 17% ` Shubham Verma
2021-02-11 19:46 19% ` [PATCH v3 05/10] t7001: remove whitespace after redirect operators Shubham Verma
` (6 subsequent siblings)
10 siblings, 0 replies; 200+ results
From: Shubham Verma @ 2021-02-11 19:46 UTC (permalink / raw)
To: git
Some test use an old style for formatting subshells:
(command &&
...
Update them to the modern style:
(
command &&
...
Signed-off-by: Shubham Verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 74 ++++++++++++++++++++++++++++-----------------------
1 file changed, 40 insertions(+), 34 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index e98b44f7a1..7fd4341988 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -181,38 +181,42 @@ test_expect_success "Sergey Vlasov's test case" '
git mv ab a
'
-test_expect_success 'absolute pathname' '(
- rm -fr mine &&
- mkdir mine &&
- cd mine &&
- test_create_repo one &&
- cd one &&
- mkdir sub &&
- >sub/file &&
- git add sub/file &&
-
- git mv sub "$(pwd)/in" &&
- ! test -d sub &&
- test -d in &&
- git ls-files --error-unmatch in/file
-)'
-
-test_expect_success 'absolute pathname outside should fail' '(
- rm -fr mine &&
- mkdir mine &&
- cd mine &&
- out=$(pwd) &&
- test_create_repo one &&
- cd one &&
- mkdir sub &&
- >sub/file &&
- git add sub/file &&
-
- test_must_fail git mv sub "$out/out" &&
- test -d sub &&
- ! test -d ../in &&
- git ls-files --error-unmatch sub/file
-)'
+test_expect_success 'absolute pathname' '
+ (
+ rm -fr mine &&
+ mkdir mine &&
+ cd mine &&
+ test_create_repo one &&
+ cd one &&
+ mkdir sub &&
+ >sub/file &&
+ git add sub/file &&
+
+ git mv sub "$(pwd)/in" &&
+ ! test -d sub &&
+ test -d in &&
+ git ls-files --error-unmatch in/file
+ )
+'
+
+test_expect_success 'absolute pathname outside should fail' '
+ (
+ rm -fr mine &&
+ mkdir mine &&
+ cd mine &&
+ out=$(pwd) &&
+ test_create_repo one &&
+ cd one &&
+ mkdir sub &&
+ >sub/file &&
+ git add sub/file &&
+
+ test_must_fail git mv sub "$out/out" &&
+ test -d sub &&
+ ! test -d ../in &&
+ git ls-files --error-unmatch sub/file
+ )
+'
test_expect_success 'git mv to move multiple sources into a directory' '
rm -fr .git && git init &&
@@ -503,14 +507,16 @@ test_expect_success 'moving a submodule in nested directories' '
test_expect_success 'moving nested submodules' '
git commit -am "cleanup commit" &&
mkdir sub_nested_nested &&
- (cd sub_nested_nested &&
+ (
+ cd sub_nested_nested &&
touch nested_level2 &&
git init &&
git add . &&
git commit -m "nested level 2"
) &&
mkdir sub_nested &&
- (cd sub_nested &&
+ (
+ cd sub_nested &&
touch nested_level1 &&
git init &&
git add . &&
--
2.25.1
^ permalink raw reply related [relevance 17%]
* [PATCH v3 10/10] t7001: use `test` rather than `[`
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
` (8 preceding siblings ...)
2021-02-11 19:47 19% ` [PATCH v3 09/10] t7001: use here-docs instead of echo Shubham Verma
@ 2021-02-11 19:47 16% ` Shubham Verma
2021-02-11 21:44 6% ` [PATCH v3 00/10] Modernizing the t7001 test script Junio C Hamano
10 siblings, 0 replies; 200+ results
From: Shubham Verma @ 2021-02-11 19:47 UTC (permalink / raw)
To: git
According to Documentation/CodingGuidelines, we should use "test"
rather than "[ ... ]" in shell scripts, so let's replace the
"[ ... ]" with "test" in the t7001 test script.
Signed-off-by: Shubham Verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 36a274e96d..65807e4873 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -242,10 +242,10 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
git add dirty &&
entry="$(git ls-files --stage dirty | cut -f 1)" &&
git mv dirty dirty2 &&
- [ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" &&
echo 2 >dirty2 &&
git mv dirty2 dirty &&
- [ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
+ test "$entry" = "$(git ls-files --stage dirty | cut -f 1)"
'
rm -f dirty dirty2
@@ -332,7 +332,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
mkdir mod &&
git mv sub mod/sub &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -352,7 +352,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
mkdir mod &&
git mv sub mod/sub &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
@@ -369,7 +369,7 @@ test_expect_success 'git mv moves a submodule with gitfile' '
mkdir mod &&
git -C mod mv ../sub/ . &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
@@ -388,7 +388,7 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -409,7 +409,7 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -427,7 +427,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
git mv sub mod/sub 2>actual.err &&
test_i18ncmp expect.err actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
--
2.25.1
^ permalink raw reply related [relevance 16%]
* [PATCH v3 06/10] t7001: avoid using `cd` outside of subshells
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
` (4 preceding siblings ...)
2021-02-11 19:46 19% ` [PATCH v3 05/10] t7001: remove whitespace after redirect operators Shubham Verma
@ 2021-02-11 19:47 15% ` Shubham Verma
2021-02-11 19:47 19% ` [PATCH v3 07/10] t7001: use '>' rather than 'touch' Shubham Verma
` (4 subsequent siblings)
10 siblings, 0 replies; 200+ results
From: Shubham Verma @ 2021-02-11 19:47 UTC (permalink / raw)
To: git
Avoid using `cd` outside of subshells since, if the test fails,
there is no guarantee that the current working directory is the
expected one, which may cause subsequent tests to run in the wrong
directory.
While at it, make some other tests more concise by replacing
simple subshells with `git -C`.
Signed-off-by: Shubham Verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 43 +++++++++++--------------------------------
1 file changed, 11 insertions(+), 32 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 2e49e9af81..6412c4f882 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -11,12 +11,12 @@ test_expect_success 'prepare reference tree' '
'
test_expect_success 'moving the file out of subdirectory' '
- cd path0 && git mv COPYING ../path1/COPYING
+ git -C path0 mv COPYING ../path1/COPYING
'
# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-out -a
+ git commit -m move-out -a
'
test_expect_success 'checking the commit' '
@@ -25,12 +25,12 @@ test_expect_success 'checking the commit' '
'
test_expect_success 'moving the file back into subdirectory' '
- cd path0 && git mv ../path1/COPYING COPYING
+ git -C path0 mv ../path1/COPYING COPYING
'
# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-in -a
+ git commit -m move-in -a
'
test_expect_success 'checking the commit' '
@@ -328,10 +328,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
git mv sub mod/sub &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -351,10 +348,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
git mv sub mod/sub &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
test_cmp expected actual &&
@@ -368,16 +362,10 @@ test_expect_success 'git mv moves a submodule with gitfile' '
git submodule update &&
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
- (
- cd mod &&
- git mv ../sub/ .
- ) &&
+ git -C mod mv ../sub/ . &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
test_cmp expected actual &&
@@ -396,10 +384,7 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
test_must_be_empty actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -420,10 +405,7 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
test_must_be_empty actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -441,10 +423,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
test_i18ncmp expect.err actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
--
2.25.1
^ permalink raw reply related [relevance 15%]
* [PATCH v3 05/10] t7001: remove whitespace after redirect operators
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
` (3 preceding siblings ...)
2021-02-11 19:46 17% ` [PATCH v3 04/10] t7001: modernize subshell formatting Shubham Verma
@ 2021-02-11 19:46 19% ` Shubham Verma
2021-02-11 19:47 15% ` [PATCH v3 06/10] t7001: avoid using `cd` outside of subshells Shubham Verma
` (5 subsequent siblings)
10 siblings, 0 replies; 200+ results
From: Shubham Verma @ 2021-02-11 19:46 UTC (permalink / raw)
To: git
According to Documentation/CodingGuidelines, there should be no
whitespace after redirect operators. So, we should remove these
whitespaces after redirect operators.
Signed-off-by: Shubham Verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 7fd4341988..2e49e9af81 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -156,9 +156,9 @@ test_expect_success "Michael Cassar's test case" '
rm -fr .git papers partA &&
git init &&
mkdir -p papers/unsorted papers/all-papers partA &&
- echo a > papers/unsorted/Thesis.pdf &&
- echo b > partA/outline.txt &&
- echo c > papers/unsorted/_another &&
+ echo a >papers/unsorted/Thesis.pdf &&
+ echo b >partA/outline.txt &&
+ echo c >papers/unsorted/_another &&
git add papers partA &&
T1=$(git write-tree) &&
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH v3 03/10] t7001: remove unnecessary blank lines
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
2021-02-11 19:46 12% ` [PATCH v3 01/10] t7001: modernize test formatting Shubham Verma
2021-02-11 19:46 13% ` [PATCH v3 02/10] t7001: indent with TABs instead of spaces Shubham Verma
@ 2021-02-11 19:46 17% ` Shubham Verma
2021-02-11 19:46 17% ` [PATCH v3 04/10] t7001: modernize subshell formatting Shubham Verma
` (7 subsequent siblings)
10 siblings, 0 replies; 200+ results
From: Shubham Verma @ 2021-02-11 19:46 UTC (permalink / raw)
To: git
Some tests use a deprecated style in which there are unnecessary
blank lines after the opening quote of the test body and before the
closing quote. So we should remove these unnecessary blank lines.
Signed-off-by: Shubham Verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 0f74c6339c..e98b44f7a1 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -182,7 +182,6 @@ test_expect_success "Sergey Vlasov's test case" '
'
test_expect_success 'absolute pathname' '(
-
rm -fr mine &&
mkdir mine &&
cd mine &&
@@ -196,12 +195,9 @@ test_expect_success 'absolute pathname' '(
! test -d sub &&
test -d in &&
git ls-files --error-unmatch in/file
-
-
)'
test_expect_success 'absolute pathname outside should fail' '(
-
rm -fr mine &&
mkdir mine &&
cd mine &&
@@ -216,7 +212,6 @@ test_expect_success 'absolute pathname outside should fail' '(
test -d sub &&
! test -d ../in &&
git ls-files --error-unmatch sub/file
-
)'
test_expect_success 'git mv to move multiple sources into a directory' '
@@ -232,7 +227,6 @@ test_expect_success 'git mv to move multiple sources into a directory' '
'
test_expect_success 'git mv should not change sha1 of moved cache entry' '
-
rm -fr .git &&
git init &&
echo 1 >dirty &&
@@ -243,7 +237,6 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
echo 2 >dirty2 &&
git mv dirty2 dirty &&
[ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
-
'
rm -f dirty dirty2
@@ -266,7 +259,6 @@ test_expect_success 'git mv error on conflicted file' '
'
test_expect_success 'git mv should overwrite symlink to a file' '
-
rm -fr .git &&
git init &&
echo 1 >moved &&
@@ -279,13 +271,11 @@ test_expect_success 'git mv should overwrite symlink to a file' '
test "$(cat symlink)" = 1 &&
git update-index --refresh &&
git diff-files --quiet
-
'
rm -f moved symlink
test_expect_success 'git mv should overwrite file with a symlink' '
-
rm -fr .git &&
git init &&
echo 1 >moved &&
@@ -296,11 +286,9 @@ test_expect_success 'git mv should overwrite file with a symlink' '
! test -e symlink &&
git update-index --refresh &&
git diff-files --quiet
-
'
test_expect_success SYMLINKS 'check moved symlink' '
-
test -h moved
'
--
2.25.1
^ permalink raw reply related [relevance 17%]
* [PATCH v3 02/10] t7001: indent with TABs instead of spaces
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
2021-02-11 19:46 12% ` [PATCH v3 01/10] t7001: modernize test formatting Shubham Verma
@ 2021-02-11 19:46 13% ` Shubham Verma
2021-02-11 19:46 17% ` [PATCH v3 03/10] t7001: remove unnecessary blank lines Shubham Verma
` (8 subsequent siblings)
10 siblings, 0 replies; 200+ results
From: Shubham Verma @ 2021-02-11 19:46 UTC (permalink / raw)
To: git
Signed-off-by: Shubham Verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 120 +++++++++++++++++++++++++-------------------------
1 file changed, 60 insertions(+), 60 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 4bbb51e578..0f74c6339c 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -4,72 +4,72 @@ test_description='git mv in subdirs'
. ./test-lib.sh
test_expect_success 'prepare reference tree' '
- mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
- git add path0/COPYING &&
- git commit -m add -a
+ mkdir path0 path1 &&
+ cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ git add path0/COPYING &&
+ git commit -m add -a
'
test_expect_success 'moving the file out of subdirectory' '
- cd path0 && git mv COPYING ../path1/COPYING
+ cd path0 && git mv COPYING ../path1/COPYING
'
# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-out -a
+ cd .. && git commit -m move-out -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path1/COPYING" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path1/COPYING" actual
'
test_expect_success 'moving the file back into subdirectory' '
- cd path0 && git mv ../path1/COPYING COPYING
+ cd path0 && git mv ../path1/COPYING COPYING
'
# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-in -a
+ cd .. && git commit -m move-in -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path1/COPYING..*path0/COPYING" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path1/COPYING..*path0/COPYING" actual
'
test_expect_success 'mv --dry-run does not move file' '
- git mv -n path0/COPYING MOVED &&
- test -f path0/COPYING &&
- test ! -f MOVED
+ git mv -n path0/COPYING MOVED &&
+ test -f path0/COPYING &&
+ test ! -f MOVED
'
test_expect_success 'checking -k on non-existing file' '
- git mv -k idontexist path0
+ git mv -k idontexist path0
'
test_expect_success 'checking -k on untracked file' '
- touch untracked1 &&
- git mv -k untracked1 path0 &&
- test -f untracked1 &&
- test ! -f path0/untracked1
+ touch untracked1 &&
+ git mv -k untracked1 path0 &&
+ test -f untracked1 &&
+ test ! -f path0/untracked1
'
test_expect_success 'checking -k on multiple untracked files' '
- touch untracked2 &&
- git mv -k untracked1 untracked2 path0 &&
- test -f untracked1 &&
- test -f untracked2 &&
- test ! -f path0/untracked1 &&
- test ! -f path0/untracked2
+ touch untracked2 &&
+ git mv -k untracked1 untracked2 path0 &&
+ test -f untracked1 &&
+ test -f untracked2 &&
+ test ! -f path0/untracked1 &&
+ test ! -f path0/untracked2
'
test_expect_success 'checking -f on untracked file with existing target' '
- touch path0/untracked1 &&
- test_must_fail git mv -f untracked1 path0 &&
- test ! -f .git/index.lock &&
- test -f untracked1 &&
- test -f path0/untracked1
+ touch path0/untracked1 &&
+ test_must_fail git mv -f untracked1 path0 &&
+ test ! -f .git/index.lock &&
+ test -f untracked1 &&
+ test -f path0/untracked1
'
# clean up the mess in case bad things happen
@@ -79,77 +79,77 @@ rm -f idontexist untracked1 untracked2 \
rmdir path1
test_expect_success 'moving to absent target with trailing slash' '
- test_must_fail git mv path0/COPYING no-such-dir/ &&
- test_must_fail git mv path0/COPYING no-such-dir// &&
- git mv path0/ no-such-dir/ &&
- test_path_is_dir no-such-dir
+ test_must_fail git mv path0/COPYING no-such-dir/ &&
+ test_must_fail git mv path0/COPYING no-such-dir// &&
+ git mv path0/ no-such-dir/ &&
+ test_path_is_dir no-such-dir
'
test_expect_success 'clean up' '
- git reset --hard
+ git reset --hard
'
test_expect_success 'moving to existing untracked target with trailing slash' '
- mkdir path1 &&
- git mv path0/ path1/ &&
- test_path_is_dir path1/path0/
+ mkdir path1 &&
+ git mv path0/ path1/ &&
+ test_path_is_dir path1/path0/
'
test_expect_success 'moving to existing tracked target with trailing slash' '
- mkdir path2 &&
- >path2/file && git add path2/file &&
- git mv path1/path0/ path2/ &&
- test_path_is_dir path2/path0/
+ mkdir path2 &&
+ >path2/file && git add path2/file &&
+ git mv path1/path0/ path2/ &&
+ test_path_is_dir path2/path0/
'
test_expect_success 'clean up' '
- git reset --hard
+ git reset --hard
'
test_expect_success 'adding another file' '
- cp "$TEST_DIRECTORY"/../README.md path0/README &&
- git add path0/README &&
- git commit -m add2 -a
+ cp "$TEST_DIRECTORY"/../README.md path0/README &&
+ git add path0/README &&
+ git commit -m add2 -a
'
test_expect_success 'moving whole subdirectory' '
- git mv path0 path2
+ git mv path0 path2
'
test_expect_success 'commiting the change' '
- git commit -m dir-move -a
+ git commit -m dir-move -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
- grep "^R100..*path0/README..*path2/README" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
+ grep "^R100..*path0/README..*path2/README" actual
'
test_expect_success 'succeed when source is a prefix of destination' '
- git mv path2/COPYING path2/COPYING-renamed
+ git mv path2/COPYING path2/COPYING-renamed
'
test_expect_success 'moving whole subdirectory into subdirectory' '
- git mv path2 path1
+ git mv path2 path1
'
test_expect_success 'commiting the change' '
- git commit -m dir-move -a
+ git commit -m dir-move -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
- grep "^R100..*path2/README..*path1/path2/README" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
+ grep "^R100..*path2/README..*path1/path2/README" actual
'
test_expect_success 'do not move directory over existing directory' '
- mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
+ mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
'
test_expect_success 'move into "."' '
- git mv path1/path2/ .
+ git mv path1/path2/ .
'
test_expect_success "Michael Cassar's test case" '
--
2.25.1
^ permalink raw reply related [relevance 13%]
* [PATCH v3 01/10] t7001: modernize test formatting
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
@ 2021-02-11 19:46 12% ` Shubham Verma
2021-02-11 19:46 13% ` [PATCH v3 02/10] t7001: indent with TABs instead of spaces Shubham Verma
` (9 subsequent siblings)
10 siblings, 0 replies; 200+ results
From: Shubham Verma @ 2021-02-11 19:46 UTC (permalink / raw)
To: git
Some tests in this script are formatted using a very old style:
test_expect_success \
'title' \
'body line 1 &&
body line 2'
Update the formatting to the modern style:
test_expect_success 'title' '
body line 1 &&
body line 2
'
Signed-off-by: Shubham Verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 192 +++++++++++++++++++++++++-------------------------
1 file changed, 96 insertions(+), 96 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 63d5f41a12..4bbb51e578 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -3,74 +3,74 @@
test_description='git mv in subdirs'
. ./test-lib.sh
-test_expect_success \
- 'prepare reference tree' \
- 'mkdir path0 path1 &&
+test_expect_success 'prepare reference tree' '
+ mkdir path0 path1 &&
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
git add path0/COPYING &&
- git commit -m add -a'
+ git commit -m add -a
+'
-test_expect_success \
- 'moving the file out of subdirectory' \
- 'cd path0 && git mv COPYING ../path1/COPYING'
+test_expect_success 'moving the file out of subdirectory' '
+ cd path0 && git mv COPYING ../path1/COPYING
+'
# in path0 currently
-test_expect_success \
- 'commiting the change' \
- 'cd .. && git commit -m move-out -a'
+test_expect_success 'commiting the change' '
+ cd .. && git commit -m move-out -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path1/COPYING" actual'
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path1/COPYING" actual
+'
-test_expect_success \
- 'moving the file back into subdirectory' \
- 'cd path0 && git mv ../path1/COPYING COPYING'
+test_expect_success 'moving the file back into subdirectory' '
+ cd path0 && git mv ../path1/COPYING COPYING
+'
# in path0 currently
-test_expect_success \
- 'commiting the change' \
- 'cd .. && git commit -m move-in -a'
-
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path1/COPYING..*path0/COPYING" actual'
-
-test_expect_success \
- 'mv --dry-run does not move file' \
- 'git mv -n path0/COPYING MOVED &&
+test_expect_success 'commiting the change' '
+ cd .. && git commit -m move-in -a
+'
+
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path1/COPYING..*path0/COPYING" actual
+'
+
+test_expect_success 'mv --dry-run does not move file' '
+ git mv -n path0/COPYING MOVED &&
test -f path0/COPYING &&
- test ! -f MOVED'
+ test ! -f MOVED
+'
-test_expect_success \
- 'checking -k on non-existing file' \
- 'git mv -k idontexist path0'
+test_expect_success 'checking -k on non-existing file' '
+ git mv -k idontexist path0
+'
-test_expect_success \
- 'checking -k on untracked file' \
- 'touch untracked1 &&
+test_expect_success 'checking -k on untracked file' '
+ touch untracked1 &&
git mv -k untracked1 path0 &&
test -f untracked1 &&
- test ! -f path0/untracked1'
+ test ! -f path0/untracked1
+'
-test_expect_success \
- 'checking -k on multiple untracked files' \
- 'touch untracked2 &&
+test_expect_success 'checking -k on multiple untracked files' '
+ touch untracked2 &&
git mv -k untracked1 untracked2 path0 &&
test -f untracked1 &&
test -f untracked2 &&
test ! -f path0/untracked1 &&
- test ! -f path0/untracked2'
+ test ! -f path0/untracked2
+'
-test_expect_success \
- 'checking -f on untracked file with existing target' \
- 'touch path0/untracked1 &&
+test_expect_success 'checking -f on untracked file with existing target' '
+ touch path0/untracked1 &&
test_must_fail git mv -f untracked1 path0 &&
test ! -f .git/index.lock &&
test -f untracked1 &&
- test -f path0/untracked1'
+ test -f path0/untracked1
+'
# clean up the mess in case bad things happen
rm -f idontexist untracked1 untracked2 \
@@ -78,79 +78,79 @@ rm -f idontexist untracked1 untracked2 \
.git/index.lock
rmdir path1
-test_expect_success \
- 'moving to absent target with trailing slash' \
- 'test_must_fail git mv path0/COPYING no-such-dir/ &&
+test_expect_success 'moving to absent target with trailing slash' '
+ test_must_fail git mv path0/COPYING no-such-dir/ &&
test_must_fail git mv path0/COPYING no-such-dir// &&
git mv path0/ no-such-dir/ &&
- test_path_is_dir no-such-dir'
+ test_path_is_dir no-such-dir
+'
-test_expect_success \
- 'clean up' \
- 'git reset --hard'
+test_expect_success 'clean up' '
+ git reset --hard
+'
-test_expect_success \
- 'moving to existing untracked target with trailing slash' \
- 'mkdir path1 &&
+test_expect_success 'moving to existing untracked target with trailing slash' '
+ mkdir path1 &&
git mv path0/ path1/ &&
- test_path_is_dir path1/path0/'
+ test_path_is_dir path1/path0/
+'
-test_expect_success \
- 'moving to existing tracked target with trailing slash' \
- 'mkdir path2 &&
+test_expect_success 'moving to existing tracked target with trailing slash' '
+ mkdir path2 &&
>path2/file && git add path2/file &&
git mv path1/path0/ path2/ &&
- test_path_is_dir path2/path0/'
+ test_path_is_dir path2/path0/
+'
-test_expect_success \
- 'clean up' \
- 'git reset --hard'
+test_expect_success 'clean up' '
+ git reset --hard
+'
-test_expect_success \
- 'adding another file' \
- 'cp "$TEST_DIRECTORY"/../README.md path0/README &&
+test_expect_success 'adding another file' '
+ cp "$TEST_DIRECTORY"/../README.md path0/README &&
git add path0/README &&
- git commit -m add2 -a'
+ git commit -m add2 -a
+'
-test_expect_success \
- 'moving whole subdirectory' \
- 'git mv path0 path2'
+test_expect_success 'moving whole subdirectory' '
+ git mv path0 path2
+'
-test_expect_success \
- 'commiting the change' \
- 'git commit -m dir-move -a'
+test_expect_success 'commiting the change' '
+ git commit -m dir-move -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
- grep "^R100..*path0/README..*path2/README" actual'
+ grep "^R100..*path0/README..*path2/README" actual
+'
-test_expect_success \
- 'succeed when source is a prefix of destination' \
- 'git mv path2/COPYING path2/COPYING-renamed'
+test_expect_success 'succeed when source is a prefix of destination' '
+ git mv path2/COPYING path2/COPYING-renamed
+'
-test_expect_success \
- 'moving whole subdirectory into subdirectory' \
- 'git mv path2 path1'
+test_expect_success 'moving whole subdirectory into subdirectory' '
+ git mv path2 path1
+'
-test_expect_success \
- 'commiting the change' \
- 'git commit -m dir-move -a'
+test_expect_success 'commiting the change' '
+ git commit -m dir-move -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
- grep "^R100..*path2/README..*path1/path2/README" actual'
+ grep "^R100..*path2/README..*path1/path2/README" actual
+'
-test_expect_success \
- 'do not move directory over existing directory' \
- 'mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0'
+test_expect_success 'do not move directory over existing directory' '
+ mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
+'
-test_expect_success \
- 'move into "."' \
- 'git mv path1/path2/ .'
+test_expect_success 'move into "."' '
+ git mv path1/path2/ .
+'
test_expect_success "Michael Cassar's test case" '
rm -fr .git papers partA &&
--
2.25.1
^ permalink raw reply related [relevance 12%]
* [PATCH v3 00/10] Modernizing the t7001 test script
@ 2021-02-11 19:46 15% Shubham Verma
2021-02-11 19:46 12% ` [PATCH v3 01/10] t7001: modernize test formatting Shubham Verma
` (10 more replies)
0 siblings, 11 replies; 200+ results
From: Shubham Verma @ 2021-02-11 19:46 UTC (permalink / raw)
To: git
In this patch series modernize the t7001 test script by changing the
style of its tests from an old one to the modern one and by cleaning
up the test script.
Changes since v2:
- Correct the author name spelling
Thanks everyone for your feedback and suggestions.
Shubham Verma (10):
t7001: modernize test formatting
t7001: indent with TABs instead of spaces
t7001: remove unnecessary blank lines
t7001: modernize subshell formatting
t7001: remove whitespace after redirect operators
t7001: avoid using `cd` outside of subshells
t7001: use '>' rather than 'touch'
t7001: put each command on a separate line
t7001: use here-docs instead of echo
t7001: use `test` rather than `[`
t/t7001-mv.sh | 420 ++++++++++++++++++++++++--------------------------
1 file changed, 199 insertions(+), 221 deletions(-)
--
2.25.1
^ permalink raw reply [relevance 15%]
* Re: [PATCH v2 00/10] Modernizing the t7001 test script
2021-02-11 7:37 6% ` Junio C Hamano
@ 2021-02-11 7:56 6% ` Shubham Verma
2021-02-11 7:59 6% ` Eric Sunshine
0 siblings, 1 reply; 200+ results
From: Shubham Verma @ 2021-02-11 7:56 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Eric Sunshine, Git List
Thank You Eric and Junio.
Sorry I forget about spelling.
Okay I will correct it and send a new patch series today.
Thank You!
On Thu, Feb 11, 2021 at 1:07 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Eric Sunshine <sunshine@sunshineco.com> writes:
>
> > On Tue, Feb 9, 2021 at 6:13 PM Junio C Hamano <gitster@pobox.com> wrote:
> >> shubham verma <shubhunic@gmail.com> writes:
> >> > In this patch series modernize the t7001 test script by changing the
> >> > style of its tests from an old one to the modern one and by cleaning
> >> > up the test script.
> >> >
> >> I would have used test_write_lines instead of here-doc in 9/10, but
> >> that is such a minor preference thing that it is not worth going
> >> back and replace. Nothing else stood out during my cursory scan.
> >
> > I read over the entire series and likewise didn't find anything to
> > comment on, thus consider it in good shape. For what it's worth,
> > consider this series:
> >
> > Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
>
> Yup, this one looked good to me. Thanks.
>
> Except that the author's name were spelled in all lowercase, unlike
> v1, which made me wonder if it was intentional, that is.
^ permalink raw reply [relevance 6%]
* Re: [PATCH v2 00/10] Modernizing the t7001 test script
2021-02-11 7:56 6% ` Shubham Verma
@ 2021-02-11 7:59 6% ` Eric Sunshine
0 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2021-02-11 7:59 UTC (permalink / raw)
To: Shubham Verma; +Cc: Junio C Hamano, Git List
On Thu, Feb 11, 2021 at 2:56 AM Shubham Verma <shubhunic@gmail.com> wrote:
> Sorry I forget about spelling.
> Okay I will correct it and send a new patch series today.
Please remember that the spelling of the author (From:) and
Signed-off-by: should be the same.
^ permalink raw reply [relevance 6%]
* Re: [PATCH v2 00/10] Modernizing the t7001 test script
2021-02-11 7:28 6% ` Eric Sunshine
@ 2021-02-11 7:37 6% ` Junio C Hamano
2021-02-11 7:56 6% ` Shubham Verma
0 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2021-02-11 7:37 UTC (permalink / raw)
To: Eric Sunshine; +Cc: shubham verma, Git List
Eric Sunshine <sunshine@sunshineco.com> writes:
> On Tue, Feb 9, 2021 at 6:13 PM Junio C Hamano <gitster@pobox.com> wrote:
>> shubham verma <shubhunic@gmail.com> writes:
>> > In this patch series modernize the t7001 test script by changing the
>> > style of its tests from an old one to the modern one and by cleaning
>> > up the test script.
>> >
>> I would have used test_write_lines instead of here-doc in 9/10, but
>> that is such a minor preference thing that it is not worth going
>> back and replace. Nothing else stood out during my cursory scan.
>
> I read over the entire series and likewise didn't find anything to
> comment on, thus consider it in good shape. For what it's worth,
> consider this series:
>
> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Yup, this one looked good to me. Thanks.
Except that the author's name were spelled in all lowercase, unlike
v1, which made me wonder if it was intentional, that is.
^ permalink raw reply [relevance 6%]
* Re: [PATCH v2 00/10] Modernizing the t7001 test script
2021-02-09 22:58 6% ` Junio C Hamano
@ 2021-02-11 7:28 6% ` Eric Sunshine
2021-02-11 7:37 6% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Eric Sunshine @ 2021-02-11 7:28 UTC (permalink / raw)
To: Junio C Hamano; +Cc: shubham verma, Git List
On Tue, Feb 9, 2021 at 6:13 PM Junio C Hamano <gitster@pobox.com> wrote:
> shubham verma <shubhunic@gmail.com> writes:
> > In this patch series modernize the t7001 test script by changing the
> > style of its tests from an old one to the modern one and by cleaning
> > up the test script.
> >
> I would have used test_write_lines instead of here-doc in 9/10, but
> that is such a minor preference thing that it is not worth going
> back and replace. Nothing else stood out during my cursory scan.
I read over the entire series and likewise didn't find anything to
comment on, thus consider it in good shape. For what it's worth,
consider this series:
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
^ permalink raw reply [relevance 6%]
* [PATCH 0/4] More GETTEXT_POISON removal
@ 2021-02-11 1:53 3% ` Ævar Arnfjörð Bjarmason
2021-02-11 1:53 1% ` [PATCH 4/4] tests: remove most uses of test_i18ncmp Ævar Arnfjörð Bjarmason
1 sibling, 0 replies; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-02-11 1:53 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Johannes Schindelin, SZEDER Gábor, Jiang Xin,
Ævar Arnfjörð Bjarmason
Now that the removal of GETTEXT_POISON is in master follow-up [1] with
some more removal of now-dead code that assumed it still existed.
This leaves no uses of GIT_TEST_GETTEXT_POISON=false or
C_LOCALE_OUTPUT at the end, in 4/4 I'm removing most of test_i18ncmp,
but stopping short of conflicting with other in-flight topics, so once
those land we'll need another cleanup patch to clean up the
stragglers.
As with [1] I'm not touching test_i18ngrep since SZEDER expressed some
interest in retainng it as a generally useful grep with more verbose
debugging.
1. https://lore.kernel.org/git/20210120182759.31102-1-avarab@gmail.com/
Ævar Arnfjörð Bjarmason (4):
tests: remove last uses of GIT_TEST_GETTEXT_POISON=false
tests: remove most uses of C_LOCALE_OUTPUT
tests: remove last uses of C_LOCALE_OUTPUT
tests: remove most uses of test_i18ncmp
t/lib-credential.sh | 2 +-
t/lib-log-graph.sh | 4 +-
t/t0000-basic.sh | 2 +-
t/t0006-date.sh | 4 +-
t/t0008-ignores.sh | 2 +-
t/t0012-help.sh | 2 +-
t/t0018-advice.sh | 4 +-
t/t0020-crlf.sh | 6 +-
t/t0027-auto-crlf.sh | 2 +-
t/t0040-parse-options.sh | 8 +-
t/t0201-gettext-fallbacks.sh | 16 ++--
t/t0300-credentials.sh | 8 +-
t/t0500-progress-display.sh | 22 ++---
t/t1011-read-tree-sparse-checkout.sh | 2 +-
t/t1308-config-set.sh | 4 +-
t/t1400-update-ref.sh | 6 +-
t/t1404-update-ref-errors.sh | 2 +-
t/t1430-bad-ref-name.sh | 2 +-
t/t1450-fsck.sh | 6 +-
t/t1502-rev-parse-parseopt.sh | 10 +-
t/t1506-rev-parse-diagnosis.sh | 2 +-
t/t1507-rev-parse-upstream.sh | 10 +-
t/t1509-root-work-tree.sh | 4 +-
t/t1512-rev-parse-disambiguation.sh | 14 +--
t/t1600-index.sh | 6 +-
t/t2018-checkout-branch.sh | 2 +-
t/t2020-checkout-detach.sh | 20 ++--
t/t2200-add-update.sh | 2 +-
t/t2401-worktree-prune.sh | 4 +-
t/t2402-worktree-list.sh | 2 +-
t/t3005-ls-files-relative.sh | 4 +-
t/t3200-branch.sh | 26 ++---
t/t3201-branch-contains.sh | 2 +-
t/t3203-branch-output.sh | 28 +++---
t/t3300-funny-names.sh | 2 +-
t/t3400-rebase.sh | 2 +-
t/t3404-rebase-interactive.sh | 38 ++++----
t/t3415-rebase-autosquash.sh | 10 +-
t/t3420-rebase-autostash.sh | 4 +-
t/t3504-cherry-pick-rerere.sh | 4 +-
t/t3507-cherry-pick-conflict.sh | 12 +--
t/t3508-cherry-pick-many-commits.sh | 4 +-
t/t3510-cherry-pick-sequence.sh | 8 +-
t/t3600-rm.sh | 16 ++--
t/t3700-add.sh | 8 +-
t/t3701-add-interactive.sh | 4 +-
t/t3800-mktag.sh | 12 +--
t/t3903-stash.sh | 8 +-
t/t3905-stash-include-untracked.sh | 2 +-
t/t4006-diff-mode.sh | 8 +-
t/t4012-diff-binary.sh | 10 +-
t/t4013-diff-various.sh | 2 +-
t/t4014-format-patch.sh | 6 +-
t/t4016-diff-quote.sh | 2 +-
t/t4030-diff-textconv.sh | 2 +-
t/t4045-diff-relative.sh | 2 +-
t/t4049-diff-stat-count.sh | 6 +-
t/t4100-apply-stat.sh | 4 +-
t/t4150-am.sh | 2 +-
t/t4153-am-resume-override-opts.sh | 2 +-
t/t4205-log-pretty-formats.sh | 4 +-
t/t4254-am-corrupt.sh | 2 +-
t/t5150-request-pull.sh | 4 +-
t/t5300-pack-object.sh | 4 +-
t/t5316-pack-delta-depth.sh | 4 +-
t/t5500-fetch-pack.sh | 6 +-
t/t5505-remote.sh | 30 +++---
t/t5510-fetch.sh | 6 +-
t/t5512-ls-remote.sh | 2 +-
t/t5526-fetch-submodules.sh | 38 ++++----
t/t5541-http-push-smart.sh | 2 +-
t/t5601-clone.sh | 2 +-
t/t6020-bundle-misc.sh | 28 +++---
t/t6030-bisect-porcelain.sh | 4 +-
t/t6040-tracking-info.sh | 22 ++---
t/t6120-describe.sh | 2 +-
t/t6134-pathspec-in-submodule.sh | 2 +-
t/t6301-for-each-ref-errors.sh | 10 +-
t/t6423-merge-rename-directories.sh | 2 +-
t/t6436-merge-overwrite.sh | 4 +-
t/t6439-merge-co-error-msgs.sh | 12 +--
t/t7001-mv.sh | 2 +-
t/t7004-tag.sh | 8 +-
t/t7012-skip-worktree-writing.sh | 4 +-
t/t7060-wtstatus.sh | 14 +--
t/t7063-status-untracked-cache.sh | 2 +-
t/t7102-reset.sh | 6 +-
t/t7300-clean.sh | 6 +-
t/t7400-submodule-basic.sh | 4 +-
t/t7401-submodule-summary.sh | 12 +--
t/t7406-submodule-update.sh | 16 ++--
t/t7407-submodule-foreach.sh | 10 +-
t/t7500-commit-template-squash-signoff.sh | 4 +-
t/t7502-commit-porcelain.sh | 6 +-
t/t7505-prepare-commit-msg-hook.sh | 4 +-
t/t7508-status.sh | 110 +++++++++++-----------
t/t7512-status-help.sh | 74 +++++++--------
t/t7519-status-fsmonitor.sh | 4 +-
t/t7521-ignored-mode.sh | 22 ++---
t/t7600-merge.sh | 4 +-
t/t7602-merge-octopus-many.sh | 6 +-
t/t7810-grep.sh | 2 +-
t/t9003-help-autocorrect.sh | 7 +-
t/test-lib.sh | 5 -
104 files changed, 464 insertions(+), 478 deletions(-)
--
2.30.0.284.gd98b1dd5eaa7
^ permalink raw reply [relevance 3%]
* [PATCH 4/4] tests: remove most uses of test_i18ncmp
2021-02-11 1:53 3% ` [PATCH 0/4] More GETTEXT_POISON removal Ævar Arnfjörð Bjarmason
@ 2021-02-11 1:53 1% ` Ævar Arnfjörð Bjarmason
1 sibling, 0 replies; 200+ results
From: Ævar Arnfjörð Bjarmason @ 2021-02-11 1:53 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Johannes Schindelin, SZEDER Gábor, Jiang Xin,
Ævar Arnfjörð Bjarmason
As a follow-up to d162b25f956 (tests: remove support for
GIT_TEST_GETTEXT_POISON, 2021-01-20) remove most uses of test_i18ncmp
via a simple s/test_i18ncmp/test_cmp/g search-replacement.
I'm leaving t6300-for-each-ref.sh out due to a conflict with in-flight
changes between "master" and "seen", as well as the prerequisite
itself due to other changes between "master" and "next/seen" which add
new test_i18ncmp uses.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
t/lib-credential.sh | 2 +-
t/lib-log-graph.sh | 4 +-
t/t0006-date.sh | 4 +-
t/t0008-ignores.sh | 2 +-
t/t0012-help.sh | 2 +-
t/t0018-advice.sh | 4 +-
t/t0027-auto-crlf.sh | 2 +-
t/t0040-parse-options.sh | 8 +-
t/t0201-gettext-fallbacks.sh | 14 +--
t/t0300-credentials.sh | 8 +-
t/t0500-progress-display.sh | 22 ++---
t/t1011-read-tree-sparse-checkout.sh | 2 +-
t/t1308-config-set.sh | 4 +-
t/t1400-update-ref.sh | 6 +-
t/t1404-update-ref-errors.sh | 2 +-
t/t1450-fsck.sh | 6 +-
t/t1502-rev-parse-parseopt.sh | 10 +-
t/t1506-rev-parse-diagnosis.sh | 2 +-
t/t1507-rev-parse-upstream.sh | 10 +-
t/t1509-root-work-tree.sh | 4 +-
t/t1600-index.sh | 6 +-
t/t2018-checkout-branch.sh | 2 +-
t/t2020-checkout-detach.sh | 20 ++--
t/t2200-add-update.sh | 2 +-
t/t2401-worktree-prune.sh | 4 +-
t/t2402-worktree-list.sh | 2 +-
t/t3005-ls-files-relative.sh | 4 +-
t/t3200-branch.sh | 26 ++---
t/t3201-branch-contains.sh | 2 +-
t/t3203-branch-output.sh | 28 +++---
t/t3300-funny-names.sh | 2 +-
t/t3400-rebase.sh | 2 +-
t/t3404-rebase-interactive.sh | 24 ++---
t/t3420-rebase-autostash.sh | 4 +-
t/t3504-cherry-pick-rerere.sh | 4 +-
t/t3507-cherry-pick-conflict.sh | 12 +--
t/t3508-cherry-pick-many-commits.sh | 4 +-
t/t3510-cherry-pick-sequence.sh | 8 +-
t/t3600-rm.sh | 16 ++--
t/t3700-add.sh | 8 +-
t/t3701-add-interactive.sh | 2 +-
t/t3903-stash.sh | 8 +-
t/t3905-stash-include-untracked.sh | 2 +-
t/t4006-diff-mode.sh | 8 +-
t/t4012-diff-binary.sh | 6 +-
t/t4013-diff-various.sh | 2 +-
t/t4014-format-patch.sh | 6 +-
t/t4016-diff-quote.sh | 2 +-
t/t4030-diff-textconv.sh | 2 +-
t/t4045-diff-relative.sh | 2 +-
t/t4049-diff-stat-count.sh | 6 +-
t/t4100-apply-stat.sh | 4 +-
t/t4150-am.sh | 2 +-
t/t4153-am-resume-override-opts.sh | 2 +-
t/t4205-log-pretty-formats.sh | 2 +-
t/t4254-am-corrupt.sh | 2 +-
t/t5150-request-pull.sh | 4 +-
t/t5316-pack-delta-depth.sh | 4 +-
t/t5500-fetch-pack.sh | 6 +-
t/t5505-remote.sh | 24 ++---
t/t5510-fetch.sh | 2 +-
t/t5512-ls-remote.sh | 2 +-
t/t5526-fetch-submodules.sh | 38 ++++----
t/t5541-http-push-smart.sh | 2 +-
t/t6020-bundle-misc.sh | 28 +++---
t/t6030-bisect-porcelain.sh | 4 +-
t/t6040-tracking-info.sh | 22 ++---
t/t6120-describe.sh | 2 +-
t/t6134-pathspec-in-submodule.sh | 2 +-
t/t6301-for-each-ref-errors.sh | 10 +-
t/t6436-merge-overwrite.sh | 4 +-
t/t6439-merge-co-error-msgs.sh | 12 +--
t/t7001-mv.sh | 2 +-
t/t7004-tag.sh | 8 +-
t/t7012-skip-worktree-writing.sh | 4 +-
t/t7060-wtstatus.sh | 14 +--
t/t7063-status-untracked-cache.sh | 2 +-
t/t7102-reset.sh | 6 +-
t/t7400-submodule-basic.sh | 4 +-
t/t7401-submodule-summary.sh | 12 +--
t/t7406-submodule-update.sh | 16 ++--
t/t7407-submodule-foreach.sh | 10 +-
t/t7500-commit-template-squash-signoff.sh | 4 +-
t/t7502-commit-porcelain.sh | 6 +-
t/t7508-status.sh | 110 +++++++++++-----------
t/t7512-status-help.sh | 74 +++++++--------
t/t7519-status-fsmonitor.sh | 4 +-
t/t7521-ignored-mode.sh | 22 ++---
t/t7600-merge.sh | 4 +-
t/t7602-merge-octopus-many.sh | 6 +-
90 files changed, 415 insertions(+), 415 deletions(-)
diff --git a/t/lib-credential.sh b/t/lib-credential.sh
index dea2cbef517..5ea8bc9f1dc 100644
--- a/t/lib-credential.sh
+++ b/t/lib-credential.sh
@@ -20,7 +20,7 @@ check() {
false
fi &&
test_cmp expect-stdout stdout &&
- test_i18ncmp expect-stderr stderr
+ test_cmp expect-stderr stderr
}
read_chunk() {
diff --git a/t/lib-log-graph.sh b/t/lib-log-graph.sh
index 1184cceef26..bf952ef9204 100644
--- a/t/lib-log-graph.sh
+++ b/t/lib-log-graph.sh
@@ -12,13 +12,13 @@ sanitize_log_output () {
lib_test_cmp_graph () {
git log --graph "$@" >output &&
sed 's/ *$//' >output.sanitized <output &&
- test_i18ncmp expect output.sanitized
+ test_cmp expect output.sanitized
}
lib_test_cmp_short_graph () {
git log --graph --pretty=short "$@" >output &&
sanitize_log_output >output.sanitized <output &&
- test_i18ncmp expect output.sanitized
+ test_cmp expect output.sanitized
}
lib_test_cmp_colored_graph () {
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 75ee9a96b80..6b757d71692 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -11,7 +11,7 @@ check_relative() {
echo "$t -> $2" >expect
test_expect_${3:-success} "relative date ($2)" "
test-tool date relative $t >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
"
}
@@ -139,7 +139,7 @@ check_date_format_human() {
echo "$t -> $2" >expect
test_expect_success "human date $t" '
test-tool date human $t >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
}
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index 370a389e5c5..f7abde62f63 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -34,7 +34,7 @@ expect_from_stdin () {
test_stderr () {
expected="$1"
expect_in stderr "$1" &&
- test_i18ncmp "$HOME/expected-stderr" "$HOME/stderr"
+ test_cmp "$HOME/expected-stderr" "$HOME/stderr"
}
broken_c_unquote () {
diff --git a/t/t0012-help.sh b/t/t0012-help.sh
index e8ef7300ecb..5679e29c624 100755
--- a/t/t0012-help.sh
+++ b/t/t0012-help.sh
@@ -55,7 +55,7 @@ test_expect_success "--help does not work for guides" "
git: 'revisions' is not a git command. See 'git --help'.
EOF
test_must_fail git revisions --help 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
"
test_expect_success 'git help' '
diff --git a/t/t0018-advice.sh b/t/t0018-advice.sh
index e03554d2f34..39e5e4b34f8 100755
--- a/t/t0018-advice.sh
+++ b/t/t0018-advice.sh
@@ -10,7 +10,7 @@ test_expect_success 'advice should be printed when config variable is unset' '
hint: Disable this message with "git config advice.nestedTag false"
EOF
test-tool advise "This is a piece of advice" 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'advice should be printed when config variable is set to true' '
@@ -20,7 +20,7 @@ test_expect_success 'advice should be printed when config variable is set to tru
EOF
test_config advice.nestedTag true &&
test-tool advise "This is a piece of advice" 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'advice should not be printed when config variable is set to false' '
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index 51f74a3ddf3..d24d5acfbc7 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -83,7 +83,7 @@ check_warning () {
*) echo >&2 "Illegal 1": "$1" ; return false ;;
esac
grep "will be replaced by" "$2" | sed -e "s/\(.*\) in [^ ]*$/\1/" | uniq >"$2".actual
- test_i18ncmp "$2".expect "$2".actual
+ test_cmp "$2".expect "$2".actual
}
commit_check_warn () {
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 14cafc138b7..ad4746d899a 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -61,7 +61,7 @@ EOF
test_expect_success 'test help' '
test_must_fail test-tool parse-options -h >output 2>output.err &&
test_must_be_empty output.err &&
- test_i18ncmp expect output
+ test_cmp expect output
'
mv expect expect.err
@@ -84,7 +84,7 @@ check_unknown_i18n() {
cat expect.err >>expect &&
test_must_fail test-tool parse-options $* >output 2>output.err &&
test_must_be_empty output &&
- test_i18ncmp expect output.err
+ test_cmp expect output.err
}
test_expect_success 'OPT_BOOL() #1' 'check boolean: 1 --yes'
@@ -250,7 +250,7 @@ EOF
test_expect_success 'detect possible typos' '
test_must_fail test-tool parse-options -boolean >output 2>output.err &&
test_must_be_empty output &&
- test_i18ncmp typo.err output.err
+ test_cmp typo.err output.err
'
cat >typo.err <<\EOF
@@ -260,7 +260,7 @@ EOF
test_expect_success 'detect possible typos' '
test_must_fail test-tool parse-options -ambiguous >output 2>output.err &&
test_must_be_empty output &&
- test_i18ncmp typo.err output.err
+ test_cmp typo.err output.err
'
test_expect_success 'keep some options as arguments' '
diff --git a/t/t0201-gettext-fallbacks.sh b/t/t0201-gettext-fallbacks.sh
index a7b3e4a2c73..6c74df0dc67 100755
--- a/t/t0201-gettext-fallbacks.sh
+++ b/t/t0201-gettext-fallbacks.sh
@@ -27,25 +27,25 @@ test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' '
test_expect_success 'gettext: our gettext() fallback has pass-through semantics' '
printf "test" >expect &&
gettext "test" >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
printf "test more words" >expect &&
gettext "test more words" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'eval_gettext: our eval_gettext() fallback has pass-through semantics' '
printf "test" >expect &&
eval_gettext "test" >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
printf "test more words" >expect &&
eval_gettext "test more words" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables' '
printf "test YesPlease" >expect &&
GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' '
@@ -53,7 +53,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v
export cmdline &&
printf "When you have resolved this problem, run git am --resolved." >expect &&
eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' '
@@ -61,7 +61,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v
export cmdline &&
printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
index a18f8a473bf..3485c0534e6 100755
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@ -578,7 +578,7 @@ test_expect_success 'helpers can abort the process' '
quit: host=example.com
fatal: credential helper '\''quit'\'' told us to quit
EOF
- test_i18ncmp expect stderr
+ test_cmp expect stderr
'
test_expect_success 'empty helper spec resets helper list' '
@@ -606,7 +606,7 @@ test_expect_success 'url parser rejects embedded newlines' '
warning: url contains a newline in its path component: https://one.example.com?%0ahost=two.example.com/
fatal: credential url cannot be parsed: https://one.example.com?%0ahost=two.example.com/
EOF
- test_i18ncmp expect stderr
+ test_cmp expect stderr
'
test_expect_success 'host-less URLs are parsed as empty host' '
@@ -633,7 +633,7 @@ test_expect_success 'credential system refuses to work with missing host' '
cat >expect <<-\EOF &&
fatal: refusing to work with credential missing host field
EOF
- test_i18ncmp expect stderr
+ test_cmp expect stderr
'
test_expect_success 'credential system refuses to work with missing protocol' '
@@ -643,7 +643,7 @@ test_expect_success 'credential system refuses to work with missing protocol' '
cat >expect <<-\EOF &&
fatal: refusing to work with credential missing protocol field
EOF
- test_i18ncmp expect stderr
+ test_cmp expect stderr
'
# usage: check_host_and_path <url> <expected-host> <expected-path>
diff --git a/t/t0500-progress-display.sh b/t/t0500-progress-display.sh
index 84cce345e7d..22058b503ac 100755
--- a/t/t0500-progress-display.sh
+++ b/t/t0500-progress-display.sh
@@ -29,7 +29,7 @@ test_expect_success 'simple progress display' '
test-tool progress "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display with total' '
@@ -48,7 +48,7 @@ test_expect_success 'progress display with total' '
test-tool progress --total=3 "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display breaks long lines #1' '
@@ -72,7 +72,7 @@ EOF
<in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display breaks long lines #2' '
@@ -100,7 +100,7 @@ EOF
<in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display breaks long lines #3 - even the first is too long' '
@@ -126,7 +126,7 @@ EOF
<in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display breaks long lines #4 - title line matches terminal width' '
@@ -150,7 +150,7 @@ EOF
<in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
# Progress counter goes backwards, this should not happen in practice.
@@ -172,7 +172,7 @@ test_expect_success 'progress shortens - crazy caller' '
test-tool progress --total=1000 "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display with throughput' '
@@ -201,7 +201,7 @@ test_expect_success 'progress display with throughput' '
test-tool progress "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display with throughput and total' '
@@ -226,7 +226,7 @@ test_expect_success 'progress display with throughput and total' '
test-tool progress --total=40 "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'cover up after throughput shortens' '
@@ -255,7 +255,7 @@ test_expect_success 'cover up after throughput shortens' '
test-tool progress "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'cover up after throughput shortens a lot' '
@@ -280,7 +280,7 @@ test_expect_success 'cover up after throughput shortens a lot' '
test-tool progress "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress generates traces' '
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index dfe9794a740..24092c09a95 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -253,7 +253,7 @@ warning: The following paths were already present and thus not updated despite s
After fixing the above paths, you may want to run `git sparse-checkout reapply`.
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'checkout without --ignore-skip-worktree-bits' '
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 3a527e3a843..88b119a0a35 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -208,14 +208,14 @@ test_expect_success 'proper error on error in default config files' '
echo "[" >>.git/config &&
echo "fatal: bad config line 34 in file .git/config" >expect &&
test_expect_code 128 test-tool config get_value foo.bar 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'proper error on error in custom config files' '
echo "[" >>syntax-error &&
echo "fatal: bad config line 1 in file syntax-error" >expect &&
test_expect_code 128 test-tool config configset_get_value foo.bar syntax-error 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'check line errors for malformed values' '
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 359d8731c8f..e31f65f381c 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -374,7 +374,7 @@ test_expect_success 'Query "main@{May 25 2005}" (before history)' '
echo "$C" >expect &&
test_cmp expect o &&
echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
- test_i18ncmp expect e
+ test_cmp expect e
'
test_expect_success 'Query main@{2005-05-25} (before history)' '
test_when_finished "rm -f o e" &&
@@ -382,7 +382,7 @@ test_expect_success 'Query main@{2005-05-25} (before history)' '
echo "$C" >expect &&
test_cmp expect o &&
echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
- test_i18ncmp expect e
+ test_cmp expect e
'
test_expect_success 'Query "main@{May 26 2005 23:31:59}" (1 second before history)' '
test_when_finished "rm -f o e" &&
@@ -390,7 +390,7 @@ test_expect_success 'Query "main@{May 26 2005 23:31:59}" (1 second before histor
echo "$C" >expect &&
test_cmp expect o &&
echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
- test_i18ncmp expect e
+ test_cmp expect e
'
test_expect_success 'Query "main@{May 26 2005 23:32:00}" (exactly history start)' '
test_when_finished "rm -f o e" &&
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
index 2d142e5535e..8b51c4efc13 100755
--- a/t/t1404-update-ref-errors.sh
+++ b/t/t1404-update-ref-errors.sh
@@ -101,7 +101,7 @@ df_test() {
printf "%s\n" "delete $delname" "create $addname $D"
fi >commands &&
test_must_fail git update-ref --stdin <commands 2>output.err &&
- test_i18ncmp expected-err output.err &&
+ test_cmp expected-err output.err &&
printf "%s\n" "$C $delref" >expected-refs &&
git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs &&
test_cmp expected-refs actual-refs
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index a30fc5f74a9..f3241e0e7e2 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -380,7 +380,7 @@ test_expect_success 'tag with incorrect tag name & missing tagger' '
warning in tag $tag: badTagName: invalid '\''tag'\'' name: wrong name format
warning in tag $tag: missingTaggerEntry: invalid format - expected '\''tagger'\'' line
EOF
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'tag with bad tagger' '
@@ -806,7 +806,7 @@ test_expect_success 'fsck notices dangling objects' '
git fsck >actual &&
# the output order is non-deterministic, as it comes from a hash
sort <actual >actual.sorted &&
- test_i18ncmp expect actual.sorted
+ test_cmp expect actual.sorted
)
'
@@ -816,7 +816,7 @@ test_expect_success 'fsck --connectivity-only notices dangling objects' '
git fsck --connectivity-only >actual &&
# the output order is non-deterministic, as it comes from a hash
sort <actual >actual.sorted &&
- test_i18ncmp expect actual.sorted
+ test_cmp expect actual.sorted
)
'
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index a859abedf58..b29563fc997 100755
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -95,7 +95,7 @@ test_expect_success 'test --parseopt help output' '
|EOF
END_EXPECT
test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'test --parseopt help output no switches' '
@@ -108,7 +108,7 @@ test_expect_success 'test --parseopt help output no switches' '
|EOF
END_EXPECT
test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_no_switches &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'test --parseopt help output hidden switches' '
@@ -121,7 +121,7 @@ test_expect_success 'test --parseopt help output hidden switches' '
|EOF
END_EXPECT
test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_only_hidden_switches &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'test --parseopt help-all output hidden switches' '
@@ -136,7 +136,7 @@ test_expect_success 'test --parseopt help-all output hidden switches' '
|EOF
END_EXPECT
test_expect_code 129 git rev-parse --parseopt -- --help-all > output < optionspec_only_hidden_switches &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'test --parseopt invalid switch help output' '
@@ -176,7 +176,7 @@ test_expect_success 'test --parseopt invalid switch help output' '
|
END_EXPECT
test_expect_code 129 git rev-parse --parseopt -- --does-not-exist 1>/dev/null 2>output < optionspec &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'setup expect.1' "
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index f6e6f23f7e6..65a154a8a20 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -15,7 +15,7 @@ test_did_you_mean ()
fatal: path '$2$3' $4, but not ${5:-$SQ$3$SQ}
hint: Did you mean '$1:$2$3'${2:+ aka $SQ$1:./$3$SQ}?
EOF
- test_i18ncmp expected error
+ test_cmp expected error
}
HASH_file=
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index 73b4f34c6ee..c34714ffe3f 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -172,7 +172,7 @@ test_expect_success 'branch@{u} error message when no upstream' '
fatal: no upstream configured for branch ${SQ}non-tracking${SQ}
EOF
error_message non-tracking@{u} &&
- test_i18ncmp expect error
+ test_cmp expect error
'
test_expect_success '@{u} error message when no upstream' '
@@ -180,7 +180,7 @@ test_expect_success '@{u} error message when no upstream' '
fatal: no upstream configured for branch ${SQ}main${SQ}
EOF
test_must_fail git rev-parse --verify @{u} 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'branch@{u} error message with misspelt branch' '
@@ -188,7 +188,7 @@ test_expect_success 'branch@{u} error message with misspelt branch' '
fatal: no such branch: ${SQ}no-such-branch${SQ}
EOF
error_message no-such-branch@{u} &&
- test_i18ncmp expect error
+ test_cmp expect error
'
test_expect_success '@{u} error message when not on a branch' '
@@ -197,7 +197,7 @@ test_expect_success '@{u} error message when not on a branch' '
EOF
git checkout HEAD^0 &&
test_must_fail git rev-parse --verify @{u} 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'branch@{u} error message if upstream branch not fetched' '
@@ -205,7 +205,7 @@ test_expect_success 'branch@{u} error message if upstream branch not fetched' '
fatal: upstream branch ${SQ}refs/heads/side${SQ} not stored as a remote-tracking branch
EOF
error_message bad-upstream@{u} &&
- test_i18ncmp expect error
+ test_cmp expect error
'
test_expect_success 'pull works when tracking a local branch' '
diff --git a/t/t1509-root-work-tree.sh b/t/t1509-root-work-tree.sh
index fd2f7abf1c1..553a3f601ba 100755
--- a/t/t1509-root-work-tree.sh
+++ b/t/t1509-root-work-tree.sh
@@ -221,7 +221,7 @@ test_expect_success 'setup' '
rm -rf /.git &&
echo "Initialized empty Git repository in /.git/" > expected &&
git init > result &&
- test_i18ncmp expected result
+ test_cmp expected result
'
test_vars 'auto gitdir, root' ".git" "/" ""
@@ -246,7 +246,7 @@ test_expect_success 'setup' '
cd / &&
echo "Initialized empty Git repository in /" > expected &&
git init --bare > result &&
- test_i18ncmp expected result
+ test_cmp expected result
'
test_vars 'auto gitdir, root' "." "" ""
diff --git a/t/t1600-index.sh b/t/t1600-index.sh
index b7c31aa86a1..c9b9e718b89 100755
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -18,7 +18,7 @@ test_expect_success 'bogus GIT_INDEX_VERSION issues warning' '
warning: GIT_INDEX_VERSION set, but the value is invalid.
Using version Z
EOF
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
)
'
@@ -32,7 +32,7 @@ test_expect_success 'out of bounds GIT_INDEX_VERSION issues warning' '
warning: GIT_INDEX_VERSION set, but the value is invalid.
Using version Z
EOF
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
)
'
@@ -55,7 +55,7 @@ test_expect_success 'out of bounds index.version issues warning' '
warning: index.version set, but the value is invalid.
Using version Z
EOF
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
)
'
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index 5f761bc616e..93be1c0eae5 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -150,7 +150,7 @@ test_expect_success 'checkout -b to @{-1} fails with the right branch name' '
git checkout branch2 &&
echo >expect "fatal: A branch named '\''branch1'\'' already exists." &&
test_must_fail git checkout -b @{-1} 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'checkout -B to an existing branch resets branch to HEAD' '
diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index b432b6427b6..bc46713a43e 100755
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -163,7 +163,7 @@ test_expect_success 'tracking count is accurate after orphan check' '
git config branch.child.merge refs/heads/main &&
git checkout child^ &&
git checkout child >stdout &&
- test_i18ncmp expect stdout
+ test_cmp expect stdout
'
test_expect_success 'no advice given for explicit detached head state' '
@@ -237,15 +237,15 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 1st_detach actual &&
+ test_cmp 1st_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS="no" git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 2nd_detach actual &&
+ test_cmp 2nd_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS= git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 3rd_detach actual &&
+ test_cmp 3rd_detach actual &&
sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
@@ -256,17 +256,17 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
# Make no mention of the env var at all
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 1st_detach actual &&
+ test_cmp 1st_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS='nope' &&
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 2nd_detach actual &&
+ test_cmp 2nd_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS=nein &&
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 3rd_detach actual &&
+ test_cmp 3rd_detach actual &&
true
"
@@ -319,15 +319,15 @@ test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked
GIT_PRINT_SHA1_ELLIPSIS=yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 1st_detach actual &&
+ test_cmp 1st_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS=Yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 2nd_detach actual &&
+ test_cmp 2nd_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS=YES git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 3rd_detach actual &&
+ test_cmp 3rd_detach actual &&
true
"
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 7cb7a703827..45ca35d60ac 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -135,7 +135,7 @@ test_expect_success 'add -n -u should not add but just report' '
after=$(git ls-files -s check top) &&
test "$before" = "$after" &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
diff --git a/t/t2401-worktree-prune.sh b/t/t2401-worktree-prune.sh
index aff877590df..a615d3b4838 100755
--- a/t/t2401-worktree-prune.sh
+++ b/t/t2401-worktree-prune.sh
@@ -23,7 +23,7 @@ test_expect_success 'prune files inside $GIT_DIR/worktrees' '
cat >expect <<EOF &&
Removing worktrees/abc: not a valid directory
EOF
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
! test -f .git/worktrees/abc &&
! test -d .git/worktrees
'
@@ -35,7 +35,7 @@ test_expect_success 'prune directories without gitdir' '
Removing worktrees/def: gitdir file does not exist
EOF
git worktree prune --verbose >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
! test -d .git/worktrees/def &&
! test -d .git/worktrees
'
diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index 42d35d9ae82..fedcefe8de3 100755
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -167,7 +167,7 @@ test_expect_success '"list" all worktrees --verbose with prunable' '
rm -rf prunable &&
git worktree list --verbose >out &&
sed -n "s/ */ /g;/\/prunable *[0-9a-f].*$/,/prunable: .*$/p" <out >actual &&
- test_i18ncmp actual expect
+ test_cmp actual expect
'
test_expect_success 'bare repo setup' '
diff --git a/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh
index 2ec69a8a266..727e9ae1a44 100755
--- a/t/t3005-ls-files-relative.sh
+++ b/t/t3005-ls-files-relative.sh
@@ -46,7 +46,7 @@ test_expect_success 'ls-files -c' '
ls ../x* >expect.out &&
test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
test_cmp expect.out actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
)
'
@@ -61,7 +61,7 @@ test_expect_success 'ls-files -o' '
ls ../y* >expect.out &&
test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
test_cmp expect.out actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
)
'
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 00761e40801..cc4b10236e2 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -695,7 +695,7 @@ test_expect_success 'deleting a symref' '
git branch -d symref >actual &&
test_path_is_file .git/refs/heads/target &&
test_path_is_missing .git/refs/heads/symref &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'deleting a dangling symref' '
@@ -704,7 +704,7 @@ test_expect_success 'deleting a dangling symref' '
echo "Deleted branch dangling-symref (was nowhere)." >expect &&
git branch -d dangling-symref >actual &&
test_path_is_missing .git/refs/heads/dangling-symref &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'deleting a self-referential symref' '
@@ -713,7 +713,7 @@ test_expect_success 'deleting a self-referential symref' '
echo "Deleted branch self-reference (was refs/heads/self-reference)." >expect &&
git branch -d self-reference >actual &&
test_path_is_missing .git/refs/heads/self-reference &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'renaming a symref is not allowed' '
@@ -808,7 +808,7 @@ test_expect_success 'test deleting branch without config' '
sha1=$(git rev-parse my7 | cut -c 1-7) &&
echo "Deleted branch my7 (was $sha1)." >expect &&
git branch -d my7 >actual 2>&1 &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'deleting currently checked out branch fails' '
@@ -843,7 +843,7 @@ test_expect_success 'branch from tag w/--track causes failure' '
test_expect_success '--set-upstream-to fails on multiple branches' '
echo "fatal: too many arguments to set new upstream" >expect &&
test_must_fail git branch --set-upstream-to main a b c 2>err &&
- test_i18ncmp expect err
+ test_cmp expect err
'
test_expect_success '--set-upstream-to fails on detached HEAD' '
@@ -851,13 +851,13 @@ test_expect_success '--set-upstream-to fails on detached HEAD' '
test_when_finished git checkout - &&
echo "fatal: could not set upstream of HEAD to main when it does not point to any branch." >expect &&
test_must_fail git branch --set-upstream-to main 2>err &&
- test_i18ncmp expect err
+ test_cmp expect err
'
test_expect_success '--set-upstream-to fails on a missing dst branch' '
echo "fatal: branch '"'"'does-not-exist'"'"' does not exist" >expect &&
test_must_fail git branch --set-upstream-to main does-not-exist 2>err &&
- test_i18ncmp expect err
+ test_cmp expect err
'
test_expect_success '--set-upstream-to fails on a missing src branch' '
@@ -868,7 +868,7 @@ test_expect_success '--set-upstream-to fails on a missing src branch' '
test_expect_success '--set-upstream-to fails on a non-ref' '
echo "fatal: Cannot setup tracking information; starting point '"'"'HEAD^{}'"'"' is not a branch." >expect &&
test_must_fail git branch --set-upstream-to HEAD^{} 2>err &&
- test_i18ncmp expect err
+ test_cmp expect err
'
test_expect_success '--set-upstream-to fails on locked config' '
@@ -899,7 +899,7 @@ test_expect_success 'use --set-upstream-to modify a particular branch' '
test_expect_success '--unset-upstream should fail if given a non-existent branch' '
echo "fatal: Branch '"'"'i-dont-exist'"'"' has no upstream information" >expect &&
test_must_fail git branch --unset-upstream i-dont-exist 2>err &&
- test_i18ncmp expect err
+ test_cmp expect err
'
test_expect_success '--unset-upstream should fail if config is locked' '
@@ -921,13 +921,13 @@ test_expect_success 'test --unset-upstream on HEAD' '
# fail for a branch without upstream set
echo "fatal: Branch '"'"'main'"'"' has no upstream information" >expect &&
test_must_fail git branch --unset-upstream 2>err &&
- test_i18ncmp expect err
+ test_cmp expect err
'
test_expect_success '--unset-upstream should fail on multiple branches' '
echo "fatal: too many arguments to unset upstream" >expect &&
test_must_fail git branch --unset-upstream a b c 2>err &&
- test_i18ncmp expect err
+ test_cmp expect err
'
test_expect_success '--unset-upstream should fail on detached HEAD' '
@@ -935,7 +935,7 @@ test_expect_success '--unset-upstream should fail on detached HEAD' '
test_when_finished git checkout - &&
echo "fatal: could not unset upstream of HEAD when it does not point to any branch." >expect &&
test_must_fail git branch --unset-upstream 2>err &&
- test_i18ncmp expect err
+ test_cmp expect err
'
test_expect_success 'test --unset-upstream on a particular branch' '
@@ -957,7 +957,7 @@ test_expect_success '--set-upstream-to notices an error to set branch as own ups
EOF
test_expect_code 1 git config branch.my13.remote &&
test_expect_code 1 git config branch.my13.merge &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
# Keep this test last, as it changes the current branch
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index 578b5f48255..349a810cee1 100755
--- a/t/t3201-branch-contains.sh
+++ b/t/t3201-branch-contains.sh
@@ -264,7 +264,7 @@ test_expect_success 'branch --merged with --verbose' '
* topic $(git rev-parse --short topic ) [ahead 1] foo
zzz $(git rev-parse --short zzz ) second on main
EOF
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index b6fcd017afe..5325b9f67a0 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -160,7 +160,7 @@ test_expect_success 'git branch shows detached HEAD properly' '
EOF
git checkout HEAD^0 &&
git branch >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch shows detached HEAD properly after checkout --detach' '
@@ -173,7 +173,7 @@ test_expect_success 'git branch shows detached HEAD properly after checkout --de
EOF
git checkout --detach &&
git branch >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch shows detached HEAD properly after moving' '
@@ -185,7 +185,7 @@ test_expect_success 'git branch shows detached HEAD properly after moving' '
EOF
git reset --hard HEAD^1 &&
git branch >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch shows detached HEAD properly from tag' '
@@ -198,7 +198,7 @@ EOF
git tag fromtag main &&
git checkout fromtag &&
git branch >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch shows detached HEAD properly after moving from tag' '
@@ -210,7 +210,7 @@ test_expect_success 'git branch shows detached HEAD properly after moving from t
EOF
git reset --hard HEAD^1 &&
git branch >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch `--sort=[-]objectsize` option' '
@@ -221,7 +221,7 @@ test_expect_success 'git branch `--sort=[-]objectsize` option' '
main
EOF
git branch --sort=objectsize >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
cat >expect <<-\EOF &&
* (HEAD detached from fromtag)
@@ -230,7 +230,7 @@ test_expect_success 'git branch `--sort=[-]objectsize` option' '
branch-two
EOF
git branch --sort=-objectsize >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch `--sort=[-]type` option' '
@@ -241,7 +241,7 @@ test_expect_success 'git branch `--sort=[-]type` option' '
main
EOF
git branch --sort=type >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
cat >expect <<-\EOF &&
* (HEAD detached from fromtag)
@@ -250,7 +250,7 @@ test_expect_success 'git branch `--sort=[-]type` option' '
main
EOF
git branch --sort=-type >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch `--sort=[-]version:refname` option' '
@@ -261,7 +261,7 @@ test_expect_success 'git branch `--sort=[-]version:refname` option' '
main
EOF
git branch --sort=version:refname >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
cat >expect <<-\EOF &&
* (HEAD detached from fromtag)
@@ -270,7 +270,7 @@ test_expect_success 'git branch `--sort=[-]version:refname` option' '
branch-one
EOF
git branch --sort=-version:refname >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch --points-at option' '
@@ -337,7 +337,7 @@ test_expect_success 'git branch --format option' '
Refname is refs/heads/ref-to-remote
EOF
git branch --format="Refname is %(refname)" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'worktree colors correct' '
@@ -355,7 +355,7 @@ test_expect_success 'worktree colors correct' '
rm -r worktree_dir &&
git worktree prune &&
test_decode_color <actual.raw >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success "set up color tests" '
@@ -398,7 +398,7 @@ test_expect_success 'verbose output lists worktree path' '
git branch -vv >actual &&
rm -r worktree_dir &&
git worktree prune &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index 04de03cad0a..f5bf16abcd8 100755
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -181,7 +181,7 @@ test_expect_success 'diffstat for rename quotes funny filename' '
git diff-index -M -p $t0 >diff &&
git apply --stat <diff >diffstat &&
sed -e "s/|.*//" -e "s/ *\$//" <diffstat >current &&
- test_i18ncmp expected current
+ test_cmp expected current
'
test_expect_success 'numstat for rename quotes funny filename' '
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 5e88a10f8d7..587b408063a 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -113,7 +113,7 @@ test_expect_success 'rebase off of the previous branch using "-"' '
test_cmp expect.forkpoint actual.forkpoint &&
# the next one is dubious---we may want to say "-",
# instead of @{-1}, in the message
- test_i18ncmp expect.messages actual.messages
+ test_cmp expect.messages actual.messages
'
test_expect_success 'rebase a single mode change' '
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index dc45552b4d6..b0431782230 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -86,7 +86,7 @@ test_expect_success 'rebase -i with empty todo list' '
git rebase -i HEAD^ >output 2>&1
) &&
tail -n 1 output >actual && # Ignore output about changing todo list
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rebase -i with the exec command' '
@@ -158,9 +158,9 @@ test_expect_success 'rebase -x with empty command fails' '
test_when_finished "git rebase --abort ||:" &&
test_must_fail env git rebase -x "" @ 2>actual &&
test_write_lines "error: empty exec command" >expected &&
- test_i18ncmp expected actual &&
+ test_cmp expected actual &&
test_must_fail env git rebase -x " " @ 2>actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'rebase -x with newline in command fails' '
@@ -168,7 +168,7 @@ test_expect_success 'rebase -x with newline in command fails' '
test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
test_write_lines "error: exec commands cannot contain newlines" \
>expected &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'rebase -i with exec of inexistent command' '
@@ -1465,7 +1465,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' '
FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2
) &&
head -n4 actual.2 >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test D = $(git cat-file commit HEAD | sed -ne \$p)
'
@@ -1489,7 +1489,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
set_fake_editor &&
test_must_fail env FAKE_LINES="1 2 4" \
git rebase -i --root 2>actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
cp .git/rebase-merge/git-rebase-todo.backup \
.git/rebase-merge/git-rebase-todo &&
FAKE_LINES="1 2 drop 3 4 drop 5" git rebase --edit-todo
@@ -1535,11 +1535,11 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = wa
cp .git/rebase-merge/git-rebase-todo.backup orig &&
FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 &&
head -n6 actual.2 >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
cp orig .git/rebase-merge/git-rebase-todo &&
FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 &&
head -n4 actual.2 >actual &&
- test_i18ncmp expect.3 actual &&
+ test_cmp expect.3 actual &&
git rebase --continue 2>actual
) &&
test D = $(git cat-file commit HEAD | sed -ne \$p) &&
@@ -1575,16 +1575,16 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = er
cp .git/rebase-merge/git-rebase-todo.backup orig &&
test_must_fail env FAKE_LINES="2 3 4" \
git rebase --edit-todo 2>actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test_must_fail git rebase --continue 2>actual &&
- test_i18ncmp expect.2 actual &&
+ test_cmp expect.2 actual &&
test_must_fail git rebase --edit-todo &&
cp orig .git/rebase-merge/git-rebase-todo &&
test_must_fail env FAKE_LINES="1 2 3 4" \
git rebase --edit-todo 2>actual &&
- test_i18ncmp expect.3 actual &&
+ test_cmp expect.3 actual &&
test_must_fail git rebase --continue 2>actual &&
- test_i18ncmp expect.3 actual &&
+ test_cmp expect.3 actual &&
cp orig .git/rebase-merge/git-rebase-todo &&
FAKE_LINES="1 2 3 4 drop 5" git rebase --edit-todo &&
git rebase --continue 2>actual
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 4caa014c71c..43fcb68f27e 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -110,7 +110,7 @@ testrebase () {
fi &&
create_expected_success_$suffix &&
sed "$remove_progress_re" <actual >actual2 &&
- test_i18ncmp expected actual2
+ test_cmp expected actual2
'
test_expect_success "rebase$type: dirty index, non-conflicting rebase" '
@@ -231,7 +231,7 @@ testrebase () {
fi &&
create_expected_failure_$suffix &&
sed "$remove_progress_re" <actual >actual2 &&
- test_i18ncmp expected actual2
+ test_cmp expected actual2
'
}
diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh
index 9198535874c..4581ae98b87 100755
--- a/t/t3504-cherry-pick-rerere.sh
+++ b/t/t3504-cherry-pick-rerere.sh
@@ -74,10 +74,10 @@ test_expect_success 'cherry-pick --continue rejects --rerere-autoupdate' '
git diff-files --quiet &&
test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 &&
echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 &&
echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
git cherry-pick --abort
'
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 5f4564c8306..014001b8f32 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -59,7 +59,7 @@ test_expect_success 'advice from failed cherry-pick' "
EOF
test_must_fail git cherry-pick picked 2>actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
"
test_expect_success 'advice from failed cherry-pick --no-commit' "
@@ -73,7 +73,7 @@ test_expect_success 'advice from failed cherry-pick --no-commit' "
EOF
test_must_fail git cherry-pick --no-commit picked 2>actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
"
test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
@@ -256,7 +256,7 @@ test_expect_success \
test_must_fail git cherry-pick picked &&
- test_i18ncmp expected .git/MERGE_MSG
+ test_cmp expected .git/MERGE_MSG
'
test_expect_success \
@@ -276,7 +276,7 @@ test_expect_success \
test_must_fail git cherry-pick --cleanup=scissors picked &&
- test_i18ncmp expected .git/MERGE_MSG
+ test_cmp expected .git/MERGE_MSG
'
test_expect_success 'failed cherry-pick describes conflict in work tree' '
@@ -465,7 +465,7 @@ test_expect_success \
test_must_fail git revert picked &&
sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success \
@@ -488,7 +488,7 @@ test_expect_success \
test_must_fail git revert --cleanup=scissors picked &&
sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'failed cherry-pick does not forget -s' '
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
index ec7a2c9fcfa..e8375d1c970 100755
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh
@@ -86,7 +86,7 @@ test_expect_success 'output to keep user entertained during multi-pick' '
git cherry-pick first..fourth >actual &&
sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
test_line_count -ge 3 actual.fuzzy &&
- test_i18ncmp expected actual.fuzzy
+ test_cmp expected actual.fuzzy
'
test_expect_success 'cherry-pick --strategy resolve first..fourth works' '
@@ -123,7 +123,7 @@ test_expect_success 'output during multi-pick indicates merge strategy' '
test_tick &&
git cherry-pick --strategy resolve first..fourth >actual &&
sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
- test_i18ncmp expected actual.fuzzy
+ test_cmp expected actual.fuzzy
'
test_expect_success 'cherry-pick --ff first..fourth works' '
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 5b94fdaa671..b76cb6de91d 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -170,7 +170,7 @@ test_expect_success 'check advice when we move HEAD by committing' '
git commit -a &&
test_path_is_missing .git/CHERRY_PICK_HEAD &&
test_must_fail git cherry-pick --skip 2>advice &&
- test_i18ncmp expect advice
+ test_cmp expect advice
'
test_expect_success 'selectively advise --skip while launching another sequence' '
@@ -182,7 +182,7 @@ test_expect_success 'selectively advise --skip while launching another sequence'
EOF
test_must_fail git cherry-pick picked..yetanotherpick &&
test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
- test_i18ncmp expect advice &&
+ test_cmp expect advice &&
cat >expect <<-EOF &&
error: cherry-pick is already in progress
hint: try "git cherry-pick (--continue | --abort | --quit)"
@@ -190,7 +190,7 @@ test_expect_success 'selectively advise --skip while launching another sequence'
EOF
git reset --merge &&
test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
- test_i18ncmp expect advice
+ test_cmp expect advice
'
test_expect_success 'allow skipping commit but not abort for a new history' '
@@ -204,7 +204,7 @@ test_expect_success 'allow skipping commit but not abort for a new history' '
test_must_fail git cherry-pick anotherpick &&
test_must_fail git cherry-pick --abort 2>advice &&
git cherry-pick --skip &&
- test_i18ncmp expect advice
+ test_cmp expect advice
'
test_expect_success 'allow skipping stopped cherry-pick because of untracked file modifications' '
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index dff12286699..857b145cc25 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -442,7 +442,7 @@ test_expect_success 'rm issues a warning when section is not found in .gitmodule
git add .gitmodules &&
echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
git rm submod >actual 2>actual.err &&
- test_i18ncmp expect.err actual.err &&
+ test_cmp expect.err actual.err &&
test_path_is_missing submod &&
test_path_is_missing submod/.git &&
git status -s -uno >actual &&
@@ -812,7 +812,7 @@ test_expect_success 'rm files with different staged content' '
echo content1 >foo.txt &&
echo content1 >bar.txt &&
test_must_fail git rm foo.txt bar.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm files with different staged content without hints' '
@@ -825,7 +825,7 @@ test_expect_success 'rm files with different staged content without hints' '
echo content2 >foo.txt &&
echo content2 >bar.txt &&
test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm file with local modification' '
@@ -837,7 +837,7 @@ test_expect_success 'rm file with local modification' '
git commit -m "testing rm 3" &&
echo content3 >foo.txt &&
test_must_fail git rm foo.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm file with local modification without hints' '
@@ -847,7 +847,7 @@ test_expect_success 'rm file with local modification without hints' '
EOF
echo content4 >bar.txt &&
test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm file with changes in the index' '
@@ -860,7 +860,7 @@ test_expect_success 'rm file with changes in the index' '
echo content5 >foo.txt &&
git add foo.txt &&
test_must_fail git rm foo.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm file with changes in the index without hints' '
@@ -869,7 +869,7 @@ test_expect_success 'rm file with changes in the index without hints' '
foo.txt
EOF
test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm files with two different errors' '
@@ -888,7 +888,7 @@ test_expect_success 'rm files with two different errors' '
echo content6 >bar1.txt &&
git add bar1.txt &&
test_must_fail git rm bar1.txt foo1.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm empty string should fail' '
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index b7d4ba608cb..dda84004f96 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -304,7 +304,7 @@ test_expect_success 'error on a repository with no commits' '
error: '"'empty/'"' does not have a commit checked out
fatal: adding files failed
EOF
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git add --dry-run of existing changed file' "
@@ -320,7 +320,7 @@ test_expect_success 'git add --dry-run of non-existing file' "
test_expect_success 'git add --dry-run of an existing file output' "
echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
- test_i18ncmp expect actual
+ test_cmp expect actual
"
cat >expect.err <<\EOF
@@ -339,8 +339,8 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
'
test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' '
- test_i18ncmp expect.out actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.out actual.out &&
+ test_cmp expect.err actual.err
'
test_expect_success 'git add empty string should fail' '
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index ed00c40370b..207714655f2 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -974,7 +974,7 @@ test_expect_success 'show help from add--helper' '
EOF
test_write_lines h | force_color git add -i >actual.colored &&
test_decode_color <actual.colored >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 84b039e5739..5f282ecf617 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -564,7 +564,7 @@ test_expect_success 'stash show format defaults to --stat' '
1 file changed, 1 insertion(+)
EOF
git stash show ${STASH_ID} >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'stash show - stashes on stack, stash-like argument' '
@@ -792,7 +792,7 @@ test_expect_success 'apply: show same status as git status (relative to ./)' '
git stash apply
) |
sed -e 1d >actual && # drop "Saved..."
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<EOF
@@ -1114,7 +1114,7 @@ test_expect_success 'stash push -p with pathspec shows no changes only once' '
git stash push -p foo >actual &&
echo "No local changes to save" >expect &&
git reset --hard HEAD~ &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'push <pathspec>: show no changes when there are none' '
@@ -1124,7 +1124,7 @@ test_expect_success 'push <pathspec>: show no changes when there are none' '
git stash push foo >actual &&
echo "No local changes to save" >expect &&
git reset --hard HEAD~ &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'push: <pathspec> not in the repository errors out' '
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index f075c7f1f31..3d8b6b491f0 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -280,7 +280,7 @@ test_expect_success 'stash -u -- <ignored> leaves ignored file alone' '
test_expect_success 'stash -u -- <non-existent> shows no changes when there are none' '
git stash push -u -- non-existent >actual &&
echo "No local changes to save" >expect &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'stash -u with globs' '
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 03489aff14e..275ce5fa15b 100755
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -39,13 +39,13 @@ test_expect_success '--stat output after text chmod' '
1 file changed, 0 insertions(+), 0 deletions(-)
EOF
git diff HEAD --stat >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success '--shortstat output after text chmod' '
tail -n 1 <expect >expect.short &&
git diff HEAD --shortstat >actual &&
- test_i18ncmp expect.short actual
+ test_cmp expect.short actual
'
test_expect_success '--stat output after binary chmod' '
@@ -56,13 +56,13 @@ test_expect_success '--stat output after binary chmod' '
2 files changed, 0 insertions(+), 0 deletions(-)
EOF
git diff HEAD --stat >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success '--shortstat output after binary chmod' '
tail -n 1 <expect >expect.short &&
git diff HEAD --shortstat >actual &&
- test_i18ncmp expect.short actual
+ test_cmp expect.short actual
'
test_done
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index bd59328e4b2..33ff588ebca 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -34,19 +34,19 @@ EOF
test_expect_success 'apply --stat output for binary file change' '
git diff >diff &&
git apply --stat --summary <diff >current &&
- test_i18ncmp expected current
+ test_cmp expected current
'
test_expect_success 'diff --shortstat output for binary file change' '
tail -n 1 expected >expect &&
git diff --shortstat >current &&
- test_i18ncmp expect current
+ test_cmp expect current
'
test_expect_success 'diff --shortstat output for binary file change only' '
echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
git diff --shortstat -- b >current &&
- test_i18ncmp expected current
+ test_cmp expected current
'
test_expect_success 'apply --numstat notices binary file change' '
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index ce6aa3914fe..47d4df08f9e 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -222,7 +222,7 @@ do
process_diffs "$expect" >expect &&
case $cmd in
*format-patch* | *-stat*)
- test_i18ncmp expect actual;;
+ test_cmp expect actual;;
*)
test_cmp expect actual;;
esac &&
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 66630c8413d..cdd3154e702 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -888,11 +888,11 @@ echo "fatal: --check does not make sense" >expect.check
test_expect_success 'options no longer allowed for format-patch' '
test_must_fail git format-patch --name-only 2>output &&
- test_i18ncmp expect.name-only output &&
+ test_cmp expect.name-only output &&
test_must_fail git format-patch --name-status 2>output &&
- test_i18ncmp expect.name-status output &&
+ test_cmp expect.name-status output &&
test_must_fail git format-patch --check 2>output &&
- test_i18ncmp expect.check output
+ test_cmp expect.check output
'
test_expect_success 'format-patch --numstat should produce a patch' '
diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh
index 9c48e5c2c99..876271d6826 100755
--- a/t/t4016-diff-quote.sh
+++ b/t/t4016-diff-quote.sh
@@ -82,7 +82,7 @@ test_expect_success 'git diff --stat -M HEAD' '
7 files changed, 0 insertions(+), 0 deletions(-)
EOF
git diff --stat -M HEAD >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh
index 4cb9f0e523d..c906320b60d 100755
--- a/t/t4030-diff-textconv.sh
+++ b/t/t4030-diff-textconv.sh
@@ -139,7 +139,7 @@ EOF
test_expect_success 'diffstat does not run textconv' '
echo file diff=fail >.gitattributes &&
git diff --stat HEAD^ HEAD >actual &&
- test_i18ncmp expect.stat actual &&
+ test_cmp expect.stat actual &&
head -n1 <expect.stat >expect.line1 &&
head -n1 <actual >actual.line1 &&
diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh
index 7be1de736d8..61ba5f707fb 100755
--- a/t/t4045-diff-relative.sh
+++ b/t/t4045-diff-relative.sh
@@ -61,7 +61,7 @@ check_stat () {
EOF
test_expect_success "--stat $*" "
git -C '$dir' diff --stat $* HEAD^ >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
"
}
diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index a34121740a4..53061b104ec 100755
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -25,7 +25,7 @@ test_expect_success 'mode-only change show as a 0-line change' '
4 files changed, 2 insertions(+)
EOF
git diff --stat --stat-count=2 HEAD >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'binary changes do not count in lines' '
@@ -40,7 +40,7 @@ test_expect_success 'binary changes do not count in lines' '
3 files changed, 2 insertions(+)
EOF
git diff --stat --stat-count=2 >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'exclude unmerged entries from total file count' '
@@ -62,7 +62,7 @@ test_expect_success 'exclude unmerged entries from total file count' '
3 files changed, 3 insertions(+)
EOF
git diff --stat --stat-count=2 >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh
index 744b8e51bea..9b433de8363 100755
--- a/t/t4100-apply-stat.sh
+++ b/t/t4100-apply-stat.sh
@@ -17,13 +17,13 @@ do
test_expect_success "$title" '
git apply --stat --summary \
<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
- test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+ test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
'
test_expect_success "$title with recount" '
sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
git apply --recount --stat --summary >current &&
- test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+ test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
'
done <<\EOF
rename
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 99987515dc2..2aaaa0d7ded 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -906,7 +906,7 @@ test_expect_success 'am empty-file does not infloop' '
test_tick &&
test_must_fail git am empty-file 2>actual &&
echo Patch format detection failed. >expected &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'am --message-id really adds the message id' '
diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh
index 8ea22d1bcbb..b7c3861407d 100755
--- a/t/t4153-am-resume-override-opts.sh
+++ b/t/t4153-am-resume-override-opts.sh
@@ -61,7 +61,7 @@ test_expect_success '--no-quiet overrides --quiet' '
# Applying side2 will be quiet.
git am --no-quiet --continue >out &&
echo "Applying: side1" >expected &&
- test_i18ncmp expected out
+ test_cmp expected out
'
test_expect_success '--signoff overrides --no-signoff' '
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 5ec0f47b567..85432b80ff5 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -123,7 +123,7 @@ test_expect_success 'NUL separation with --stat' '
stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n" >expected &&
git log -z --stat --pretty="format:%s" >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_failure 'NUL termination with --stat' '
diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh
index daf01c309d0..54be7da1611 100755
--- a/t/t4254-am-corrupt.sh
+++ b/t/t4254-am-corrupt.sh
@@ -60,7 +60,7 @@ test_expect_success 'try to apply corrupted patch' '
test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual &&
echo "error: git diff header lacks filename information (line 4)" >expected &&
test_path_is_file f &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success "NUL in commit message's body" '
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index db4e15fd596..cb67bac1c47 100755
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -223,14 +223,14 @@ test_expect_success 'pull request format' '
git request-pull initial "$downstream_url" tags/full >../request
) &&
<request sed -nf fuzz.sed >request.fuzzy &&
- test_i18ncmp expect request.fuzzy &&
+ test_cmp expect request.fuzzy &&
(
cd local &&
git request-pull initial "$downstream_url" tags/full:refs/tags/full
) >request &&
sed -nf fuzz.sed <request >request.fuzzy &&
- test_i18ncmp expect request.fuzzy &&
+ test_cmp expect request.fuzzy &&
(
cd local &&
diff --git a/t/t5316-pack-delta-depth.sh b/t/t5316-pack-delta-depth.sh
index 0f06c40eb13..a8c1bc0f66b 100755
--- a/t/t5316-pack-delta-depth.sh
+++ b/t/t5316-pack-delta-depth.sh
@@ -84,14 +84,14 @@ test_expect_success 'packing produces a long delta' '
pack=$(git pack-objects --all --window=0 </dev/null pack) &&
echo 9 >expect &&
max_chain pack-$pack.pack >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success '--depth limits depth' '
pack=$(git pack-objects --all --depth=5 </dev/null pack) &&
echo 5 >expect &&
max_chain pack-$pack.pack >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 1f4cc873a83..8a5d3492c71 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -547,7 +547,7 @@ test_expect_success 'test lonely missing ref' '
cd client &&
test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy 2>../error-m
) &&
- test_i18ncmp expect-error error-m
+ test_cmp expect-error error-m
'
test_expect_success 'test missing ref after existing' '
@@ -555,7 +555,7 @@ test_expect_success 'test missing ref after existing' '
cd client &&
test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy 2>../error-em
) &&
- test_i18ncmp expect-error error-em
+ test_cmp expect-error error-em
'
test_expect_success 'test missing ref before existing' '
@@ -563,7 +563,7 @@ test_expect_success 'test missing ref before existing' '
cd client &&
test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A 2>../error-me
) &&
- test_i18ncmp expect-error error-me
+ test_cmp expect-error error-me
'
test_expect_success 'test --all, --depth, and explicit head' '
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index d3a3bb0a42b..8c462f20ae6 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -140,8 +140,8 @@ test_expect_success 'remove remote protects local branches' '
git remote rm oops 2>actual2 &&
git branch -d foobranch &&
git tag -d footag &&
- test_i18ncmp expect1 actual1 &&
- test_i18ncmp expect2 actual2
+ test_cmp expect1 actual1 &&
+ test_cmp expect2 actual2
)
'
@@ -150,7 +150,7 @@ test_expect_success 'remove errors out early when deleting non-existent branch'
cd test &&
echo "error: No such remote: '\''foo'\''" >expect &&
test_expect_code 2 git remote rm foo 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
)
'
@@ -178,7 +178,7 @@ test_expect_success 'rename errors out early when deleting non-existent branch'
cd test &&
echo "error: No such remote: '\''foo'\''" >expect &&
test_expect_code 2 git remote rename foo bar 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
)
'
@@ -186,14 +186,14 @@ test_expect_success 'rename errors out early when when new name is invalid' '
test_config remote.foo.vcs bar &&
echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
test_must_fail git remote rename foo invalid...name 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'add existing foreign_vcs remote' '
test_config remote.foo.vcs bar &&
echo "error: remote foo already exists." >expect &&
test_expect_code 3 git remote add foo bar 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'add existing foreign_vcs remote' '
@@ -201,13 +201,13 @@ test_expect_success 'add existing foreign_vcs remote' '
test_config remote.bar.vcs bar &&
echo "error: remote bar already exists." >expect &&
test_expect_code 3 git remote rename foo bar 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'add invalid foreign_vcs remote' '
echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
test_must_fail git remote add invalid...name bar 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >test/expect <<EOF
@@ -267,7 +267,7 @@ test_expect_success 'show' '
git config --add remote.two.push refs/heads/main:refs/heads/another &&
git remote show origin two >output &&
git branch -d rebase octopus &&
- test_i18ncmp expect output
+ test_cmp expect output
)
'
@@ -294,7 +294,7 @@ test_expect_success 'show -n' '
cd test &&
git remote show -n origin >output &&
mv ../one.unreachable ../one &&
- test_i18ncmp expect output
+ test_cmp expect output
)
'
@@ -337,7 +337,7 @@ test_expect_success 'set-head --auto has no problem w/multiple HEADs' '
git fetch two "refs/heads/*:refs/remotes/two/*" &&
git remote set-head --auto two >output 2>&1 &&
echo "two/HEAD set to main" >expect &&
- test_i18ncmp expect output
+ test_cmp expect output
)
'
@@ -369,7 +369,7 @@ test_expect_success 'prune --dry-run' '
git remote prune --dry-run origin >output &&
git rev-parse refs/remotes/origin/side2 &&
test_must_fail git rev-parse refs/remotes/origin/side &&
- test_i18ncmp expect output
+ test_cmp expect output
)
'
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index a37df6d35a7..ad1d1d5fd6b 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -1051,7 +1051,7 @@ test_expect_success 'fetch --prune prints the remotes url' '
git fetch --prune origin 2>&1 | head -n1 >../actual
) &&
echo "From ${D}/." >expect &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'branchname D/F conflict resolved by --prune' '
diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index 4a568a2398e..f53f58895a1 100755
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -150,7 +150,7 @@ test_expect_success 'confuses pattern as remote when no remote specified' '
# We could just as easily have used "main"; the "*" emphasizes its
# role as a pattern.
test_must_fail git ls-remote "$does_not_exist" >actual 2>&1 &&
- test_i18ncmp exp actual
+ test_cmp exp actual
'
test_expect_success 'die with non-2 for wrong repository even with --exit-code' '
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 11513ec15e1..ed11569d8d7 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -74,7 +74,7 @@ test_expect_success "fetch --recurse-submodules recurses into submodules" '
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "submodule.recurse option triggers recursive fetch" '
@@ -84,7 +84,7 @@ test_expect_success "submodule.recurse option triggers recursive fetch" '
git -c submodule.recurse fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" '
@@ -94,7 +94,7 @@ test_expect_success "fetch --recurse-submodules -j2 has the same output behaviou
GIT_TRACE="$TRASH_DIRECTORY/trace.out" git fetch --recurse-submodules -j2 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err &&
+ test_cmp expect.err actual.err &&
grep "2 tasks" trace.out
'
@@ -124,7 +124,7 @@ test_expect_success "using fetchRecurseSubmodules=true in .gitmodules recurses i
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "--no-recurse-submodules overrides .gitmodules config" '
@@ -155,7 +155,7 @@ test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setti
git config --unset submodule.submodule.fetchRecurseSubmodules
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "--quiet propagates to submodules" '
@@ -183,7 +183,7 @@ test_expect_success "--dry-run propagates to submodules" '
git fetch --recurse-submodules --dry-run >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "Without --dry-run propagates to submodules" '
@@ -192,7 +192,7 @@ test_expect_success "Without --dry-run propagates to submodules" '
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "recurseSubmodules=true propagates into submodules" '
@@ -203,7 +203,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" '
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "--recurse-submodules overrides config in submodule" '
@@ -217,7 +217,7 @@ test_expect_success "--recurse-submodules overrides config in submodule" '
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "--no-recurse-submodules overrides config setting" '
@@ -257,7 +257,7 @@ test_expect_success "Recursion stops when no new submodule commits are fetched"
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
- test_i18ncmp expect.err.sub actual.err &&
+ test_cmp expect.err.sub actual.err &&
test_must_be_empty actual.out
'
@@ -275,7 +275,7 @@ test_expect_success "Recursion doesn't happen when new superproject commits don'
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err.file actual.err
+ test_cmp expect.err.file actual.err
'
test_expect_success "Recursion picks up config in submodule" '
@@ -303,7 +303,7 @@ test_expect_success "Recursion picks up config in submodule" '
git config --unset fetch.recurseSubmodules
)
) &&
- test_i18ncmp expect.err.sub actual.err &&
+ test_cmp expect.err.sub actual.err &&
test_must_be_empty actual.out
'
@@ -336,7 +336,7 @@ test_expect_success "Recursion picks up all submodules when necessary" '
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
- test_i18ncmp expect.err.2 actual.err &&
+ test_cmp expect.err.2 actual.err &&
test_must_be_empty actual.out
'
@@ -392,7 +392,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess
)
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
@@ -409,7 +409,7 @@ test_expect_success "'--recurse-submodules=on-demand' stops when no new submodul
git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err.file actual.err
+ test_cmp expect.err.file actual.err
'
test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" '
@@ -437,7 +437,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config
git config --unset fetch.recurseSubmodules
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err.2 actual.err
+ test_cmp expect.err.2 actual.err
'
test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
@@ -465,7 +465,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override
git config --unset submodule.submodule.fetchRecurseSubmodules
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err.2 actual.err
+ test_cmp expect.err.2 actual.err
'
test_expect_success "don't fetch submodule when newly recorded commits are already present" '
@@ -484,7 +484,7 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err &&
+ test_cmp expect.err actual.err &&
(
cd submodule &&
git checkout -q sub
@@ -520,7 +520,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .git
git reset --hard
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err.2 actual.err &&
+ test_cmp expect.err.2 actual.err &&
git checkout HEAD^ -- .gitmodules &&
git add .gitmodules &&
git commit -m "new submodule restored .gitmodules"
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index bc5ccf233f0..c024fa28183 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -118,7 +118,7 @@ test_expect_success 'rejected update prints status' '
git commit -m dev2 &&
test_must_fail git push origin dev2 2>act &&
sed -e "/^remote: /s/ *$//" <act >cmp &&
- test_i18ncmp exp cmp
+ test_cmp exp cmp
'
rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
diff --git a/t/t6020-bundle-misc.sh b/t/t6020-bundle-misc.sh
index 6249420a806..90b2be9b2ed 100755
--- a/t/t6020-bundle-misc.sh
+++ b/t/t6020-bundle-misc.sh
@@ -175,7 +175,7 @@ test_expect_success 'create bundle from special rev: main^!' '
cat >expect <<-\EOF &&
<COMMIT-P> refs/heads/main
EOF
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
git bundle verify special-rev.bdl |
make_user_friendly_and_stable_output >actual &&
@@ -185,7 +185,7 @@ test_expect_success 'create bundle from special rev: main^!' '
The bundle requires this ref:
<COMMIT-O>
EOF
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test_bundle_object_count special-rev.bdl 3
'
@@ -207,7 +207,7 @@ test_expect_success 'create bundle with --max-count option' '
The bundle requires this ref:
<COMMIT-O>
EOF
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test_bundle_object_count max-count.bdl 4
'
@@ -236,7 +236,7 @@ test_expect_success 'create bundle with --since option' '
<COMMIT-M>
<COMMIT-K>
EOF
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test_bundle_object_count --thin since.bdl 13
'
@@ -262,11 +262,11 @@ test_expect_success 'create bundle 1 - no prerequisites' '
# verify bundle, which has no prerequisites
git bundle verify 1.bdl |
make_user_friendly_and_stable_output >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
git bundle verify stdin-1.bdl |
make_user_friendly_and_stable_output >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test_bundle_object_count 1.bdl 24 &&
test_bundle_object_count stdin-1.bdl 24
@@ -304,11 +304,11 @@ test_expect_success 'create bundle 2 - has prerequisites' '
git bundle verify 2.bdl |
make_user_friendly_and_stable_output >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
git bundle verify stdin-2.bdl |
make_user_friendly_and_stable_output >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test_bundle_object_count 2.bdl 16 &&
test_bundle_object_count stdin-2.bdl 16
@@ -326,11 +326,11 @@ test_expect_success 'fail to verify bundle without prerequisites' '
test_must_fail git -C test1.git bundle verify ../2.bdl 2>&1 |
make_user_friendly_and_stable_output >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test_must_fail git -C test1.git bundle verify ../stdin-2.bdl 2>&1 |
make_user_friendly_and_stable_output >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'create bundle 3 - two refs, same object' '
@@ -363,11 +363,11 @@ test_expect_success 'create bundle 3 - two refs, same object' '
git bundle verify 3.bdl |
make_user_friendly_and_stable_output >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
git bundle verify stdin-3.bdl |
make_user_friendly_and_stable_output >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test_bundle_object_count 3.bdl 4 &&
test_bundle_object_count stdin-3.bdl 4
@@ -404,11 +404,11 @@ test_expect_success 'create bundle 4 - with tags' '
git bundle verify 4.bdl |
make_user_friendly_and_stable_output >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
git bundle verify stdin-4.bdl |
make_user_friendly_and_stable_output >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test_bundle_object_count 4.bdl 3 &&
test_bundle_object_count stdin-4.bdl 3
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 7bcde054d73..ef7bdcedf23 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -829,7 +829,7 @@ test_expect_success 'bisect terms needs 0 or 1 argument' '
test_must_fail git bisect terms 1 2 &&
test_must_fail git bisect terms 2>actual &&
echo "error: no terms defined" >expected &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'bisect terms shows good/bad after start' '
@@ -903,7 +903,7 @@ test_expect_success 'bisect start --term-* does store terms' '
Your current terms are two for the old state
and one for the new state.
EOF
- test_i18ncmp expected actual &&
+ test_cmp expected actual &&
git bisect terms --term-bad >actual &&
echo one >expected &&
test_cmp expected actual &&
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index a160b2bf99c..a313849406d 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -57,7 +57,7 @@ test_expect_success 'branch -v' '
git branch -v
) |
sed -n -e "$t6040_script" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
@@ -75,7 +75,7 @@ test_expect_success 'branch -vv' '
git branch -vv
) |
sed -n -e "$t6040_script" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'checkout (diverged from upstream)' '
@@ -146,7 +146,7 @@ test_expect_success 'status -s -b (diverged from upstream)' '
git checkout b1 >/dev/null &&
git status -s -b | head -1
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
@@ -159,7 +159,7 @@ test_expect_success 'status -s -b --no-ahead-behind (diverged from upstream)' '
git checkout b1 >/dev/null &&
git status -s -b --no-ahead-behind | head -1
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
@@ -172,7 +172,7 @@ test_expect_success 'status.aheadbehind=false status -s -b (diverged from upstre
git checkout b1 >/dev/null &&
git -c status.aheadbehind=false status -s -b | head -1
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
@@ -187,7 +187,7 @@ test_expect_success 'status --long --branch' '
git checkout b1 >/dev/null &&
git status --long -b | head -3
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'status --long --branch' '
@@ -196,7 +196,7 @@ test_expect_success 'status --long --branch' '
git checkout b1 >/dev/null &&
git -c status.aheadbehind=true status --long -b | head -3
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
@@ -210,7 +210,7 @@ test_expect_success 'status --long --branch --no-ahead-behind' '
git checkout b1 >/dev/null &&
git status --long -b --no-ahead-behind | head -2
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'status.aheadbehind=false status --long --branch' '
@@ -219,7 +219,7 @@ test_expect_success 'status.aheadbehind=false status --long --branch' '
git checkout b1 >/dev/null &&
git -c status.aheadbehind=false status --long -b | head -2
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
@@ -232,7 +232,7 @@ test_expect_success 'status -s -b (upstream is gone)' '
git checkout b5 >/dev/null &&
git status -s -b | head -1
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
@@ -245,7 +245,7 @@ test_expect_success 'status -s -b (up-to-date with upstream)' '
git checkout b6 >/dev/null &&
git status -s -b | head -1
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'fail to track lightweight tags' '
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 546796f8473..e89b6747bee 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -136,7 +136,7 @@ warning: tag 'Q' is externally known as 'A'
EOF
check_describe A-* HEAD
test_expect_success 'warning was displayed for Q' '
- test_i18ncmp err.expect err.actual
+ test_cmp err.expect err.actual
'
test_expect_success 'misnamed annotated tag forces long output' '
description=$(git describe --no-long Q^0) &&
diff --git a/t/t6134-pathspec-in-submodule.sh b/t/t6134-pathspec-in-submodule.sh
index c6706684098..0f1cb49cedc 100755
--- a/t/t6134-pathspec-in-submodule.sh
+++ b/t/t6134-pathspec-in-submodule.sh
@@ -21,7 +21,7 @@ EOF
test_expect_success 'error message for path inside submodule' '
echo a >sub/a &&
test_must_fail git add sub/a 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'error message for path inside submodule from within submodule' '
diff --git a/t/t6301-for-each-ref-errors.sh b/t/t6301-for-each-ref-errors.sh
index 809854fc0ce..40edf9dab53 100755
--- a/t/t6301-for-each-ref-errors.sh
+++ b/t/t6301-for-each-ref-errors.sh
@@ -20,8 +20,8 @@ test_expect_success 'Broken refs are reported correctly' '
test_when_finished "rm -f .git/$r" &&
echo "warning: ignoring broken ref $r" >broken-err &&
git for-each-ref >out 2>err &&
- test_i18ncmp full-list out &&
- test_i18ncmp broken-err err
+ test_cmp full-list out &&
+ test_cmp broken-err err
'
test_expect_success 'NULL_SHA1 refs are reported correctly' '
@@ -31,10 +31,10 @@ test_expect_success 'NULL_SHA1 refs are reported correctly' '
echo "warning: ignoring broken ref $r" >zeros-err &&
git for-each-ref >out 2>err &&
test_cmp full-list out &&
- test_i18ncmp zeros-err err &&
+ test_cmp zeros-err err &&
git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
test_cmp brief-list brief-out &&
- test_i18ncmp zeros-err brief-err
+ test_cmp zeros-err brief-err
'
test_expect_success 'Missing objects are reported correctly' '
@@ -43,7 +43,7 @@ test_expect_success 'Missing objects are reported correctly' '
test_when_finished "rm -f .git/$r" &&
echo "fatal: missing object $MISSING for $r" >missing-err &&
test_must_fail git for-each-ref 2>err &&
- test_i18ncmp missing-err err &&
+ test_cmp missing-err err &&
(
cat brief-list &&
echo "$MISSING $r"
diff --git a/t/t6436-merge-overwrite.sh b/t/t6436-merge-overwrite.sh
index 362ae37a122..84b4aacf496 100755
--- a/t/t6436-merge-overwrite.sh
+++ b/t/t6436-merge-overwrite.sh
@@ -139,7 +139,7 @@ test_expect_success 'will not overwrite untracked file in leading path' '
cp important sub &&
cp important sub2 &&
test_must_fail git merge sub 2>out &&
- test_i18ncmp out expect &&
+ test_cmp out expect &&
test_path_is_missing .git/MERGE_HEAD &&
test_cmp important sub &&
test_cmp important sub2 &&
@@ -174,7 +174,7 @@ test_expect_success 'will not overwrite untracked file on unborn branch' '
git checkout --orphan new &&
cp important c0.c &&
test_must_fail git merge c0 2>out &&
- test_i18ncmp out expect
+ test_cmp out expect
'
test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '
diff --git a/t/t6439-merge-co-error-msgs.sh b/t/t6439-merge-co-error-msgs.sh
index e176475ed5b..5bfb027099a 100755
--- a/t/t6439-merge-co-error-msgs.sh
+++ b/t/t6439-merge-co-error-msgs.sh
@@ -40,14 +40,14 @@ EOF
test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' '
test_must_fail git merge branch 2>out &&
- test_i18ncmp out expect &&
+ test_cmp out expect &&
git commit --allow-empty -m empty &&
(
GIT_MERGE_VERBOSITY=0 &&
export GIT_MERGE_VERBOSITY &&
test_must_fail git merge branch 2>out2
) &&
- test_i18ncmp out2 expect &&
+ test_cmp out2 expect &&
git reset --hard HEAD^
'
@@ -68,7 +68,7 @@ test_expect_success 'untracked files or local changes ovewritten by merge' '
git add three &&
git add four &&
test_must_fail git merge branch 2>out &&
- test_i18ncmp out expect
+ test_cmp out expect
'
cat >expect <<\EOF
@@ -90,7 +90,7 @@ test_expect_success 'cannot switch branches because of local changes' '
echo uno >rep/one &&
echo dos >rep/two &&
test_must_fail git checkout branch 2>out &&
- test_i18ncmp out expect
+ test_cmp out expect
'
cat >expect <<\EOF
@@ -104,7 +104,7 @@ EOF
test_expect_success 'not uptodate file porcelain checkout error' '
git add rep/one rep/two &&
test_must_fail git checkout branch 2>out &&
- test_i18ncmp out expect
+ test_cmp out expect
'
cat >expect <<\EOF
@@ -135,7 +135,7 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' '
>rep/untracked-file &&
>rep2/untracked-file &&
test_must_fail git checkout branch 2>out &&
- test_i18ncmp out ../expect
+ test_cmp out ../expect
'
test_done
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 63d5f41a124..080a6530831 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -446,7 +446,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
- test_i18ncmp expect.err actual.err &&
+ test_cmp expect.err actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
(
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 943a7d5c1db..bbd2b7b6f35 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -91,7 +91,7 @@ test_expect_success 'creating a tag with --create-reflog should create reflog' '
git tag --create-reflog tag_with_reflog &&
git reflog exists refs/tags/tag_with_reflog &&
sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'annotated tag with --create-reflog has correct message' '
@@ -102,7 +102,7 @@ test_expect_success 'annotated tag with --create-reflog has correct message' '
git tag -m "annotated tag" --create-reflog tag_with_reflog &&
git reflog exists refs/tags/tag_with_reflog &&
sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success '--create-reflog does not create reflog on failure' '
@@ -1409,7 +1409,7 @@ test_expect_success 'message in editor has initial comment: first line' '
# check the first line --- should be empty
echo >first.expect &&
sed -e 1q <actual >first.actual &&
- test_i18ncmp first.expect first.actual
+ test_cmp first.expect first.actual
'
test_expect_success \
@@ -1732,7 +1732,7 @@ test_expect_success 'recursive tagging should give advice' '
hint: Disable this message with "git config advice.nestedTag false"
EOF
git tag -m nested nested annotated-v4.0 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'multiple --points-at are OR-ed together' '
diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index e5c6a038fbf..f2a8e765114 100755
--- a/t/t7012-skip-worktree-writing.sh
+++ b/t/t7012-skip-worktree-writing.sh
@@ -125,13 +125,13 @@ EOF
test_expect_success 'git-clean, absent case' '
setup_absent &&
git clean -n > result &&
- test_i18ncmp expected result
+ test_cmp expected result
'
test_expect_success 'git-clean, dirty case' '
setup_dirty &&
git clean -n > result &&
- test_i18ncmp expected result
+ test_cmp expected result
'
test_expect_success '--ignore-skip-worktree-entries leaves worktree alone' '
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 72fb418b890..0f4344c55e6 100755
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -56,9 +56,9 @@ EOF
git commit -m delete &&
test_must_fail git merge main &&
test_must_fail git commit --dry-run >../actual &&
- test_i18ncmp ../expect ../actual &&
+ test_cmp ../expect ../actual &&
git status >../actual &&
- test_i18ncmp ../expect ../actual
+ test_cmp ../expect ../actual
)
'
@@ -151,7 +151,7 @@ Unmerged paths:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -185,7 +185,7 @@ Unmerged paths:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -210,7 +210,7 @@ Unmerged paths:
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual &&
+ test_cmp expected actual &&
git reset --hard &&
git checkout main
'
@@ -227,7 +227,7 @@ test_expect_success 'status --branch with detached HEAD' '
?? expected
?? mdconflict/
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
'
## Duplicate the above test and verify --porcelain=v1 arg parsing.
@@ -243,7 +243,7 @@ test_expect_success 'status --porcelain=v1 --branch with detached HEAD' '
?? expected
?? mdconflict/
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
'
## Verify parser error on invalid --porcelain argument.
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index f01bf277279..accefde72fb 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -731,7 +731,7 @@ test_expect_success 'test ident field is working' '
cp -R done dthree dtwo four three ../other_worktree &&
GIT_WORK_TREE=../other_worktree git status 2>../err &&
echo "warning: untracked cache is disabled on this system or location" >../expect &&
- test_i18ncmp ../expect ../err
+ test_cmp ../expect ../err
'
test_expect_success 'untracked cache survives a checkout' '
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 7d8fb188ee5..601b2bf97f0 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -75,14 +75,14 @@ test_expect_success 'reset --hard message' '
hex=$(git log -1 --format="%h") &&
git reset --hard >.actual &&
echo HEAD is now at $hex $(commit_msg) >.expected &&
- test_i18ncmp .expected .actual
+ test_cmp .expected .actual
'
test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
hex=$(git log -1 --format="%h") &&
git -c "i18n.logOutputEncoding=$test_encoding" reset --hard >.actual &&
echo HEAD is now at $hex $(commit_msg $test_encoding) >.expected &&
- test_i18ncmp .expected .actual
+ test_cmp .expected .actual
'
test_expect_success 'giving a non existing revision should fail' '
@@ -469,7 +469,7 @@ test_expect_success '--mixed refreshes the index' '
EOF
echo 123 >>file2 &&
git reset --mixed HEAD >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'resetting specific path that is unmerged' '
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index d44f6962933..a924fdb7a6c 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -55,7 +55,7 @@ test_expect_success 'add aborts on repository with no commits' '
EOF
git init repo-no-commits &&
test_must_fail git submodule add ../a ./repo-no-commits 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'status should ignore inner git repo when not added' '
@@ -185,7 +185,7 @@ test_expect_success 'submodule add to .gitignored path fails' '
git add --force .gitignore &&
git commit -m"Ignore everything" &&
! git submodule add "$submodurl" submod >actual 2>&1 &&
- test_i18ncmp expect actual
+ test_cmp expect actual
)
'
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
index 76088147089..9c3cc4cf404 100755
--- a/t/t7401-submodule-summary.sh
+++ b/t/t7401-submodule-summary.sh
@@ -190,7 +190,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --cached' "
< Add foo5
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
"
test_expect_success 'typechanged submodule(submodule->blob), --files' "
@@ -200,7 +200,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --files' "
> Add foo5
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
"
rm -rf sm1 &&
@@ -211,7 +211,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' "
* sm1 $head4(submodule)->$head5(blob):
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
"
rm -f sm1 &&
@@ -224,7 +224,7 @@ test_expect_success 'nonexistent commit' "
Warn: sm1 doesn't contain commit $head4_full
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
"
commit_file
@@ -235,7 +235,7 @@ test_expect_success 'typechanged submodule(blob->submodule)' "
> Add foo7
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
"
commit_file sm1 &&
@@ -292,7 +292,7 @@ test_expect_success 'given commit' "
test_expect_success '--for-status' "
git submodule summary --for-status HEAD^ >actual &&
- test_i18ncmp - actual <<-EOF
+ test_cmp - actual <<-EOF
* sm1 $head6...0000000:
* sm2 0000000...$head7 (2):
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index b9c1624fba9..ff3ba5422e9 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -155,9 +155,9 @@ test_expect_success 'submodule update --init --recursive from subdirectory' '
cd tmp &&
git submodule update --init --recursive ../super >../../actual 2>../../actual2
) &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
sort actual2 >actual2.sorted &&
- test_i18ncmp expect2 actual2.sorted
+ test_cmp expect2 actual2.sorted
'
cat <<EOF >expect2
@@ -174,7 +174,7 @@ test_expect_success 'submodule update --init from and of subdirectory' '
git submodule update --init sub 2>../../actual2
)
) &&
- test_i18ncmp expect2 actual2
+ test_cmp expect2 actual2
'
test_expect_success 'submodule update does not fetch already present commits' '
@@ -192,7 +192,7 @@ test_expect_success 'submodule update does not fetch already present commits' '
(cd super &&
git submodule update > ../actual 2> ../actual.err
) &&
- test_i18ncmp expected actual &&
+ test_cmp expected actual &&
test_must_be_empty actual.err
'
@@ -461,7 +461,7 @@ test_expect_success 'submodule update - command in .git/config catches failure'
(cd super &&
test_must_fail git submodule update submodule 2>../actual
) &&
- test_i18ncmp actual expect
+ test_cmp actual expect
'
cat << EOF >expect
@@ -479,7 +479,7 @@ test_expect_success 'submodule update - command in .git/config catches failure -
mkdir tmp && cd tmp &&
test_must_fail git submodule update ../submodule 2>../../actual
) &&
- test_i18ncmp actual expect
+ test_cmp actual expect
'
test_expect_success 'submodule update - command run for initial population of submodule' '
@@ -488,7 +488,7 @@ test_expect_success 'submodule update - command run for initial population of su
EOF
rm -rf super/submodule &&
test_must_fail git -C super submodule update 2>actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
git -C super submodule update --checkout
'
@@ -509,7 +509,7 @@ test_expect_success 'recursive submodule update - command in .git/config catches
mkdir -p tmp && cd tmp &&
test_must_fail git submodule update --recursive ../super 2>../../actual
) &&
- test_i18ncmp actual expect
+ test_cmp actual expect
'
test_expect_success 'submodule init does not copy command into .git/config' '
diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 79981b51eb8..e2f110b7863 100755
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -80,7 +80,7 @@ test_expect_success 'test basic "submodule foreach" usage' '
git config foo.bar zar &&
git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar"
) &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<EOF
@@ -96,7 +96,7 @@ test_expect_success 'test "submodule foreach" from subdirectory' '
cd clone/sub &&
git submodule foreach "echo \$toplevel-\$name-\$sm_path-\$displaypath-\$sha1" >../../actual
) &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'setup nested submodules' '
@@ -177,7 +177,7 @@ test_expect_success 'test messages from "foreach --recursive"' '
cd clone2 &&
git submodule foreach --recursive "true" > ../actual
) &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat > expect <<EOF
@@ -197,7 +197,7 @@ test_expect_success 'test messages from "foreach --recursive" from subdirectory'
cd untracked &&
git submodule foreach --recursive >../../actual
) &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
sub1sha1=$(cd clone2/sub1 && git rev-parse HEAD)
sub2sha1=$(cd clone2/sub2 && git rev-parse HEAD)
@@ -229,7 +229,7 @@ test_expect_success 'test "submodule foreach --recursive" from subdirectory' '
cd clone2/untracked &&
git submodule foreach --recursive "echo toplevel: \$toplevel name: \$name path: \$sm_path displaypath: \$displaypath hash: \$sha1" >../../actual
) &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat > expect <<EOF
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
index 6d19ece05dd..e41ac18e7e0 100755
--- a/t/t7500-commit-template-squash-signoff.sh
+++ b/t/t7500-commit-template-squash-signoff.sh
@@ -15,7 +15,7 @@ commit_msg_is () {
printf "%s" "$(git log --pretty=format:%s%b -1)" >"$actual" &&
printf "%s" "$1" >"$expect" &&
- test_i18ncmp "$expect" "$actual"
+ test_cmp "$expect" "$actual"
}
# A sanity check to see if commit is working at all.
@@ -356,7 +356,7 @@ test_expect_success 'new line found before status message in commit template' '
touch commit-template-check &&
git add commit-template-check &&
GIT_EDITOR="cat >editor-input" git commit --untracked-files=no --allow-empty-message &&
- test_i18ncmp expected-template editor-input
+ test_cmp expected-template editor-input
'
test_expect_success 'setup empty commit with unstaged rename and copy' '
diff --git a/t/t7502-commit-porcelain.sh b/t/t7502-commit-porcelain.sh
index e5332adc9a1..6396897cc81 100755
--- a/t/t7502-commit-porcelain.sh
+++ b/t/t7502-commit-porcelain.sh
@@ -13,7 +13,7 @@ commit_msg_is () {
printf "%s" "$(git log --pretty=format:%s%b -1)" >$actual &&
printf "%s" "$1" >$expect &&
- test_i18ncmp $expect $actual
+ test_cmp $expect $actual
}
# Arguments: [<prefix] [<commit message>] [<commit options>]
@@ -35,7 +35,7 @@ check_summary_oneline() {
SUMMARY_POSTFIX="$(git log -1 --pretty='format:%h')"
echo "[$SUMMARY_PREFIX $SUMMARY_POSTFIX] $2" >exp &&
- test_i18ncmp exp act
+ test_cmp exp act
}
test_expect_success 'output summary format' '
@@ -300,7 +300,7 @@ echo "sample
# with '#' will be ignored, and an empty message aborts the commit." >expect
test_expect_success 'cleanup commit messages (strip option,-F,-e): output' '
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'cleanup commit message (fail on invalid cleanup mode option)' '
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index d01aacb66b5..2b72451ba3e 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -109,13 +109,13 @@ test_expect_success 'status --column' '
#
EOF
COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status --column status.displayCommentPrefix=false' '
strip_comments expect &&
COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<\EOF
@@ -144,19 +144,19 @@ EOF
test_expect_success 'status with status.displayCommentPrefix=true' '
git -c status.displayCommentPrefix=true status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status with status.displayCommentPrefix=false' '
strip_comments expect &&
git -c status.displayCommentPrefix=false status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status -v' '
(cat expect && git diff --cached) >expect-with-v &&
git status -v >output &&
- test_i18ncmp expect-with-v output
+ test_cmp expect-with-v output
'
test_expect_success 'status -v -v' '
@@ -167,7 +167,7 @@ test_expect_success 'status -v -v' '
echo "Changes not staged for commit:" &&
git -c diff.mnemonicprefix=true diff) >expect-with-v &&
git status -v -v >output &&
- test_i18ncmp expect-with-v output
+ test_cmp expect-with-v output
'
test_expect_success 'setup fake editor' '
@@ -214,7 +214,7 @@ EOF
test_expect_success 'status (advice.statusHints false)' '
test_config advice.statusHints false &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
@@ -296,7 +296,7 @@ Ignored files:
EOF
git status --ignored >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status with gitignore (nothing untracked)' '
@@ -358,7 +358,7 @@ Ignored files:
EOF
git status --ignored >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >.gitignore <<\EOF
@@ -380,7 +380,7 @@ EOF
test_expect_success 'status -s -b' '
git status -s -b >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
@@ -390,7 +390,7 @@ test_expect_success 'status -s -z -b' '
git status -s -z -b >output &&
nul_to_q <output >output.q &&
mv output.q output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'setup dir3' '
@@ -418,13 +418,13 @@ Changes not staged for commit:
Untracked files not listed (use -u option to show untracked files)
EOF
git status -uno >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status (status.showUntrackedFiles no)' '
test_config status.showuntrackedfiles no &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status -uno (advice.statusHints false)' '
@@ -443,7 +443,7 @@ Untracked files not listed
EOF
test_config advice.statusHints false &&
git status -uno >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect << EOF
@@ -487,13 +487,13 @@ Untracked files:
EOF
git status -unormal >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status (status.showUntrackedFiles normal)' '
test_config status.showuntrackedfiles normal &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<EOF
@@ -543,13 +543,13 @@ Untracked files:
EOF
git status -uall >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status (status.showUntrackedFiles all)' '
test_config status.showuntrackedfiles all &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'teardown dir3' '
@@ -601,7 +601,7 @@ Untracked files:
EOF
(cd dir1 && git status) >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<\EOF
@@ -670,13 +670,13 @@ Untracked files:
EOF
test_config color.ui auto &&
test_terminal git status | test_decode_color >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success TTY 'status with color.status' '
test_config color.status auto &&
test_terminal git status | test_decode_color >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<\EOF
@@ -718,7 +718,7 @@ EOF
test_expect_success TTY 'status -s -b with color.status' '
test_terminal git status -s -b | test_decode_color >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
@@ -793,7 +793,7 @@ Untracked files:
EOF
test_config status.relativePaths false &&
(cd dir1 && git status) >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
@@ -860,7 +860,7 @@ Untracked files:
EOF
git commit --dry-run dir1/modified >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<EOF
@@ -921,13 +921,13 @@ Untracked files:
EOF
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
# we expect the same as the previous test
test_expect_success 'status --untracked-files=all does not show submodule' '
git status --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<EOF
@@ -984,13 +984,13 @@ Untracked files:
EOF
git config status.submodulesummary 10 &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status submodule summary with status.displayCommentPrefix=false' '
strip_comments expect &&
git -c status.displayCommentPrefix=false status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'commit with submodule summary ignores status.displayCommentPrefix' '
@@ -1035,9 +1035,9 @@ EOF
git commit -m "commit submodule" &&
git config status.submodulesummary 10 &&
test_must_fail git commit --dry-run >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<EOF
@@ -1091,7 +1091,7 @@ Untracked files:
EOF
git config status.submodulesummary 10 &&
git commit --dry-run --amend >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' '
@@ -1143,17 +1143,17 @@ Untracked files:
EOF
echo modified sm/untracked &&
git status --ignore-submodules=untracked >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
test_config diff.ignoreSubmodules dirty &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --add -f .gitmodules submodule.subname.ignore untracked &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1163,14 +1163,14 @@ test_expect_success '.git/config ignore=untracked suppresses submodules with unt
git config --add submodule.subname.ignore untracked &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config --remove-section -f .gitmodules submodule.subname
'
test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
git status --ignore-submodules=dirty >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
@@ -1180,7 +1180,7 @@ test_expect_success '.gitmodules ignore=dirty suppresses submodules with untrack
git config --add -f .gitmodules submodule.subname.ignore dirty &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1190,7 +1190,7 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with untrack
git config --add submodule.subname.ignore dirty &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1198,14 +1198,14 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with untrack
test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
echo modified >sm/foo &&
git status --ignore-submodules=dirty >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
git config --add -f .gitmodules submodule.subname.ignore dirty &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1215,7 +1215,7 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with modifie
git config --add submodule.subname.ignore dirty &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1253,14 +1253,14 @@ Untracked files:
EOF
git status --ignore-submodules=untracked > output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
git config --add -f .gitmodules submodule.subname.ignore untracked &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1270,7 +1270,7 @@ test_expect_success ".git/config ignore=untracked doesn't suppress submodules wi
git config --add submodule.subname.ignore untracked &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1314,14 +1314,14 @@ Untracked files:
EOF
git status --ignore-submodules=untracked > output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" '
git config --add -f .gitmodules submodule.subname.ignore untracked &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1331,20 +1331,20 @@ test_expect_success ".git/config ignore=untracked doesn't suppress submodule sum
git config --add submodule.subname.ignore untracked &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
git status --ignore-submodules=dirty > output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
git config --add -f .gitmodules submodule.subname.ignore dirty &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1354,7 +1354,7 @@ test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary
git config --add submodule.subname.ignore dirty &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1398,7 +1398,7 @@ EOF
test_expect_success "status (core.commentchar with submodule summary)" '
test_config core.commentchar ";" &&
git -c status.displayCommentPrefix=true status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success "status (core.commentchar with two chars with submodule summary)" '
@@ -1429,7 +1429,7 @@ Untracked files:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --ignore-submodules=all > output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success '.gitmodules ignore=all suppresses unstaged submodule summary' '
@@ -1460,7 +1460,7 @@ EOF
git config --add -f .gitmodules submodule.subname.ignore all &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status > output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1470,7 +1470,7 @@ test_expect_success '.git/config ignore=all suppresses unstaged submodule summar
git config --add submodule.subname.ignore all &&
git config --add submodule.subname.path sm &&
git status > output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1571,7 +1571,7 @@ Changes not staged for commit:
Untracked files not listed (use -u option to show untracked files)
EOF
git commit -uno --dry-run >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git status -s --ignore-submodules=dirty >output &&
test_i18ngrep "^M. sm" output
'
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 9f5e3ce7931..7f2956d77ad 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -41,7 +41,7 @@ Unmerged paths:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -61,7 +61,7 @@ Changes to be committed:
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -93,7 +93,7 @@ Unmerged paths:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -116,7 +116,7 @@ Changes to be committed:
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -154,7 +154,7 @@ Unmerged paths:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -180,7 +180,7 @@ Changes to be committed:
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -210,7 +210,7 @@ You are currently editing a commit while rebasing branch '\''rebase_i_edit'\'' o
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -249,7 +249,7 @@ Changes not staged for commit:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -282,7 +282,7 @@ You are currently editing a commit while rebasing branch '\''amend_last'\'' on '
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -321,7 +321,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -356,7 +356,7 @@ Changes not staged for commit:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -387,7 +387,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -418,7 +418,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -454,7 +454,7 @@ Changes not staged for commit:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -486,7 +486,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -519,7 +519,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -557,7 +557,7 @@ Changes not staged for commit:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -591,7 +591,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -619,7 +619,7 @@ You are in the middle of an am session.
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -641,7 +641,7 @@ You are in the middle of an am session.
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -664,7 +664,7 @@ The current patch is empty.
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -687,7 +687,7 @@ You are currently bisecting, started from branch '\''bisect'\''.
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -712,7 +712,7 @@ Unmerged paths:
no changes added to commit
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -746,7 +746,7 @@ Unmerged paths:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -770,7 +770,7 @@ Changes to be committed:
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status when cherry-picking after committing conflict resolution' '
@@ -789,7 +789,7 @@ Cherry-pick currently in progress.
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status shows cherry-pick with invalid oid' '
@@ -798,7 +798,7 @@ test_expect_success 'status shows cherry-pick with invalid oid' '
git status --untracked-files=no >actual 2>err &&
git cherry-pick --quit &&
test_must_be_empty err &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status does not show error if .git/sequencer is a file' '
@@ -816,7 +816,7 @@ HEAD detached at atag
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual &&
+ test_cmp expected actual &&
git reset --hard HEAD^ &&
cat >expected <<\EOF &&
@@ -824,7 +824,7 @@ HEAD detached from atag
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status while reverting commit (conflicts)' '
@@ -852,7 +852,7 @@ Unmerged paths:
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status while reverting commit (conflicts resolved)' '
@@ -872,7 +872,7 @@ Changes to be committed:
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status after reverting commit' '
@@ -882,7 +882,7 @@ On branch main
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status while reverting after committing conflict resolution' '
@@ -901,7 +901,7 @@ Revert currently in progress.
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'prepare for different number of commits rebased' '
@@ -931,7 +931,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status: two commands done with some white lines in done file' '
@@ -959,7 +959,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status: two remaining commands with some white lines in todo file' '
@@ -988,7 +988,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status: handle not-yet-started rebase -i gracefully' '
@@ -1007,7 +1007,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
nothing to commit (use -u to show untracked files)
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_done
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index fbfdcca0007..45d025f9601 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -236,7 +236,7 @@ test_expect_success 'refresh_index() invalidates fsmonitor cache' '
git reset HEAD~1 &&
git status >actual &&
git -c core.fsmonitor= status >expect &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
# test fsmonitor with and without preloadIndex
@@ -273,7 +273,7 @@ do
git add dir2/new &&
git status >actual &&
git -c core.fsmonitor= status >expect &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
# Make sure it's actually skipping the check for modified and untracked
diff --git a/t/t7521-ignored-mode.sh b/t/t7521-ignored-mode.sh
index 91790943c3d..a88b02b06ed 100755
--- a/t/t7521-ignored-mode.sh
+++ b/t/t7521-ignored-mode.sh
@@ -30,7 +30,7 @@ test_expect_success 'Verify behavior of status on directories with ignored files
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify status behavior on directory with tracked & ignored files' '
@@ -55,7 +55,7 @@ test_expect_success 'Verify status behavior on directory with tracked & ignored
git commit -m "commit tracked files" &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify status behavior on directory with untracked and ignored files' '
@@ -80,7 +80,7 @@ test_expect_success 'Verify status behavior on directory with untracked and igno
dir/untracked_ignored/ignored_1.ign dir/untracked_ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify status matching ignored files on ignored directory' '
@@ -96,7 +96,7 @@ test_expect_success 'Verify status matching ignored files on ignored directory'
ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
@@ -117,7 +117,7 @@ test_expect_success 'Verify status behavior on ignored directory containing trac
git add -f ignored_dir/tracked &&
git commit -m "Force add file in ignored directory" &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
@@ -136,7 +136,7 @@ test_expect_success 'Verify matching ignored files with --untracked-files=normal
ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
untracked_dir/untracked &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
@@ -155,7 +155,7 @@ test_expect_success 'Verify matching ignored files with --untracked-files=normal
ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
untracked_dir/untracked &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
@@ -176,7 +176,7 @@ test_expect_success 'Verify status behavior on ignored directory containing trac
git add -f ignored_dir/tracked &&
git commit -m "Force add file in ignored directory" &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=no' '
@@ -191,7 +191,7 @@ test_expect_success 'Verify behavior of status with --ignored=no' '
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=no --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=all' '
@@ -210,7 +210,7 @@ test_expect_success 'Verify behavior of status with --ignored=traditional and --
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=traditional --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=normal' '
@@ -227,7 +227,7 @@ test_expect_success 'Verify behavior of status with --ignored=traditional and --
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=traditional --untracked-files=normal >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index b2c1d861dcb..1cbc9715a81 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -272,7 +272,7 @@ test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
EOF
git cat-file commit HEAD >raw &&
sed -e "1,/^$/d" raw >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' '
@@ -296,7 +296,7 @@ test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' '
EOF
git cat-file commit HEAD >raw &&
sed -e "1,/^$/d" raw >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_debug 'git log --graph --decorate --oneline --all'
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 13859ec8595..a9c816b47f2 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -66,7 +66,7 @@ EOF
test_expect_success 'merge output uses pretty names' '
git reset --hard c1 &&
git merge c2 c3 c4 >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
cat >expected <<\EOF
@@ -84,7 +84,7 @@ test_expect_success 'merge reduces irrelevant remote heads' '
rm expected.tmp
fi &&
GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
cat >expected <<\EOF
@@ -101,7 +101,7 @@ EOF
test_expect_success 'merge fast-forward output uses pretty names' '
git reset --hard c0 &&
git merge c1 c2 >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_done
--
2.30.0.284.gd98b1dd5eaa7
^ permalink raw reply related [relevance 1%]
* What's cooking in git.git (Feb 2021, #02; Wed, 10)
@ 2021-02-11 1:32 4% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-02-11 1:32 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The seventh batch of topics are in 'master'. On the 'maint' front,
bunch of fixes that have already been in 'master' were merged there
and the result has been tagged as Git 2.30.1.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/detox-gettext-tests (2021-01-21) 3 commits
(merged to 'next' on 2021-02-01 at 5573b4913c)
+ tests: remove uses of GIT_TEST_GETTEXT_POISON=false
+ tests: remove support for GIT_TEST_GETTEXT_POISON
+ ci: remove GETTEXT_POISON jobs
Get rid of "GETTEXT_POISON" support altogether, which may or may
not be controversial.
* ab/grep-pcre-invalid-utf8 (2021-01-24) 2 commits
(merged to 'next' on 2021-02-01 at 60be521876)
+ grep/pcre2: better support invalid UTF-8 haystacks
+ grep/pcre2 tests: don't rely on invalid UTF-8 data test
Update support for invalid UTF-8 in PCRE2.
* ab/lose-grep-debug (2021-01-26) 1 commit
(merged to 'next' on 2021-01-31 at 9b7548efce)
+ grep/log: remove hidden --debug and --grep-debug options
Lose the debugging aid that may have been useful in the past, but
no longer is, in the "grep" codepaths.
* ab/retire-pcre1 (2021-01-23) 2 commits
(merged to 'next' on 2021-02-01 at 532a0a8228)
+ Remove support for v1 of the PCRE library
+ config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag
The support for deprecated PCRE1 library has been dropped.
* ds/cache-tree-basics (2021-01-15) 10 commits
(merged to 'next' on 2021-01-25 at 29ee74df7b)
+ cache-tree: speed up consecutive path comparisons
+ cache-tree: use ce_namelen() instead of strlen()
+ index-format: discuss recursion of cache-tree better
+ index-format: update preamble to cache tree extension
+ index-format: use 'cache tree' over 'cached tree'
+ cache-tree: trace regions for prime_cache_tree
+ cache-tree: trace regions for I/O
+ cache-tree: use trace2 in cache_tree_update()
+ unpack-trees: add trace2 regions
+ tree-walk: report recursion counts
(this branch is used by ds/more-index-cleanups.)
Document, clean-up and optimize the code around the cache-tree
extension in the index.
* ds/more-index-cleanups (2021-01-23) 9 commits
(merged to 'next' on 2021-02-01 at bcdfa11e73)
+ t1092: test interesting sparse-checkout scenarios
+ test-lib: test_region looks for trace2 regions
+ sparse-checkout: load sparse-checkout patterns
+ name-hash: use trace2 regions for init
+ repository: add repo reference to index_state
+ fsmonitor: de-duplicate BUG()s around dirty bits
+ cache-tree: extract subtree_pos()
+ cache-tree: simplify verify_cache() prototype
+ cache-tree: clean up cache_tree_update()
Cleaning various codepaths up.
* en/ort-conflict-handling (2021-01-04) 10 commits
(merged to 'next' on 2021-01-25 at 369c1516c4)
+ merge-ort: add handling for different types of files at same path
+ merge-ort: copy find_first_merges() implementation from merge-recursive.c
+ merge-ort: implement format_commit()
+ merge-ort: copy and adapt merge_submodule() from merge-recursive.c
+ merge-ort: copy and adapt merge_3way() from merge-recursive.c
+ merge-ort: flesh out implementation of handle_content_merge()
+ merge-ort: handle book-keeping around two- and three-way content merge
+ merge-ort: implement unique_path() helper
+ merge-ort: handle directory/file conflicts that remain
+ merge-ort: handle D/F conflict where directory disappears due to merge
(this branch is used by en/merge-ort-perf.)
ORT merge strategy learns more support for merge conflicts.
* jk/p5303-sed-portability-fix (2021-01-29) 1 commit
(merged to 'next' on 2021-01-31 at 5f2957e738)
+ p5303: avoid sed GNU-ism
A perf script was made more portable.
* jk/pretty-lazy-load-commit (2021-01-28) 1 commit
(merged to 'next' on 2021-02-01 at acf7353a32)
+ pretty: lazy-load commit data when expanding user-format
Some pretty-format specifiers do not need the data in commit object
(e.g. "%H"), but we were over-eager to load and parse it, which has
been made even lazier.
* jk/t0000-cleanups (2021-01-28) 4 commits
(merged to 'next' on 2021-01-31 at 357f8fe097)
+ t0000: consistently use single quotes for outer tests
+ t0000: run cleaning test inside sub-test
+ t0000: run prereq tests inside sub-test
+ t0000: keep clean-up tests together
Code clean-up.
* jk/use-oid-pos (2021-01-28) 6 commits
(merged to 'next' on 2021-01-31 at 10ccafb739)
+ oid_pos(): access table through const pointers
+ hash_pos(): convert to oid_pos()
+ rerere: use strmap to store rerere directories
+ rerere: tighten rr-cache dirname check
+ rerere: check dirname format while iterating rr_cache directory
+ commit_graft_pos(): take an oid instead of a bare hash
Code clean-up to ensure our use of hashtables using object names as
keys use the "struct object_id" objects, not the raw hash values.
* jk/weather-balloon-require-variadic-macro (2021-01-27) 1 commit
(merged to 'next' on 2021-01-31 at 8d5207bd85)
+ git-compat-util: always enable variadic macros
We've carried compatibility codepaths for compilers without
variadic macros for quite some time, but the world may be ready for
them to be removed. Force compilation failure on exotic platforms
where variadic macros are not available to find out who screams in
such a way that we can easily revert if it turns out that the world
is not yet ready.
* js/rebase-i-commit-cleanup-fix (2021-01-28) 1 commit
(merged to 'next' on 2021-01-31 at 358f562e1f)
+ rebase -i: do leave commit message intact in fixup! chains
When "git rebase -i" processes "fixup" insn, there is no reason to
clean up the commit log message, but we did the usual stripspace
processing. This has been corrected.
* jv/pack-objects-narrower-ref-iteration (2021-01-22) 1 commit
(merged to 'next' on 2021-01-26 at 8a0d178c01)
+ builtin/pack-objects.c: avoid iterating all refs
The "pack-objects" command needs to iterate over all the tags when
automatic tag following is enabled, but it actually iterated over
all refs and then discarded everything outside "refs/tags/"
hierarchy, which was quite wasteful.
* pb/blame-funcname-range-userdiff (2021-01-30) 1 commit
(merged to 'next' on 2021-01-31 at 107d10fe4f)
+ annotate-tests: quote variable expansions containing path names
Test fix.
* pb/ci-matrix-wo-shortcut (2021-01-27) 1 commit
(merged to 'next' on 2021-01-31 at 2384693758)
+ ci: do not cancel all jobs of a matrix if one fails
Our setting of GitHub CI test jobs were a bit too eager to give up
once there is even one failure found. Tweak the knob to allow
other jobs keep running even when we see a failure, so that we can
find more failures in a single run.
* ph/use-delete-refs (2021-01-21) 1 commit
(merged to 'next' on 2021-01-26 at e03486152e)
+ use delete_refs when deleting tags or branches
When removing many branches and tags, the code used to do so one
ref at a time. There is another API it can use to delete multiple
refs, and it makes quite a lot of performance difference when the
refs are packed.
* rs/worktree-list-verbose (2021-01-30) 7 commits
(merged to 'next' on 2021-02-01 at b57a6ce4c6)
+ worktree: teach `list` verbose mode
+ worktree: teach `list` to annotate prunable worktree
+ worktree: teach `list --porcelain` to annotate locked worktree
+ t2402: ensure locked worktree is properly cleaned up
+ worktree: teach worktree_lock_reason() to gently handle main worktree
+ worktree: teach worktree to lazy-load "prunable" reason
+ worktree: libify should_prune_worktree()
`git worktree list` now annotates worktrees as prunable, shows
locked and prunable attributes in --porcelain mode, and gained
a --verbose option.
cf. <CAPig+cTt-TyOR8kc6YvBVLpf-bgFdJ+FVYA2NvG_Vvn7tMbBkQ@mail.gmail.com>
* sg/t7800-difftool-robustify (2021-01-09) 1 commit
(merged to 'next' on 2021-01-31 at fb72af8200)
+ t7800-difftool: don't accidentally match tmp dirs
Test fix.
* sg/test-stress-jobs (2021-01-26) 1 commit
(merged to 'next' on 2021-02-01 at 0b7aae84e3)
+ test-lib: prevent '--stress-jobs=X' from being ignored
Test framework fix.
* so/log-diff-merge (2020-12-21) 32 commits
(merged to 'next' on 2021-01-25 at 63977ef287)
+ t4013: add tests for --diff-merges=first-parent
+ doc/git-show: include --diff-merges description
+ doc/rev-list-options: document --first-parent changes merges format
+ doc/diff-generate-patch: mention new --diff-merges option
+ doc/git-log: describe new --diff-merges options
+ diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
+ diff-merges: add old mnemonic counterparts to --diff-merges
+ diff-merges: let new options enable diff without -p
+ diff-merges: do not imply -p for new options
+ diff-merges: implement new values for --diff-merges
+ diff-merges: make -m/-c/--cc explicitly mutually exclusive
+ diff-merges: refactor opt settings into separate functions
+ diff-merges: get rid of now empty diff_merges_init_revs()
+ diff-merges: group diff-merge flags next to each other inside 'rev_info'
+ diff-merges: split 'ignore_merges' field
+ diff-merges: fix -m to properly override -c/--cc
+ t4013: add tests for -m failing to override -c/--cc
+ t4013: support test_expect_failure through ':failure' magic
+ diff-merges: revise revs->diff flag handling
+ diff-merges: handle imply -p on -c/--cc logic for log.c
+ diff-merges: introduce revs->first_parent_merges flag
+ diff-merges: new function diff_merges_set_dense_combined_if_unset()
+ diff-merges: new function diff_merges_suppress()
+ diff-merges: re-arrange functions to match the order they are called in
+ diff-merges: rename diff_merges_default_to_enable() to match semantics
+ diff-merges: move checks for first_parent_only out of the module
+ diff-merges: rename all functions to have common prefix
+ revision: move diff merges functions to its own diff-merges.c
+ revision: provide implementation for diff merges tweaks
+ revision: factor out initialization of diff-merge related settings
+ revision: factor out setup of diff-merge related settings
+ revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
* tb/ls-refs-optim (2021-01-22) 3 commits
(merged to 'next' on 2021-01-26 at 09edbf7d9a)
+ ls-refs.c: traverse prefixes of disjoint "ref-prefix" sets
+ ls-refs.c: initialize 'prefixes' before using it
+ refs: expose 'for_each_fullref_in_prefixes'
The ls-refs protocol operation has been optimized to narrow the
sub-hierarchy of refs/ it walks to produce response.
* zh/ls-files-deduplicate (2021-01-23) 3 commits
(merged to 'next' on 2021-01-26 at af7522d2cf)
+ ls-files.c: add --deduplicate option
+ ls_files.c: consolidate two for loops into one
+ ls_files.c: bugfix for --deleted and --modified
"git ls-files" can and does show multiple entries when the index is
unmerged, which is a source for confusion unless -s/-u option is in
use. A new option --deduplicate has been introduced.
--------------------------------------------------
[New Topics]
* js/range-diff-one-side-only (2021-02-06) 6 commits
(merged to 'next' on 2021-02-08 at 8c35ed8523)
+ range-diff: offer --left-only/--right-only options
+ range-diff: move the diffopt initialization down one layer
+ range-diff: combine all options in a single data structure
+ range-diff: simplify code spawning `git log`
+ range-diff: libify the read_patches() function again
+ range-diff: avoid leaking memory in two error code paths
The "git range-diff" command learned "--(left|right)-only" option
to show only one side of the compared range.
Will merge to 'master'.
* cm/rebase-i-updates (2021-02-10) 11 commits
- doc/rebase -i: fix typo in the documentation of 'fixup' command
- t/t3437: fixup the test 'multiple fixup -c opens editor once'
- t/t3437: use named commits in the tests
- t/t3437: simplify and document the test helpers
- t/t3437: check the author date of fixed up commit
- t/t3437: remove the dependency of 'expected-message' file from tests
- t/t3437: fixup here-docs in the 'setup' test
- t/lib-rebase: update the documentation of FAKE_LINES
- rebase -i: clarify and fix 'fixup -c' rebase-todo help
- sequencer: rename a few functions
- sequencer: fixup the datatype of the 'flag' argument
(this branch uses cm/rebase-i.)
Follow-up fixes to "cm/rebase-i" topic.
Will merge to 'next' after waiting for a few more days for comments.
* cw/pack-vs-bigfilethreashold (2021-02-09) 2 commits
- fixup! doc: mention bigFileThreshold for packing
- doc: mention bigFileThreshold for packing
Doc update.
Expecting a reroll.
cf. <F63929A8-7BC9-43A7-9E7B-118433F62588@gmx.ch>
* ds/maintenance-pack-refs (2021-02-09) 2 commits
- maintenance: incremental strategy runs pack-refs weekly
- maintenance: add pack-refs task
"git maintenance" tool learned a new "pack-refs" maintenance task.
Will merge to 'next' after waiting for a few more days for comments.
* jk/mailmap-only-at-root (2021-02-10) 1 commit
- mailmap: only look for .mailmap in work tree
The .mailmap is documented to be read only from the root level of a
working tree, but a stray file in a bare repository also was read
by accident, which has been corrected.
Will merge to 'next'.
* jk/rev-list-disk-usage (2021-02-09) 3 commits
- fixup! rev-list: add --disk-usage option for calculating disk usage
- rev-list: add --disk-usage option for calculating disk usage
- t: add --no-tag option to test_commit
"git rev-list" command learned "--disk-usage" option.
* jt/trace2-BUG (2021-02-09) 1 commit
(merged to 'next' on 2021-02-09 at 94911ad676)
+ usage: trace2 BUG() invocations
Even though invocations of "die()" were logged to the trace2
system, "BUG()"s were not, which has been corrected.
Will merge to 'master'.
* mt/checkout-index-corner-cases (2021-02-09) 2 commits
- checkout-index: omit entries with no tempname from --temp output
- write_entry(): fix misuses of `path` in error messages
The error codepath around the "--temp/--prefix" feature of "git
checkout-index" has been improved.
Expecting additional tests.
* mt/grep-cached-untracked (2021-02-09) 1 commit
- grep: error out if --untracked is used with --cached
"git grep --untracked" is meant to be "let's ALSO find in these
files on the filesystem" when looking for matches in the working
tree files, and does not make any sense if the primary search is
done against the index, or the tree objects. The "--cached" and
"--untracked" options have been marked as mutually incompatible.
Will merge to 'next'.
* tb/ci-run-cocci-with-18.04 (2021-02-08) 1 commit
(merged to 'next' on 2021-02-09 at c50bc53527)
+ .github/workflows/main.yml: run static-analysis on bionic
The version of Ubuntu Linux used by default at GitHub Actions CI
has been updated to one that lack coccinelle; until it gets fixed,
work it around by sticking to the previous release (18.04).
Will merge to 'master'.
* ab/test-lib (2021-02-10) 12 commits
- test-lib-functions: split out {debug,path,text} helpers
- test-lib-functions: assert correct parameter count
- test-lib-functions: remove bug-inducing "diagnostics" helper param
- test libs: rename "diff-lib" to "lib-diff"
- t/.gitattributes: sort lines
- test-lib-functions: move function to lib-bitmap.sh
- test libs: rename gitweb-lib.sh to lib-gitweb.sh
- test libs: rename bundle helper to "lib-bundle.sh"
- test-lib-functions: remove generate_zero_bytes() wrapper
- test-lib-functions: move test_set_index_version() to its user
- test lib: change "error" to "BUG" as appropriate
- test-lib: remove check_var_migration
Test framework clean-up.
* dl/stash-cleanup (2021-02-09) 7 commits
- stash: declare ref_stash as an array
- t3905: use test_cmp() to check file contents
- t3905: replace test -s with test_file_not_empty
- t3905: remove nested git in command substitution
- t3905: move all commands into test cases
- t3905: remove spaces after redirect operators
- git-stash.txt: be explicit about subcommand options
Documentation, code and test clean-up around "git stash".
Will merge to 'next' and to 'master' soonish.
This is an early part of a topic that added a new feature to the
command, but the implementation is expected to need a handful of
iterations; I split the preparatory part up to fast-track it.
* ew/rev-parse-since-test (2021-02-10) 1 commit
- t1500: ensure current --since= behavior remains
Test to make sure "git rev-parse one-thing one-thing" gives
the same thing twice (when one-thing is --since=X).
Will merge to 'next'.
* js/fsck-name-objects-fix (2021-02-10) 2 commits
- fsck --name-objects: be more careful parsing generation numbers
- t1450: robustify `remove_object()`
Fix "git fsck --name-objects" which apparently has not been used by
anybody who is motivated enough to report breakage.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
- docs: document symlink restrictions for .git* files
- fsck: complain when .gitattributes or .gitignore is a symlink
- verify_path(): disallow symlinks in .gitattributes and .gitignore
- t0060: test obscured .gitattributes and .gitignore matching
- t7450: test .gitmodules symlink matching against obscured names
- t7450: test verify_path() handling of gitmodules
- t7415: rename to expand scope
- fsck_tree(): wrap some long lines
- fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
has potential consequences that is more/less grave, so that these
projects can opt out of the new checks?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* jc/war-on-dashed-git (2020-12-21) 2 commits
- fixup??? git: catch an attempt to run "git-foo"
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Got enough review comments to get updated.
--------------------------------------------------
[Cooking]
* sv/t7001-modernize (2021-02-09) 10 commits
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use '>' rather than 'touch'
- t7001: avoid using `cd` outside of subshells
- t7001: remove whitespace after redirect operators
- t7001: modernize subshell formatting
- t7001: remove unnecessary blank lines
- t7001: indent with TABs instead of spaces
- t7001: modernize test formatting
Test script modernization.
* mt/grep-sparse-checkout (2021-02-09) 1 commit
- grep: honor sparse-checkout on working tree searches
"git grep" has been tweaked to be limited to the sparse checkout
paths.
Break out and fast-track bugfix from the remainder of the topic.
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* ab/make-cleanup (2021-02-01) 6 commits
- Makefile: add {program,xdiff,test,git}-objs & objects targets
- Makefile: split OBJECTS into OBJECTS and GIT_OBJS
- Makefile: sort OBJECTS assignment for subsequent change
- Makefile: split up long OBJECTS line
- Makefile: guard against TEST_OBJS in the environment
- Makefile: remove "all" on "$(FUZZ_OBJS)"
Reorganize Makefile to allow building git.o and other essential
objects without extra stuff needed only for testing.
* ds/commit-graph-genno-fix (2021-02-01) 6 commits
(merged to 'next' on 2021-02-03 at b3a9e11efb)
+ commit-graph: prepare commit graph
+ commit-graph: be extra careful about mixed generations
+ commit-graph: compute generations separately
+ commit-graph: validate layers for generation data
+ commit-graph: always parse before commit_graph_data_at()
+ commit-graph: use repo_parse_commit
(this branch uses ak/corrected-commit-date; is tangled with ds/chunked-file-api and ds/merge-base-independent.)
Fix incremental update of commit-graph file around corrected commit
date data.
Will merge to 'master'.
* jh/simple-ipc (2021-02-01) 13 commits
- simple-ipc: add Unix domain socket implementation
- unix-socket: do not call die in unix_stream_connect()
- unix-socket: add no-chdir option to unix_stream_listen()
- unix-socket: add options to unix_stream_listen()
- unix-socket: elimiate static unix_stream_socket() helper function
- simple-ipc: add t/helper/test-simple-ipc and t0052
- simple-ipc: add win32 implementation
- simple-ipc: design documentation for new IPC mechanism
- pkt-line: accept additional options in read_packetized_to_strbuf()
- pkt-line: (optionally) libify the packet readers
- pkt-line: optionally skip the flush packet in write_packetized_from_buf()
- pkt-line: add write_packetized_from_buf2() that takes scratch buffer
- pkt-line: promote static buffer in packet_write_gently() to callers
A simple IPC interface gets introduced to build services like
fsmonitor on top.
* ab/pager-exit-log (2021-02-01) 4 commits
- pager: properly log pager exit code when signalled
- run-command: add braces for "if" block in wait_or_whine()
- pager: test for exit code with and without SIGPIPE
- pager: refactor wait_for_pager() function
When a pager spawned by us exited, the trace log did not record its
exit status correctly, which has been corrected.
* jk/complete-branch-force-delete (2021-02-03) 3 commits
(merged to 'next' on 2021-02-03 at 6454bb89b5)
+ doc/git-branch: fix awkward wording for "-c"
+ completion: handle other variants of "branch -m"
+ completion: treat "branch -D" the same way as "branch -d"
The command line completion (in contrib/) completed "git branch -d"
with branch names, but "git branch -D" offered tagnames in addition,
which has been corrected. "git branch -M" had the same problem.
Will merge to 'master'.
* ta/hash-function-transition-doc (2021-02-05) 6 commits
- doc: use https links
- doc hash-function-transition: move rationale upwards
- doc hash-function-transition: fix incomplete sentence
- doc hash-function-transition: use upper case consistently
- doc hash-function-transition: use SHA-1 and SHA-256 consistently
- doc hash-function-transition: fix asciidoc output
Update formatting and grammar of the hash transition plan
documentation, plus some updates.
Will merge to 'next' after waiting for comments for a few days.
* ds/chunked-file-api (2021-02-05) 17 commits
- chunk-format: add technical docs
- chunk-format: restore duplicate chunk checks
- midx: use 64-bit multiplication for chunk sizes
- midx: use chunk-format read API
- commit-graph: use chunk-format read API
- chunk-format: create read chunk API
- midx: use chunk-format API in write_midx_internal()
- midx: drop chunk progress during write
- midx: return success/failure in chunk write methods
- midx: add num_large_offsets to write_midx_context
- midx: add pack_perm to write_midx_context
- midx: add entries to write_midx_context
- midx: use context in write_midx_pack_names()
- midx: rename pack_info to write_midx_context
- commit-graph: use chunk-format write API
- chunk-format: create chunk format write API
- commit-graph: anonymize data in chunk_write_fn
(this branch uses ak/corrected-commit-date; is tangled with ds/commit-graph-genno-fix and ds/merge-base-independent.)
The common code to deal with "chunked file format" that is shared
by the multi-pack-index and commit-graph files have been factored
out, to help codepaths for both filetypes to become more rebust.
Will merge to 'next' after waiting for a few days.
* ds/merge-base-independent (2021-02-01) 5 commits
- commit-reach: stale commits may prune generation further
- commit-reach: use heuristic in remove_redundant()
- commit-reach: move compare_commits_by_gen
- commit-reach: use one walk in remove_redundant()
- commit-reach: reduce requirements for remove_redundant()
(this branch uses ak/corrected-commit-date; is tangled with ds/chunked-file-api and ds/commit-graph-genno-fix.)
The code to implement "git merge-base --independent" was poorly
done and was kept from the very beginning of the feature.
* hv/trailer-formatting (2021-02-06) 3 commits
- ref-filter: use pretty.c logic for trailers
- pretty.c: capture invalid trailer argument
- pretty.c: refactor trailer logic to `format_set_trailers_options()`
The logic to handle "trailer" related placeholders in the
"--format=" mechanisms in the "log" family and "for-each-ref"
family is getting unified.
Ready for 'next'?
* sh/mergetool-hideresolved (2021-02-09) 3 commits
(merged to 'next' on 2021-02-09 at c3ed19b2ec)
+ mergetool: add per-tool support and overrides for the hideResolved flag
+ mergetool: break setup_tool out into separate initialization function
+ mergetool: add hideResolved configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Will merge to 'master'.
* tb/precompose-prefix-too (2021-02-03) 1 commit
(merged to 'next' on 2021-02-05 at 1dd43136b1)
+ MacOS: precompose_argv_prefix()
When commands are started from a subdirectory, they may have to
compare the path to the subdirectory (called prefix and found out
from $(pwd)) with the tracked paths. On macOS, $(pwd) and
readdir() yield decomposed path, while the tracked paths are
usually normalized to the precomposed form, causing mismatch. This
has been fixed by taking the same approach used to normalize the
command line arguments.
Will merge to 'master'.
* cm/rebase-i (2021-01-29) 9 commits
(merged to 'next' on 2021-02-01 at 4f9aa6cec3)
+ doc/git-rebase: add documentation for fixup [-C|-c] options
+ rebase -i: teach --autosquash to work with amend!
+ t3437: test script for fixup [-C|-c] options in interactive rebase
+ rebase -i: add fixup [-C | -c] command
+ sequencer: use const variable for commit message comments
+ sequencer: pass todo_item to do_pick_commit()
+ rebase -i: comment out squash!/fixup! subjects from squash message
+ sequencer: factor out code to append squash message
+ rebase -i: only write fixup-message when it's needed
(this branch is used by cm/rebase-i-updates.)
"rebase -i" is getting cleaned up and also enhanced.
Will cook in 'next' while waiting for the 'updates' topic.
* tb/geometric-repack (2021-02-03) 8 commits
- builtin/repack.c: add '--geometric' option
- packfile: add kept-pack cache for find_kept_pack_entry()
- builtin/pack-objects.c: rewrite honor-pack-keep logic
- p5303: measure time to repack with keep
- p5303: add missing &&-chains
- builtin/pack-objects.c: add '--stdin-packs' option
- revision: learn '--no-kept-objects'
- packfile: introduce 'find_kept_pack_entry()'
"git repack" so far has been only capable of repacking everything
under the sun into a single pack (or split by size). A cleverer
strategy to reduce the cost of repacking a repository has been
introduced.
* ah/rebase-no-fork-point-config (2021-01-21) 1 commit
- rebase: add a config option for --no-fork-point
"git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.
Expecting a reroll to update its tests.
cf. <CAMMLpeTDNLUz9UVnL3aVK=J7X50Sq8L-OVGaoEsT5AY6EQON-g@mail.gmail.com>
* js/range-diff-wo-dotdot (2021-02-06) 3 commits
(merged to 'next' on 2021-02-08 at 9ae8b46d99)
+ range-diff(docs): explain how to specify commit ranges
+ range-diff/format-patch: handle commit ranges other than A..B
+ range-diff/format-patch: refactor check for commit range
There are other ways than ".." for a single token to denote a
"commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
range-diff" did not understand them.
Will merge to 'master'.
* jx/t5411-unique-filenames (2021-01-22) 2 commits
- t5411: refactor check of refs using test_cmp_refs
- t5411: use different out file to prevent overwriting
Avoid individual tests in t5411 from getting affected by each other
by forcing them to use separate output files during the test.
* jt/transfer-fsck-across-packs (2021-01-25) 5 commits
- SQUASH??? test fix
- fetch-pack: print and use dangling .gitmodules
- fetch-pack: with packfile URIs, use index-pack arg
- http-fetch: allow custom index-pack args
- http: allow custom index-pack args
The approach to "fsck" the incoming objects in "index-pack" is
attractive for performance reasons (we have them already in core,
inflated and ready to be inspected), but fundamentally cannot be
applied fully when we receive more than one pack stream, as a tree
object in one pack may refer to a blob object in another pack as
".gitmodules", when we want to inspect blobs that are used as
".gitmodules" file, for example. Teach "index-pack" to emit
objects that must be inspected later and check them in the calling
"fetch-pack" process.
* jv/upload-pack-filter-spec-quotefix (2021-02-02) 2 commits
(merged to 'next' on 2021-02-03 at 2e34f74e3a)
+ t5544: clarify 'hook works with partial clone' test
(merged to 'next' on 2021-01-31 at 789bf4154e)
+ upload-pack.c: fix filter spec quoting bug
Fix in passing custom args from "git clone" to "upload-pack" on the
other side.
Will merge to 'master'.
* ab/tests-various-fixup (2021-01-23) 10 commits
(merged to 'next' on 2021-02-01 at a604a6e217)
+ rm tests: actually test for SIGPIPE in SIGPIPE test
+ archive tests: use a cheaper "zipinfo -h" invocation to get header
+ upload-pack tests: avoid a non-zero "grep" exit status
+ git-svn tests: rewrite brittle tests to use "--[no-]merges".
+ git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty
+ git svn mergeinfo tests: modernize redirection & quoting style
+ cache-tree tests: explicitly test HEAD and index differences
+ cache-tree tests: use a sub-shell with less indirection
+ cache-tree tests: remove unused $2 parameter
+ cache-tree tests: refactor for modern test style
Various test updates.
Will merge to 'master'.
* en/ort-directory-rename (2021-01-20) 18 commits
(merged to 'next' on 2021-02-01 at 5c1cdd13a1)
+ merge-ort: fix a directory rename detection bug
+ merge-ort: process_renames() now needs more defensiveness
+ merge-ort: implement apply_directory_rename_modifications()
+ merge-ort: add a new toplevel_dir field
+ merge-ort: implement handle_path_level_conflicts()
+ merge-ort: implement check_for_directory_rename()
+ merge-ort: implement apply_dir_rename() and check_dir_renamed()
+ merge-ort: implement compute_collisions()
+ merge-ort: modify collect_renames() for directory rename handling
+ merge-ort: implement handle_directory_level_conflicts()
+ merge-ort: implement compute_rename_counts()
+ merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
+ merge-ort: add outline of get_provisional_directory_renames()
+ merge-ort: add outline for computing directory renames
+ merge-ort: collect which directories are removed in dirs_removed
+ merge-ort: initialize and free new directory rename data structures
+ merge-ort: add new data structures for directory rename detection
+ Merge branch 'en/merge-ort-3' into en/ort-directory-rename
(this branch is used by en/merge-ort-perf.)
ORT merge strategy learns to infer "renamed directory" while
merging.
Will merge to 'master'.
* bc/signed-objects-with-both-hashes (2021-02-09) 7 commits
- SQUASH???
- gpg-interface: remove other signature headers before verifying
- ref-filter: hoist signature parsing
- commit: allow parsing arbitrary buffers with headers
- gpg-interface: improve interface for parsing tags
- commit: ignore additional signatures when parsing signed commits
- ref-filter: switch some uses of unsigned long to size_t
Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
Looking good.
* tb/pack-revindex-on-disk (2021-01-28) 10 commits
(merged to 'next' on 2021-02-01 at bd6a780213)
+ t5325: check both on-disk and in-memory reverse index
+ pack-revindex: ensure that on-disk reverse indexes are given precedence
+ t: support GIT_TEST_WRITE_REV_INDEX
+ t: prepare for GIT_TEST_WRITE_REV_INDEX
+ Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'
+ builtin/pack-objects.c: respect 'pack.writeReverseIndex'
+ builtin/index-pack.c: write reverse indexes
+ builtin/index-pack.c: allow stripping arbitrary extensions
+ pack-write.c: prepare to write 'pack-*.rev' files
+ packfile: prepare for the existence of '*.rev' files
Introduce an on-disk file to record revindex for packdata, which
traditionally was always created on the fly and only in-core.
Will merge to 'master'.
* en/merge-ort-perf (2021-01-23) 6 commits
(merged to 'next' on 2021-02-01 at ca3c07579b)
+ merge-ort: begin performance work; instrument with trace2_region_* calls
+ merge-ort: ignore the directory rename split conflict for now
+ merge-ort: fix massive leak
+ Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
+ Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
+ Merge branch 'en/diffcore-rename' into en/merge-ort-perf
(this branch uses en/ort-directory-rename.)
The "ort" merge strategy.
Will merge to 'master'.
* ak/corrected-commit-date (2021-01-18) 11 commits
(merged to 'next' on 2021-01-26 at deae33ec7d)
+ doc: add corrected commit date info
+ commit-reach: use corrected commit dates in paint_down_to_common()
+ commit-graph: use generation v2 only if entire chain does
+ commit-graph: implement generation data chunk
+ commit-graph: implement corrected commit date
+ commit-graph: return 64-bit generation number
+ commit-graph: add a slab to store topological levels
+ t6600-test-reach: generalize *_three_modes
+ commit-graph: consolidate fill_commit_graph_info
+ revision: parse parent in indegree_walk_step()
+ commit-graph: fix regression when computing Bloom filters
(this branch is used by ds/chunked-file-api, ds/commit-graph-genno-fix and ds/merge-base-independent.)
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Will merge to 'master' together with ds/commit-graph-genno-fix.
* mr/bisect-in-c-4 (2021-02-03) 7 commits
(merged to 'next' on 2021-02-05 at ea18026619)
+ bisect--helper: retire `--check-and-set-terms` subcommand
+ bisect--helper: reimplement `bisect_skip` shell function in C
+ bisect--helper: retire `--bisect-auto-next` subcommand
+ bisect--helper: use `res` instead of return in BISECT_RESET case option
+ bisect--helper: retire `--bisect-write` subcommand
+ bisect--helper: reimplement `bisect_replay` shell function in C
+ bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
Will merge to 'master'.
* jt/clone-unborn-head (2021-02-05) 3 commits
(merged to 'next' on 2021-02-08 at 3ba9f80e7f)
+ clone: respect remote unborn HEAD
+ connect, transport: encapsulate arg in struct
+ ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
Will merge to 'master'.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* es/config-hooks (2020-12-21) 34 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
--------------------------------------------------
[Discarded]
* ds/update-index (2021-01-09) 14 commits
. update-index: remove static globals from callbacks
. update-index: reduce static globals, part 2
. update-index: reduce static globals, part 1
. update-index: remove ce_match_stat(), all macros
. update-index: replace several compatibility macros
. update-index: use add_index_entry()
. update-index: use remove_file_from_index()
. update-index: use index_name_pos() over cache_name_pos()
. update-index: use istate->cache_changed
. update-index: use istate->cache_nr over active_nr
. update-index: use istate->cache over active_cache
. update-index: drop the_index, the_repository
. rm: remove compatilibity macros
. mv: remove index compatibility macros
(this branch uses ag/merge-strategies-in-c.)
The implementation of a few commands lost reliance of "the_index"
compatibility macros by explicitly passing the index_state through
the callchain.
Retracted for now.
cf. <a6906459-3a93-ecad-c460-b6c763819389@gmail.com>
* fc/mergetool-automerge (2021-01-09) 8 commits
. fixup! mergetool: break setup_tool out into separate initialization function
. fixup! fixup! mergetool: add automerge configuration
. fixup! mergetool: add automerge configuration
. mergetool: add automerge_enabled tool-specific override function
. mergetool: break setup_tool out into separate initialization function
. mergetool: add per-tool support for the autoMerge flag
. mergetool: alphabetize the mergetool config docs
. mergetool: add automerge configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Superseded by the sh/mergetool-hideresolved topic.
* mt/rm-sparse-checkout (2020-12-08) 11 commits
. rm: honor sparse checkout patterns
. t7817: do not depend on any specific default branch name
. config: add setting to ignore sparsity patterns in some cmds
. grep: honor sparse checkout patterns
. config: correctly read worktree configs in submodules
. config: make do_git_config_sequence receive a 'struct repository'
. t/helper/test-config: unify exit labels
. t/helper/test-config: diagnose missing arguments
. t/helper/test-config: be consistent with exit codes
. t1308-config-set: avoid false positives when using test-config
. doc: grep: unify info on configuration variables
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Discarded for now, as it depends on an old iteration of
mt/grep-sparse-checkout topic.
* fc/bash-completion-post-2.29 (2020-12-23) 4 commits
. 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.*
Stalled for too long with breakage.
Seems to break tests on Windows
* ss/submodule-add-in-c (2020-12-15) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Stalled for too long with breakage.
The patches are split incorrectly; part of 1/3 belongs to 2/3
cf. <nycvar.QRO.7.76.6.2012190104140.56@tvgsbejvaqbjf.bet>
It seems to introduce a segfault on 'seen'.
cf. <xmqqft3xflw7.fsf@gitster.c.googlers.com>
^ permalink raw reply [relevance 4%]
* Re: [PATCH v2 00/10] Modernizing the t7001 test script
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
` (10 preceding siblings ...)
2021-02-09 19:24 6% ` [PATCH v2 00/10] Modernizing the t7001 test script Eric Sunshine
@ 2021-02-09 22:58 6% ` Junio C Hamano
2021-02-11 7:28 6% ` Eric Sunshine
11 siblings, 1 reply; 200+ results
From: Junio C Hamano @ 2021-02-09 22:58 UTC (permalink / raw)
To: shubham verma; +Cc: git
shubham verma <shubhunic@gmail.com> writes:
> In this patch series modernize the t7001 test script by changing the
> style of its tests from an old one to the modern one and by cleaning
> up the test script.
>
> Changes since v1:
>
> - Change commit messages and added brief explanation about commit.
> - Modernize subshell formatting
> - Use ': >' rather than '>'
>
> Thanks everyone for your feedback and suggestions.
>
> shubham verma (10):
> t7001: modernize test formatting
> t7001: indent with TABs instead of spaces
> t7001: remove unnecessary blank lines
> t7001: modernize subshell formatting
> t7001: remove whitespace after redirect operators
> t7001: avoid using `cd` outside of subshells
> t7001: use '>' rather than 'touch'
> t7001: put each command on a separate line
> t7001: use here-docs instead of echo
> t7001: use `test` rather than `[`
>
> t/t7001-mv.sh | 432 ++++++++++++++++++++++++--------------------------
> 1 file changed, 204 insertions(+), 228 deletions(-)
I would have used test_write_lines instead of here-doc in 9/10, but
that is such a minor preference thing that it is not worth going
back and replace. Nothing else stood out during my cursory scan.
Will queue; thanks.
^ permalink raw reply [relevance 6%]
* Re: [PATCH v2 00/10] Modernizing the t7001 test script
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
` (9 preceding siblings ...)
2021-02-09 17:32 16% ` [PATCH v2 10/10] t7001: use `test` rather than `[` shubham verma
@ 2021-02-09 19:24 6% ` Eric Sunshine
2021-02-09 22:58 6% ` Junio C Hamano
11 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2021-02-09 19:24 UTC (permalink / raw)
To: shubham verma; +Cc: Git List
On Tue, Feb 9, 2021 at 12:35 PM shubham verma <shubhunic@gmail.com> wrote:
> In this patch series modernize the t7001 test script by changing the
> style of its tests from an old one to the modern one and by cleaning
> up the test script.
>
> Changes since v1:
>
> - Change commit messages and added brief explanation about commit.
> - Modernize subshell formatting
> - Use ': >' rather than '>'
For readers new to this series, v1 is here:
https://lore.kernel.org/git/20200925170256.11490-1-shubhunic@gmail.com/T/
^ permalink raw reply [relevance 6%]
* [PATCH v2 08/10] t7001: put each command on a separate line
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
` (6 preceding siblings ...)
2021-02-09 17:32 19% ` [PATCH v2 07/10] t7001: use '>' rather than 'touch' shubham verma
@ 2021-02-09 17:32 19% ` shubham verma
2021-02-09 17:32 19% ` [PATCH v2 09/10] t7001: use here-docs instead of echo shubham verma
` (3 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2021-02-09 17:32 UTC (permalink / raw)
To: git
Modern practice is to avoid multiple commands per line, and
instead place each command on its own line.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 1671241fc8..9a73232c7c 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -143,7 +143,9 @@ test_expect_success 'checking the commit' '
'
test_expect_success 'do not move directory over existing directory' '
- mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
+ mkdir path0 &&
+ mkdir path0/path2 &&
+ test_must_fail git mv path2 path0
'
test_expect_success 'move into "."' '
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH v2 10/10] t7001: use `test` rather than `[`
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
` (8 preceding siblings ...)
2021-02-09 17:32 19% ` [PATCH v2 09/10] t7001: use here-docs instead of echo shubham verma
@ 2021-02-09 17:32 16% ` shubham verma
2021-02-09 19:24 6% ` [PATCH v2 00/10] Modernizing the t7001 test script Eric Sunshine
2021-02-09 22:58 6% ` Junio C Hamano
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2021-02-09 17:32 UTC (permalink / raw)
To: git
According to Documentation/CodingGuidelines, we should use "test"
rather than "[ ... ]" in shell scripts, so let's replace the
"[ ... ]" with "test" in the t7001 test script.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 2e2e60e0d3..002e188549 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -240,10 +240,10 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
git add dirty &&
entry="$(git ls-files --stage dirty | cut -f 1)" &&
git mv dirty dirty2 &&
- [ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" &&
echo 2 >dirty2 &&
git mv dirty2 dirty &&
- [ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
+ test "$entry" = "$(git ls-files --stage dirty | cut -f 1)"
'
rm -f dirty dirty2
@@ -330,7 +330,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
mkdir mod &&
git mv sub mod/sub &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -350,7 +350,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
mkdir mod &&
git mv sub mod/sub &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
@@ -367,7 +367,7 @@ test_expect_success 'git mv moves a submodule with gitfile' '
mkdir mod &&
git -C mod mv ../sub/ . &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
@@ -386,7 +386,7 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -407,7 +407,7 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -425,7 +425,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
git mv sub mod/sub 2>actual.err &&
test_i18ncmp expect.err actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
--
2.25.1
^ permalink raw reply related [relevance 16%]
* [PATCH v2 06/10] t7001: avoid using `cd` outside of subshells
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
` (4 preceding siblings ...)
2021-02-09 17:32 19% ` [PATCH v2 05/10] t7001: remove whitespace after redirect operators shubham verma
@ 2021-02-09 17:32 15% ` shubham verma
2021-02-09 17:32 19% ` [PATCH v2 07/10] t7001: use '>' rather than 'touch' shubham verma
` (5 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2021-02-09 17:32 UTC (permalink / raw)
To: git
Avoid using `cd` outside of subshells since, if the test fails,
there is no guarantee that the current working directory is the
expected one, which may cause subsequent tests to run in the wrong
directory.
While at it, make some other tests more concise by replacing
simple subshells with `git -C`.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 45 +++++++++++----------------------------------
1 file changed, 11 insertions(+), 34 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 02fbc90dea..81897a3095 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -11,12 +11,11 @@ test_expect_success 'prepare reference tree' '
'
test_expect_success 'moving the file out of subdirectory' '
- cd path0 && git mv COPYING ../path1/COPYING
+ git -C path0 mv COPYING ../path1/COPYING
'
-# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-out -a
+ git commit -m move-out -a
'
test_expect_success 'checking the commit' '
@@ -25,12 +24,11 @@ test_expect_success 'checking the commit' '
'
test_expect_success 'moving the file back into subdirectory' '
- cd path0 && git mv ../path1/COPYING COPYING
+ git -C path0 mv ../path1/COPYING COPYING
'
-# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-in -a
+ git commit -m move-in -a
'
test_expect_success 'checking the commit' '
@@ -328,10 +326,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
git mv sub mod/sub &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -351,10 +346,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
git mv sub mod/sub &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
test_cmp expected actual &&
@@ -368,16 +360,10 @@ test_expect_success 'git mv moves a submodule with gitfile' '
git submodule update &&
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
- (
- cd mod &&
- git mv ../sub/ .
- ) &&
+ git -C mod mv ../sub/ . &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
test_cmp expected actual &&
@@ -396,10 +382,7 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
test_must_be_empty actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -420,10 +403,7 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
test_must_be_empty actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -441,10 +421,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
test_i18ncmp expect.err actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
--
2.25.1
^ permalink raw reply related [relevance 15%]
* [PATCH v2 05/10] t7001: remove whitespace after redirect operators
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
` (3 preceding siblings ...)
2021-02-09 17:32 17% ` [PATCH v2 04/10] t7001: modernize subshell formatting shubham verma
@ 2021-02-09 17:32 19% ` shubham verma
2021-02-09 17:32 15% ` [PATCH v2 06/10] t7001: avoid using `cd` outside of subshells shubham verma
` (6 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2021-02-09 17:32 UTC (permalink / raw)
To: git
According to Documentation/CodingGuidelines, there should be no
whitespace after redirect operators. So, we should remove these
whitespaces after redirect operators.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index a4a14a3b2e..02fbc90dea 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -156,9 +156,9 @@ test_expect_success "Michael Cassar's test case" '
rm -fr .git papers partA &&
git init &&
mkdir -p papers/unsorted papers/all-papers partA &&
- echo a > papers/unsorted/Thesis.pdf &&
- echo b > partA/outline.txt &&
- echo c > papers/unsorted/_another &&
+ echo a >papers/unsorted/Thesis.pdf &&
+ echo b >partA/outline.txt &&
+ echo c >papers/unsorted/_another &&
git add papers partA &&
T1=$(git write-tree) &&
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH v2 09/10] t7001: use here-docs instead of echo
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
` (7 preceding siblings ...)
2021-02-09 17:32 19% ` [PATCH v2 08/10] t7001: put each command on a separate line shubham verma
@ 2021-02-09 17:32 19% ` shubham verma
2021-02-09 17:32 16% ` [PATCH v2 10/10] t7001: use `test` rather than `[` shubham verma
` (2 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2021-02-09 17:32 UTC (permalink / raw)
To: git
Change from old style to current style by taking advantage of
here-docs instead of echo commands.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 9a73232c7c..2e2e60e0d3 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -226,7 +226,10 @@ test_expect_success 'git mv to move multiple sources into a directory' '
git add dir/?.txt &&
git mv dir/a.txt dir/b.txt other &&
git ls-files >actual &&
- { echo other/a.txt; echo other/b.txt; } >expect &&
+ cat >expect <<-\EOF &&
+ other/a.txt
+ other/b.txt
+ EOF
test_cmp expect actual
'
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH v2 07/10] t7001: use '>' rather than 'touch'
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
` (5 preceding siblings ...)
2021-02-09 17:32 15% ` [PATCH v2 06/10] t7001: avoid using `cd` outside of subshells shubham verma
@ 2021-02-09 17:32 19% ` shubham verma
2021-02-09 17:32 19% ` [PATCH v2 08/10] t7001: put each command on a separate line shubham verma
` (4 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2021-02-09 17:32 UTC (permalink / raw)
To: git
Use `>` rather than `touch` to create an empty file when the
timestamp isn't relevant to the test.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 81897a3095..1671241fc8 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -47,14 +47,14 @@ test_expect_success 'checking -k on non-existing file' '
'
test_expect_success 'checking -k on untracked file' '
- touch untracked1 &&
+ >untracked1 &&
git mv -k untracked1 path0 &&
test -f untracked1 &&
test ! -f path0/untracked1
'
test_expect_success 'checking -k on multiple untracked files' '
- touch untracked2 &&
+ >untracked2 &&
git mv -k untracked1 untracked2 path0 &&
test -f untracked1 &&
test -f untracked2 &&
@@ -63,7 +63,7 @@ test_expect_success 'checking -k on multiple untracked files' '
'
test_expect_success 'checking -f on untracked file with existing target' '
- touch path0/untracked1 &&
+ >path0/untracked1 &&
test_must_fail git mv -f untracked1 path0 &&
test ! -f .git/index.lock &&
test -f untracked1 &&
@@ -486,7 +486,7 @@ test_expect_success 'moving nested submodules' '
mkdir sub_nested_nested &&
(
cd sub_nested_nested &&
- touch nested_level2 &&
+ >nested_level2 &&
git init &&
git add . &&
git commit -m "nested level 2"
@@ -494,7 +494,7 @@ test_expect_success 'moving nested submodules' '
mkdir sub_nested &&
(
cd sub_nested &&
- touch nested_level1 &&
+ >nested_level1 &&
git init &&
git add . &&
git commit -m "nested level 1" &&
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH v2 03/10] t7001: remove unnecessary blank lines
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
2021-02-09 17:32 12% ` [PATCH v2 01/10] t7001: modernize test formatting shubham verma
2021-02-09 17:32 13% ` [PATCH v2 02/10] t7001: indent with TABs instead of spaces shubham verma
@ 2021-02-09 17:32 17% ` shubham verma
2021-02-09 17:32 17% ` [PATCH v2 04/10] t7001: modernize subshell formatting shubham verma
` (8 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2021-02-09 17:32 UTC (permalink / raw)
To: git
Some tests use a deprecated style in which there are unnecessary
blank lines after the opening quote of the test body and before the
closing quote. So we should remove these unnecessary blank lines.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 7503233814..f63802442b 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -182,7 +182,6 @@ test_expect_success "Sergey Vlasov's test case" '
'
test_expect_success 'absolute pathname' '(
-
rm -fr mine &&
mkdir mine &&
cd mine &&
@@ -196,12 +195,9 @@ test_expect_success 'absolute pathname' '(
! test -d sub &&
test -d in &&
git ls-files --error-unmatch in/file
-
-
)'
test_expect_success 'absolute pathname outside should fail' '(
-
rm -fr mine &&
mkdir mine &&
cd mine &&
@@ -216,7 +212,6 @@ test_expect_success 'absolute pathname outside should fail' '(
test -d sub &&
! test -d ../in &&
git ls-files --error-unmatch sub/file
-
)'
test_expect_success 'git mv to move multiple sources into a directory' '
@@ -232,7 +227,6 @@ test_expect_success 'git mv to move multiple sources into a directory' '
'
test_expect_success 'git mv should not change sha1 of moved cache entry' '
-
rm -fr .git &&
git init &&
echo 1 >dirty &&
@@ -243,7 +237,6 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
echo 2 >dirty2 &&
git mv dirty2 dirty &&
[ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
-
'
rm -f dirty dirty2
@@ -266,7 +259,6 @@ test_expect_success 'git mv error on conflicted file' '
'
test_expect_success 'git mv should overwrite symlink to a file' '
-
rm -fr .git &&
git init &&
echo 1 >moved &&
@@ -279,13 +271,11 @@ test_expect_success 'git mv should overwrite symlink to a file' '
test "$(cat symlink)" = 1 &&
git update-index --refresh &&
git diff-files --quiet
-
'
rm -f moved symlink
test_expect_success 'git mv should overwrite file with a symlink' '
-
rm -fr .git &&
git init &&
echo 1 >moved &&
@@ -296,11 +286,9 @@ test_expect_success 'git mv should overwrite file with a symlink' '
! test -e symlink &&
git update-index --refresh &&
git diff-files --quiet
-
'
test_expect_success SYMLINKS 'check moved symlink' '
-
test -h moved
'
--
2.25.1
^ permalink raw reply related [relevance 17%]
* [PATCH v2 04/10] t7001: modernize subshell formatting
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
` (2 preceding siblings ...)
2021-02-09 17:32 17% ` [PATCH v2 03/10] t7001: remove unnecessary blank lines shubham verma
@ 2021-02-09 17:32 17% ` shubham verma
2021-02-09 17:32 19% ` [PATCH v2 05/10] t7001: remove whitespace after redirect operators shubham verma
` (7 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2021-02-09 17:32 UTC (permalink / raw)
To: git
Some test use an old style for formatting subshells:
(command &&
...
Update them to the modern style:
(
command &&
...
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 74 ++++++++++++++++++++++++++++-----------------------
1 file changed, 40 insertions(+), 34 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index f63802442b..a4a14a3b2e 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -181,38 +181,42 @@ test_expect_success "Sergey Vlasov's test case" '
git mv ab a
'
-test_expect_success 'absolute pathname' '(
- rm -fr mine &&
- mkdir mine &&
- cd mine &&
- test_create_repo one &&
- cd one &&
- mkdir sub &&
- >sub/file &&
- git add sub/file &&
-
- git mv sub "$(pwd)/in" &&
- ! test -d sub &&
- test -d in &&
- git ls-files --error-unmatch in/file
-)'
-
-test_expect_success 'absolute pathname outside should fail' '(
- rm -fr mine &&
- mkdir mine &&
- cd mine &&
- out=$(pwd) &&
- test_create_repo one &&
- cd one &&
- mkdir sub &&
- >sub/file &&
- git add sub/file &&
-
- test_must_fail git mv sub "$out/out" &&
- test -d sub &&
- ! test -d ../in &&
- git ls-files --error-unmatch sub/file
-)'
+test_expect_success 'absolute pathname' '
+ (
+ rm -fr mine &&
+ mkdir mine &&
+ cd mine &&
+ test_create_repo one &&
+ cd one &&
+ mkdir sub &&
+ >sub/file &&
+ git add sub/file &&
+
+ git mv sub "$(pwd)/in" &&
+ ! test -d sub &&
+ test -d in &&
+ git ls-files --error-unmatch in/file
+ )
+'
+
+test_expect_success 'absolute pathname outside should fail' '
+ (
+ rm -fr mine &&
+ mkdir mine &&
+ cd mine &&
+ out=$(pwd) &&
+ test_create_repo one &&
+ cd one &&
+ mkdir sub &&
+ >sub/file &&
+ git add sub/file &&
+
+ test_must_fail git mv sub "$out/out" &&
+ test -d sub &&
+ ! test -d ../in &&
+ git ls-files --error-unmatch sub/file
+ )
+'
test_expect_success 'git mv to move multiple sources into a directory' '
rm -fr .git && git init &&
@@ -503,14 +507,16 @@ test_expect_success 'moving a submodule in nested directories' '
test_expect_success 'moving nested submodules' '
git commit -am "cleanup commit" &&
mkdir sub_nested_nested &&
- (cd sub_nested_nested &&
+ (
+ cd sub_nested_nested &&
touch nested_level2 &&
git init &&
git add . &&
git commit -m "nested level 2"
) &&
mkdir sub_nested &&
- (cd sub_nested &&
+ (
+ cd sub_nested &&
touch nested_level1 &&
git init &&
git add . &&
--
2.25.1
^ permalink raw reply related [relevance 17%]
* [PATCH v2 00/10] Modernizing the t7001 test script
@ 2021-02-09 17:32 15% shubham verma
2021-02-09 17:32 12% ` [PATCH v2 01/10] t7001: modernize test formatting shubham verma
` (11 more replies)
0 siblings, 12 replies; 200+ results
From: shubham verma @ 2021-02-09 17:32 UTC (permalink / raw)
To: git
In this patch series modernize the t7001 test script by changing the
style of its tests from an old one to the modern one and by cleaning
up the test script.
Changes since v1:
- Change commit messages and added brief explanation about commit.
- Modernize subshell formatting
- Use ': >' rather than '>'
Thanks everyone for your feedback and suggestions.
shubham verma (10):
t7001: modernize test formatting
t7001: indent with TABs instead of spaces
t7001: remove unnecessary blank lines
t7001: modernize subshell formatting
t7001: remove whitespace after redirect operators
t7001: avoid using `cd` outside of subshells
t7001: use '>' rather than 'touch'
t7001: put each command on a separate line
t7001: use here-docs instead of echo
t7001: use `test` rather than `[`
t/t7001-mv.sh | 432 ++++++++++++++++++++++++--------------------------
1 file changed, 204 insertions(+), 228 deletions(-)
--
2.25.1
^ permalink raw reply [relevance 15%]
* [PATCH v2 02/10] t7001: indent with TABs instead of spaces
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
2021-02-09 17:32 12% ` [PATCH v2 01/10] t7001: modernize test formatting shubham verma
@ 2021-02-09 17:32 13% ` shubham verma
2021-02-09 17:32 17% ` [PATCH v2 03/10] t7001: remove unnecessary blank lines shubham verma
` (9 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2021-02-09 17:32 UTC (permalink / raw)
To: git
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 120 +++++++++++++++++++++++++-------------------------
1 file changed, 60 insertions(+), 60 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 4bbb51e578..7503233814 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -4,72 +4,72 @@ test_description='git mv in subdirs'
. ./test-lib.sh
test_expect_success 'prepare reference tree' '
- mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
- git add path0/COPYING &&
- git commit -m add -a
+ mkdir path0 path1 &&
+ cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ git add path0/COPYING &&
+ git commit -m add -a
'
test_expect_success 'moving the file out of subdirectory' '
- cd path0 && git mv COPYING ../path1/COPYING
+ cd path0 && git mv COPYING ../path1/COPYING
'
# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-out -a
+ cd .. && git commit -m move-out -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path1/COPYING" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path1/COPYING" actual
'
test_expect_success 'moving the file back into subdirectory' '
- cd path0 && git mv ../path1/COPYING COPYING
+ cd path0 && git mv ../path1/COPYING COPYING
'
# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-in -a
+ cd .. && git commit -m move-in -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path1/COPYING..*path0/COPYING" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path1/COPYING..*path0/COPYING" actual
'
test_expect_success 'mv --dry-run does not move file' '
- git mv -n path0/COPYING MOVED &&
- test -f path0/COPYING &&
- test ! -f MOVED
+ git mv -n path0/COPYING MOVED &&
+ test -f path0/COPYING &&
+ test ! -f MOVED
'
test_expect_success 'checking -k on non-existing file' '
- git mv -k idontexist path0
+ git mv -k idontexist path0
'
test_expect_success 'checking -k on untracked file' '
- touch untracked1 &&
- git mv -k untracked1 path0 &&
- test -f untracked1 &&
- test ! -f path0/untracked1
+ touch untracked1 &&
+ git mv -k untracked1 path0 &&
+ test -f untracked1 &&
+ test ! -f path0/untracked1
'
test_expect_success 'checking -k on multiple untracked files' '
- touch untracked2 &&
- git mv -k untracked1 untracked2 path0 &&
- test -f untracked1 &&
- test -f untracked2 &&
- test ! -f path0/untracked1 &&
- test ! -f path0/untracked2
+ touch untracked2 &&
+ git mv -k untracked1 untracked2 path0 &&
+ test -f untracked1 &&
+ test -f untracked2 &&
+ test ! -f path0/untracked1 &&
+ test ! -f path0/untracked2
'
test_expect_success 'checking -f on untracked file with existing target' '
- touch path0/untracked1 &&
- test_must_fail git mv -f untracked1 path0 &&
- test ! -f .git/index.lock &&
- test -f untracked1 &&
- test -f path0/untracked1
+ touch path0/untracked1 &&
+ test_must_fail git mv -f untracked1 path0 &&
+ test ! -f .git/index.lock &&
+ test -f untracked1 &&
+ test -f path0/untracked1
'
# clean up the mess in case bad things happen
@@ -79,77 +79,77 @@ rm -f idontexist untracked1 untracked2 \
rmdir path1
test_expect_success 'moving to absent target with trailing slash' '
- test_must_fail git mv path0/COPYING no-such-dir/ &&
- test_must_fail git mv path0/COPYING no-such-dir// &&
- git mv path0/ no-such-dir/ &&
- test_path_is_dir no-such-dir
+ test_must_fail git mv path0/COPYING no-such-dir/ &&
+ test_must_fail git mv path0/COPYING no-such-dir// &&
+ git mv path0/ no-such-dir/ &&
+ test_path_is_dir no-such-dir
'
test_expect_success 'clean up' '
- git reset --hard
+ git reset --hard
'
test_expect_success 'moving to existing untracked target with trailing slash' '
- mkdir path1 &&
- git mv path0/ path1/ &&
- test_path_is_dir path1/path0/
+ mkdir path1 &&
+ git mv path0/ path1/ &&
+ test_path_is_dir path1/path0/
'
test_expect_success 'moving to existing tracked target with trailing slash' '
- mkdir path2 &&
- >path2/file && git add path2/file &&
- git mv path1/path0/ path2/ &&
- test_path_is_dir path2/path0/
+ mkdir path2 &&
+ >path2/file && git add path2/file &&
+ git mv path1/path0/ path2/ &&
+ test_path_is_dir path2/path0/
'
test_expect_success 'clean up' '
- git reset --hard
+ git reset --hard
'
test_expect_success 'adding another file' '
- cp "$TEST_DIRECTORY"/../README.md path0/README &&
- git add path0/README &&
- git commit -m add2 -a
+ cp "$TEST_DIRECTORY"/../README.md path0/README &&
+ git add path0/README &&
+ git commit -m add2 -a
'
test_expect_success 'moving whole subdirectory' '
- git mv path0 path2
+ git mv path0 path2
'
test_expect_success 'commiting the change' '
- git commit -m dir-move -a
+ git commit -m dir-move -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
- grep "^R100..*path0/README..*path2/README" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
+ grep "^R100..*path0/README..*path2/README" actual
'
test_expect_success 'succeed when source is a prefix of destination' '
- git mv path2/COPYING path2/COPYING-renamed
+ git mv path2/COPYING path2/COPYING-renamed
'
test_expect_success 'moving whole subdirectory into subdirectory' '
- git mv path2 path1
+ git mv path2 path1
'
test_expect_success 'commiting the change' '
- git commit -m dir-move -a
+ git commit -m dir-move -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
- grep "^R100..*path2/README..*path1/path2/README" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
+ grep "^R100..*path2/README..*path1/path2/README" actual
'
test_expect_success 'do not move directory over existing directory' '
- mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
+ mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
'
test_expect_success 'move into "."' '
- git mv path1/path2/ .
+ git mv path1/path2/ .
'
test_expect_success "Michael Cassar's test case" '
--
2.25.1
^ permalink raw reply related [relevance 13%]
* [PATCH v2 01/10] t7001: modernize test formatting
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
@ 2021-02-09 17:32 12% ` shubham verma
2021-02-09 17:32 13% ` [PATCH v2 02/10] t7001: indent with TABs instead of spaces shubham verma
` (10 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2021-02-09 17:32 UTC (permalink / raw)
To: git
Some tests in this script are formatted using a very old style:
test_expect_success \
'title' \
'body line 1 &&
body line 2'
Update the formatting to the modern style:
test_expect_success 'title' '
body line 1 &&
body line 2
'
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 192 +++++++++++++++++++++++++-------------------------
1 file changed, 96 insertions(+), 96 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 63d5f41a12..4bbb51e578 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -3,74 +3,74 @@
test_description='git mv in subdirs'
. ./test-lib.sh
-test_expect_success \
- 'prepare reference tree' \
- 'mkdir path0 path1 &&
+test_expect_success 'prepare reference tree' '
+ mkdir path0 path1 &&
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
git add path0/COPYING &&
- git commit -m add -a'
+ git commit -m add -a
+'
-test_expect_success \
- 'moving the file out of subdirectory' \
- 'cd path0 && git mv COPYING ../path1/COPYING'
+test_expect_success 'moving the file out of subdirectory' '
+ cd path0 && git mv COPYING ../path1/COPYING
+'
# in path0 currently
-test_expect_success \
- 'commiting the change' \
- 'cd .. && git commit -m move-out -a'
+test_expect_success 'commiting the change' '
+ cd .. && git commit -m move-out -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path1/COPYING" actual'
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path1/COPYING" actual
+'
-test_expect_success \
- 'moving the file back into subdirectory' \
- 'cd path0 && git mv ../path1/COPYING COPYING'
+test_expect_success 'moving the file back into subdirectory' '
+ cd path0 && git mv ../path1/COPYING COPYING
+'
# in path0 currently
-test_expect_success \
- 'commiting the change' \
- 'cd .. && git commit -m move-in -a'
-
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path1/COPYING..*path0/COPYING" actual'
-
-test_expect_success \
- 'mv --dry-run does not move file' \
- 'git mv -n path0/COPYING MOVED &&
+test_expect_success 'commiting the change' '
+ cd .. && git commit -m move-in -a
+'
+
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path1/COPYING..*path0/COPYING" actual
+'
+
+test_expect_success 'mv --dry-run does not move file' '
+ git mv -n path0/COPYING MOVED &&
test -f path0/COPYING &&
- test ! -f MOVED'
+ test ! -f MOVED
+'
-test_expect_success \
- 'checking -k on non-existing file' \
- 'git mv -k idontexist path0'
+test_expect_success 'checking -k on non-existing file' '
+ git mv -k idontexist path0
+'
-test_expect_success \
- 'checking -k on untracked file' \
- 'touch untracked1 &&
+test_expect_success 'checking -k on untracked file' '
+ touch untracked1 &&
git mv -k untracked1 path0 &&
test -f untracked1 &&
- test ! -f path0/untracked1'
+ test ! -f path0/untracked1
+'
-test_expect_success \
- 'checking -k on multiple untracked files' \
- 'touch untracked2 &&
+test_expect_success 'checking -k on multiple untracked files' '
+ touch untracked2 &&
git mv -k untracked1 untracked2 path0 &&
test -f untracked1 &&
test -f untracked2 &&
test ! -f path0/untracked1 &&
- test ! -f path0/untracked2'
+ test ! -f path0/untracked2
+'
-test_expect_success \
- 'checking -f on untracked file with existing target' \
- 'touch path0/untracked1 &&
+test_expect_success 'checking -f on untracked file with existing target' '
+ touch path0/untracked1 &&
test_must_fail git mv -f untracked1 path0 &&
test ! -f .git/index.lock &&
test -f untracked1 &&
- test -f path0/untracked1'
+ test -f path0/untracked1
+'
# clean up the mess in case bad things happen
rm -f idontexist untracked1 untracked2 \
@@ -78,79 +78,79 @@ rm -f idontexist untracked1 untracked2 \
.git/index.lock
rmdir path1
-test_expect_success \
- 'moving to absent target with trailing slash' \
- 'test_must_fail git mv path0/COPYING no-such-dir/ &&
+test_expect_success 'moving to absent target with trailing slash' '
+ test_must_fail git mv path0/COPYING no-such-dir/ &&
test_must_fail git mv path0/COPYING no-such-dir// &&
git mv path0/ no-such-dir/ &&
- test_path_is_dir no-such-dir'
+ test_path_is_dir no-such-dir
+'
-test_expect_success \
- 'clean up' \
- 'git reset --hard'
+test_expect_success 'clean up' '
+ git reset --hard
+'
-test_expect_success \
- 'moving to existing untracked target with trailing slash' \
- 'mkdir path1 &&
+test_expect_success 'moving to existing untracked target with trailing slash' '
+ mkdir path1 &&
git mv path0/ path1/ &&
- test_path_is_dir path1/path0/'
+ test_path_is_dir path1/path0/
+'
-test_expect_success \
- 'moving to existing tracked target with trailing slash' \
- 'mkdir path2 &&
+test_expect_success 'moving to existing tracked target with trailing slash' '
+ mkdir path2 &&
>path2/file && git add path2/file &&
git mv path1/path0/ path2/ &&
- test_path_is_dir path2/path0/'
+ test_path_is_dir path2/path0/
+'
-test_expect_success \
- 'clean up' \
- 'git reset --hard'
+test_expect_success 'clean up' '
+ git reset --hard
+'
-test_expect_success \
- 'adding another file' \
- 'cp "$TEST_DIRECTORY"/../README.md path0/README &&
+test_expect_success 'adding another file' '
+ cp "$TEST_DIRECTORY"/../README.md path0/README &&
git add path0/README &&
- git commit -m add2 -a'
+ git commit -m add2 -a
+'
-test_expect_success \
- 'moving whole subdirectory' \
- 'git mv path0 path2'
+test_expect_success 'moving whole subdirectory' '
+ git mv path0 path2
+'
-test_expect_success \
- 'commiting the change' \
- 'git commit -m dir-move -a'
+test_expect_success 'commiting the change' '
+ git commit -m dir-move -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
- grep "^R100..*path0/README..*path2/README" actual'
+ grep "^R100..*path0/README..*path2/README" actual
+'
-test_expect_success \
- 'succeed when source is a prefix of destination' \
- 'git mv path2/COPYING path2/COPYING-renamed'
+test_expect_success 'succeed when source is a prefix of destination' '
+ git mv path2/COPYING path2/COPYING-renamed
+'
-test_expect_success \
- 'moving whole subdirectory into subdirectory' \
- 'git mv path2 path1'
+test_expect_success 'moving whole subdirectory into subdirectory' '
+ git mv path2 path1
+'
-test_expect_success \
- 'commiting the change' \
- 'git commit -m dir-move -a'
+test_expect_success 'commiting the change' '
+ git commit -m dir-move -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
- grep "^R100..*path2/README..*path1/path2/README" actual'
+ grep "^R100..*path2/README..*path1/path2/README" actual
+'
-test_expect_success \
- 'do not move directory over existing directory' \
- 'mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0'
+test_expect_success 'do not move directory over existing directory' '
+ mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
+'
-test_expect_success \
- 'move into "."' \
- 'git mv path1/path2/ .'
+test_expect_success 'move into "."' '
+ git mv path1/path2/ .
+'
test_expect_success "Michael Cassar's test case" '
rm -fr .git papers partA &&
--
2.25.1
^ permalink raw reply related [relevance 12%]
* What's cooking in git.git (Feb 2021, #01; Wed, 3)
@ 2021-02-04 0:27 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-02-04 0:27 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
A bit more topics are in 'master' now. Also for those of us who are
on 'next', Derrick's fixes on top of the corrected commit date
series may help incremental commit-graph updates. Testing is
appreciated. I have been shooting for parking any non-trivial topic
that has been reviewed positively in 'next' for about 7 calendar
days, which may have been a bit too aggressive (on the other hand,
trivial topofixes, clean-ups and doc updates do not have to wait all
that long).
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/fsck-doc-fix (2021-01-20) 1 commit
(merged to 'next' on 2021-01-25 at e3db0fe96f)
+ fsck doc: remove ancient out-of-date diagnostics
Documentation for "git fsck" lost stale bits that has become
incorrect.
* ds/maintenance-prefetch-cleanup (2021-01-20) 2 commits
(merged to 'next' on 2021-01-26 at 23efa6ebc3)
+ t7900: clean up some broken refs
+ maintenance: set log.excludeDecoration durin prefetch
Test clean-up plus UI improvement by hiding extra refs that
the prefetch task uses from "log --decorate" output.
* jk/peel-iterated-oid (2021-01-21) 1 commit
(merged to 'next' on 2021-01-26 at 023758f4ee)
+ refs: switch peel_ref() to peel_iterated_oid()
The peel_ref() API has been replaced with peel_iterated_oid().
* jk/run-command-use-shell-doc (2021-01-22) 1 commit
(merged to 'next' on 2021-01-26 at f9df80d861)
+ run-command: document use_shell option
The .use_shell flag in struct child_process that is passed to
run_command() API has been clarified with a bit more documentation.
* js/skip-dashed-built-ins-from-config-mak (2021-01-21) 1 commit
(merged to 'next' on 2021-01-26 at 2d727a37f9)
+ SKIP_DASHED_BUILT_INS: respect `config.mak`
Build fix.
* jt/packfile-as-uri-doc (2021-01-20) 1 commit
(merged to 'next' on 2021-01-26 at 50500a8982)
+ Doc: clarify contents of packfile sent as URI
Doc fix for packfile URI feature.
--------------------------------------------------
[New Topics]
* ab/make-cleanup (2021-02-01) 6 commits
- Makefile: add {program,xdiff,test,git}-objs & objects targets
- Makefile: split OBJECTS into OBJECTS and GIT_OBJS
- Makefile: sort OBJECTS assignment for subsequent change
- Makefile: split up long OBJECTS line
- Makefile: guard against TEST_OBJS in the environment
- Makefile: remove "all" on "$(FUZZ_OBJS)"
Reorganize Makefile to allow building git.o and other essential
objects without extra stuff needed only for testing.
* ds/commit-graph-genno-fix (2021-02-01) 6 commits
(merged to 'next' on 2021-02-03 at b3a9e11efb)
+ commit-graph: prepare commit graph
+ commit-graph: be extra careful about mixed generations
+ commit-graph: compute generations separately
+ commit-graph: validate layers for generation data
+ commit-graph: always parse before commit_graph_data_at()
+ commit-graph: use repo_parse_commit
(this branch uses ak/corrected-commit-date; is tangled with ds/chunked-file-api and ds/merge-base-independent.)
Fix incremental update of commit-graph file around corrected commit
date data.
Will merge to 'master'.
* jh/simple-ipc (2021-02-01) 13 commits
- simple-ipc: add Unix domain socket implementation
- unix-socket: do not call die in unix_stream_connect()
- unix-socket: add no-chdir option to unix_stream_listen()
- unix-socket: add options to unix_stream_listen()
- unix-socket: elimiate static unix_stream_socket() helper function
- simple-ipc: add t/helper/test-simple-ipc and t0052
- simple-ipc: add win32 implementation
- simple-ipc: design documentation for new IPC mechanism
- pkt-line: accept additional options in read_packetized_to_strbuf()
- pkt-line: (optionally) libify the packet readers
- pkt-line: optionally skip the flush packet in write_packetized_from_buf()
- pkt-line: add write_packetized_from_buf2() that takes scratch buffer
- pkt-line: promote static buffer in packet_write_gently() to callers
A simple IPC interface gets introduced to build services like
fsmonitor on top.
* ab/pager-exit-log (2021-02-01) 4 commits
- pager: properly log pager exit code when signalled
- run-command: add braces for "if" block in wait_or_whine()
- pager: test for exit code with and without SIGPIPE
- pager: refactor wait_for_pager() function
When a pager spawned by us exited, the trace log did not record its
exit status correctly, which has been corrected.
* jk/complete-branch-force-delete (2021-02-03) 3 commits
(merged to 'next' on 2021-02-03 at 6454bb89b5)
+ doc/git-branch: fix awkward wording for "-c"
+ completion: handle other variants of "branch -m"
+ completion: treat "branch -D" the same way as "branch -d"
The command line completion (in contrib/) completed "git branch -d"
with branch names, but "git branch -D" offered tagnames in addition,
which has been corrected. "git branch -M" had the same problem.
Will merge to 'master'.
* ta/hash-function-transition-doc (2021-02-02) 6 commits
- doc: use https links
- doc hash-function-transition: move rationale upwards
- doc hash-function-transition: fix incomplete sentence
- doc hash-function-transition: use upper case consistently
- doc hash-function-transition: use SHA-1 and SHA-256 consistently
- doc hash-function-transition: fix asciidoc output
Update formatting and grammar of the hash transition plan
documentation, plus some updates.
Except for [5/6] these look good.
--------------------------------------------------
[Stalled]
* fc/bash-completion-post-2.29 (2020-12-23) 4 commits
. 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.*
Seems to break tests on Windows
* ss/submodule-add-in-c (2020-12-15) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Expecting a reroll.
The patches are split incorrectly; part of 1/3 belongs to 2/3
cf. <nycvar.QRO.7.76.6.2012190104140.56@tvgsbejvaqbjf.bet>
It seems to introduce a segfault on 'seen'.
cf. <xmqqft3xflw7.fsf@gitster.c.googlers.com>
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
Break out and fast-track bugfix from the remainder of the topic.
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
- docs: document symlink restrictions for .git* files
- fsck: complain when .gitattributes or .gitignore is a symlink
- verify_path(): disallow symlinks in .gitattributes and .gitignore
- t0060: test obscured .gitattributes and .gitignore matching
- t7450: test .gitmodules symlink matching against obscured names
- t7450: test verify_path() handling of gitmodules
- t7415: rename to expand scope
- fsck_tree(): wrap some long lines
- fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
has potential consequences that is more/less grave, so that these
projects can opt out of the new checks?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* jc/war-on-dashed-git (2020-12-21) 2 commits
- fixup??? git: catch an attempt to run "git-foo"
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Got enough review comments to get updated.
--------------------------------------------------
[Cooking]
* sg/t7800-difftool-robustify (2021-01-09) 1 commit
(merged to 'next' on 2021-01-31 at fb72af8200)
+ t7800-difftool: don't accidentally match tmp dirs
Test fix.
Will merge to 'master'.
* ab/lose-grep-debug (2021-01-26) 1 commit
(merged to 'next' on 2021-01-31 at 9b7548efce)
+ grep/log: remove hidden --debug and --grep-debug options
Lose the debugging aid that may have been useful in the past, but
no longer is, in the "grep" codepaths.
Will merge to 'master'.
* ds/chunked-file-api (2021-01-27) 17 commits
- chunk-format: add technical docs
- chunk-format: restore duplicate chunk checks
- midx: use 64-bit multiplication for chunk sizes
- midx: use chunk-format read API
- commit-graph: use chunk-format read API
- chunk-format: create read chunk API
- midx: use chunk-format API in write_midx_internal()
- midx: drop chunk progress during write
- midx: return success/failure in chunk write methods
- midx: add num_large_offsets to write_midx_context
- midx: add pack_perm to write_midx_context
- midx: add entries to write_midx_context
- midx: use context in write_midx_pack_names()
- midx: rename pack_info to write_midx_context
- commit-graph: use chunk-format write API
- chunk-format: create chunk format write API
- commit-graph: anonymize data in chunk_write_fn
(this branch uses ak/corrected-commit-date; is tangled with ds/commit-graph-genno-fix and ds/merge-base-independent.)
* ds/merge-base-independent (2021-02-01) 5 commits
- commit-reach: stale commits may prune generation further
- commit-reach: use heuristic in remove_redundant()
- commit-reach: move compare_commits_by_gen
- commit-reach: use one walk in remove_redundant()
- commit-reach: reduce requirements for remove_redundant()
(this branch uses ak/corrected-commit-date; is tangled with ds/chunked-file-api and ds/commit-graph-genno-fix.)
The code to implement "git merge-base --independent" was poorly
done and was kept from the very beginning of the feature.
* jk/pretty-lazy-load-commit (2021-01-28) 1 commit
(merged to 'next' on 2021-02-01 at acf7353a32)
+ pretty: lazy-load commit data when expanding user-format
Some pretty-format specifiers do not need the data in commit object
(e.g. "%H"), but we were over-eager to load and parse it, which has
been made even lazier.
Will merge to 'master'.
* jk/t0000-cleanups (2021-01-28) 4 commits
(merged to 'next' on 2021-01-31 at 357f8fe097)
+ t0000: consistently use single quotes for outer tests
+ t0000: run cleaning test inside sub-test
+ t0000: run prereq tests inside sub-test
+ t0000: keep clean-up tests together
Code clean-up.
Will merge to 'master'.
* jk/use-oid-pos (2021-01-28) 6 commits
(merged to 'next' on 2021-01-31 at 10ccafb739)
+ oid_pos(): access table through const pointers
+ hash_pos(): convert to oid_pos()
+ rerere: use strmap to store rerere directories
+ rerere: tighten rr-cache dirname check
+ rerere: check dirname format while iterating rr_cache directory
+ commit_graft_pos(): take an oid instead of a bare hash
Code clean-up to ensure our use of hashtables using object names as
keys use the "struct object_id" objects, not the raw hash values.
Will merge to 'master'.
* jk/weather-balloon-require-variadic-macro (2021-01-27) 1 commit
(merged to 'next' on 2021-01-31 at 8d5207bd85)
+ git-compat-util: always enable variadic macros
We've carried compatibility codepaths for compilers without
variadic macros for quite some time, but the world may be ready for
them to be removed. Force compilation failure on exotic platforms
where variadic macros are not available to find out who screams in
such a way that we can easily revert if it turns out that the world
is not yet ready.
Will merge to 'master'.
* pb/ci-matrix-wo-shortcut (2021-01-27) 1 commit
(merged to 'next' on 2021-01-31 at 2384693758)
+ ci: do not cancel all jobs of a matrix if one fails
Our setting of GitHub CI test jobs were a bit too eager to give up
once there is even one failure found. Tweak the knob to allow
other jobs keep running even when we see a failure, so that we can
find more failures in a single run.
Will merge to 'master'.
* sg/test-stress-jobs (2021-01-26) 1 commit
(merged to 'next' on 2021-02-01 at 0b7aae84e3)
+ test-lib: prevent '--stress-jobs=X' from being ignored
Test framework fix.
Will merge to 'master'.
* hv/trailer-formatting (2021-01-30) 5 commits
- SQUASH???
- SQUASH: fix sparse error
- ref-filter: use pretty.c logic for trailers
- pretty.c: capture invalid trailer argument
- pretty.c: refactor trailer logic to `format_set_trailers_options()`
The logic to handle "trailer" related placeholders in the
"--format=" mechanisms in the "log" family and "for-each-ref"
family is getting unified.
Expecting further work.
* jk/p5303-sed-portability-fix (2021-01-29) 1 commit
(merged to 'next' on 2021-01-31 at 5f2957e738)
+ p5303: avoid sed GNU-ism
A perf script was made more portable.
Will merge to 'master'.
* pb/blame-funcname-range-userdiff (2021-01-30) 1 commit
(merged to 'next' on 2021-01-31 at 107d10fe4f)
+ annotate-tests: quote variable expansions containing path names
Test fix.
Will merge to 'master'.
* sh/mergetool-hideresolved (2021-01-29) 3 commits
- mergetool: add per-tool support and overrides for the hideResolved flag
- mergetool: break setup_tool out into separate initialization function
- mergetool: add hideResolved configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Getting there.
The interaction between configuration variables look somewhat iffy.
* tb/precompose-prefix-too (2021-02-03) 1 commit
- MacOS: precompose_argv_prefix()
When commands are started from a subdirectory, they may have to
compare the path to the subdirectory (called prefix and found out
from $(pwd)) with the tracked paths. On macOS, $(pwd) and
readdir() yield decomposed path, while the tracked paths are
usually normalized to the precomposed form, causing mismatch. This
has been fixed by taking the same approach used to normalize the
command line arguments.
Will merge to 'next'.
* cm/rebase-i (2021-01-29) 9 commits
(merged to 'next' on 2021-02-01 at 4f9aa6cec3)
+ doc/git-rebase: add documentation for fixup [-C|-c] options
+ rebase -i: teach --autosquash to work with amend!
+ t3437: test script for fixup [-C|-c] options in interactive rebase
+ rebase -i: add fixup [-C | -c] command
+ sequencer: use const variable for commit message comments
+ sequencer: pass todo_item to do_pick_commit()
+ rebase -i: comment out squash!/fixup! subjects from squash message
+ sequencer: factor out code to append squash message
+ rebase -i: only write fixup-message when it's needed
"rebase -i" is getting cleaned up and also enhanced.
Will merge to 'master'.
* ds/more-index-cleanups (2021-01-23) 9 commits
(merged to 'next' on 2021-02-01 at bcdfa11e73)
+ t1092: test interesting sparse-checkout scenarios
+ test-lib: test_region looks for trace2 regions
+ sparse-checkout: load sparse-checkout patterns
+ name-hash: use trace2 regions for init
+ repository: add repo reference to index_state
+ fsmonitor: de-duplicate BUG()s around dirty bits
+ cache-tree: extract subtree_pos()
+ cache-tree: simplify verify_cache() prototype
+ cache-tree: clean up cache_tree_update()
(this branch uses ds/cache-tree-basics.)
Cleaning various codepaths up.
Will merge to 'master'.
* rs/worktree-list-verbose (2021-01-30) 7 commits
(merged to 'next' on 2021-02-01 at b57a6ce4c6)
+ worktree: teach `list` verbose mode
+ worktree: teach `list` to annotate prunable worktree
+ worktree: teach `list --porcelain` to annotate locked worktree
+ t2402: ensure locked worktree is properly cleaned up
+ worktree: teach worktree_lock_reason() to gently handle main worktree
+ worktree: teach worktree to lazy-load "prunable" reason
+ worktree: libify should_prune_worktree()
`git worktree list` now annotates worktrees as prunable, shows
locked and prunable attributes in --porcelain mode, and gained
a --verbose option.
Will merge to 'master'.
cf. <CAPig+cTt-TyOR8kc6YvBVLpf-bgFdJ+FVYA2NvG_Vvn7tMbBkQ@mail.gmail.com>
* tb/geometric-repack (2021-01-20) 10 commits
. builtin/repack.c: add '--geometric' option
. builtin/repack.c: extract loose object handling
. builtin/pack-objects.c: teach '--keep-pack-stdin'
. packfile: add kept-pack cache for find_kept_pack_entry()
. pack-objects: rewrite honor-pack-keep logic
. p5303: measure time to repack with keep
. p5303: add missing &&-chains
. builtin/pack-objects.c: learn '--assume-kept-packs-closed'
. revision: learn '--no-kept-objects'
. packfile: introduce 'find_kept_pack_entry()'
"git repack" so far has been only capable of repacking everything
under the sun into a single pack (or split by size). A cleverer
strategy to reduce the cost of repacking a repository has been
introduced.
Expecting further work.
* zh/ls-files-deduplicate (2021-01-23) 3 commits
(merged to 'next' on 2021-01-26 at af7522d2cf)
+ ls-files.c: add --deduplicate option
+ ls_files.c: consolidate two for loops into one
+ ls_files.c: bugfix for --deleted and --modified
"git ls-files" can and does show multiple entries when the index is
unmerged, which is a source for confusion unless -s/-u option is in
use. A new option --deduplicate has been introduced.
Will merge to 'master'.
* ah/rebase-no-fork-point-config (2021-01-21) 1 commit
- rebase: add a config option for --no-fork-point
"git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.
Expecting a reroll to update its tests.
cf. <CAMMLpeTDNLUz9UVnL3aVK=J7X50Sq8L-OVGaoEsT5AY6EQON-g@mail.gmail.com>
* js/range-diff-wo-dotdot (2021-01-27) 3 commits
- range-diff(docs): explain how to specify commit ranges
- range-diff/format-patch: handle commit ranges other than A..B
- range-diff/format-patch: refactor check for commit range
There are other ways than ".." for a single token to denote a
"commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
range-diff" did not understand them.
Getting there.
cf. <pull.841.v3.git.1611765444.gitgitgadget@gmail.com>
* jx/t5411-unique-filenames (2021-01-22) 2 commits
- t5411: refactor check of refs using test_cmp_refs
- t5411: use different out file to prevent overwriting
Avoid individual tests in t5411 from getting affected by each other
by forcing them to use separate output files during the test.
* ph/use-delete-refs (2021-01-21) 1 commit
(merged to 'next' on 2021-01-26 at e03486152e)
+ use delete_refs when deleting tags or branches
When removing many branches and tags, the code used to do so one
ref at a time. There is another API it can use to delete multiple
refs, and it makes quite a lot of performance difference when the
refs are packed.
Will merge to 'master'.
* tb/ls-refs-optim (2021-01-22) 3 commits
(merged to 'next' on 2021-01-26 at 09edbf7d9a)
+ ls-refs.c: traverse prefixes of disjoint "ref-prefix" sets
+ ls-refs.c: initialize 'prefixes' before using it
+ refs: expose 'for_each_fullref_in_prefixes'
The ls-refs protocol operation has been optimized to narrow the
sub-hierarchy of refs/ it walks to produce response.
Will merge to 'master'.
* ab/grep-pcre-invalid-utf8 (2021-01-24) 2 commits
(merged to 'next' on 2021-02-01 at 60be521876)
+ grep/pcre2: better support invalid UTF-8 haystacks
+ grep/pcre2 tests: don't rely on invalid UTF-8 data test
Update support for invalid UTF-8 in PCRE2.
Will merge to 'master'.
* ab/retire-pcre1 (2021-01-23) 2 commits
(merged to 'next' on 2021-02-01 at 532a0a8228)
+ Remove support for v1 of the PCRE library
+ config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag
The support for deprecated PCRE1 library has been dropped.
Will merge to 'master'.
* jt/transfer-fsck-across-packs (2021-01-25) 5 commits
- SQUASH??? test fix
- fetch-pack: print and use dangling .gitmodules
- fetch-pack: with packfile URIs, use index-pack arg
- http-fetch: allow custom index-pack args
- http: allow custom index-pack args
The approach to "fsck" the incoming objects in "index-pack" is
attractive for performance reasons (we have them already in core,
inflated and ready to be inspected), but fundamentally cannot be
applied fully when we receive more than one pack stream, as a tree
object in one pack may refer to a blob object in another pack as
".gitmodules", when we want to inspect blobs that are used as
".gitmodules" file, for example. Teach "index-pack" to emit
objects that must be inspected later and check them in the calling
"fetch-pack" process.
* jv/pack-objects-narrower-ref-iteration (2021-01-22) 1 commit
(merged to 'next' on 2021-01-26 at 8a0d178c01)
+ builtin/pack-objects.c: avoid iterating all refs
The "pack-objects" command needs to iterate over all the tags when
automatic tag following is enabled, but it actually iterated over
all refs and then discarded everything outside "refs/tags/"
hierarchy, which was quite wasteful.
Will merge to 'master'.
* jv/upload-pack-filter-spec-quotefix (2021-02-02) 2 commits
(merged to 'next' on 2021-02-03 at 2e34f74e3a)
+ t5544: clarify 'hook works with partial clone' test
(merged to 'next' on 2021-01-31 at 789bf4154e)
+ upload-pack.c: fix filter spec quoting bug
Fix in passing custom args from "git clone" to "upload-pack" on the
other side.
Will merge to 'master'.
* ab/tests-various-fixup (2021-01-23) 10 commits
(merged to 'next' on 2021-02-01 at a604a6e217)
+ rm tests: actually test for SIGPIPE in SIGPIPE test
+ archive tests: use a cheaper "zipinfo -h" invocation to get header
+ upload-pack tests: avoid a non-zero "grep" exit status
+ git-svn tests: rewrite brittle tests to use "--[no-]merges".
+ git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty
+ git svn mergeinfo tests: modernize redirection & quoting style
+ cache-tree tests: explicitly test HEAD and index differences
+ cache-tree tests: use a sub-shell with less indirection
+ cache-tree tests: remove unused $2 parameter
+ cache-tree tests: refactor for modern test style
Various test updates.
Will merge to 'master'.
* en/ort-directory-rename (2021-01-20) 18 commits
(merged to 'next' on 2021-02-01 at 5c1cdd13a1)
+ merge-ort: fix a directory rename detection bug
+ merge-ort: process_renames() now needs more defensiveness
+ merge-ort: implement apply_directory_rename_modifications()
+ merge-ort: add a new toplevel_dir field
+ merge-ort: implement handle_path_level_conflicts()
+ merge-ort: implement check_for_directory_rename()
+ merge-ort: implement apply_dir_rename() and check_dir_renamed()
+ merge-ort: implement compute_collisions()
+ merge-ort: modify collect_renames() for directory rename handling
+ merge-ort: implement handle_directory_level_conflicts()
+ merge-ort: implement compute_rename_counts()
+ merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
+ merge-ort: add outline of get_provisional_directory_renames()
+ merge-ort: add outline for computing directory renames
+ merge-ort: collect which directories are removed in dirs_removed
+ merge-ort: initialize and free new directory rename data structures
+ merge-ort: add new data structures for directory rename detection
+ Merge branch 'en/merge-ort-3' into en/ort-directory-rename
(this branch is used by en/merge-ort-perf.)
ORT merge strategy learns to infer "renamed directory" while
merging.
Will merge to 'master'.
* ab/detox-gettext-tests (2021-01-21) 3 commits
(merged to 'next' on 2021-02-01 at 5573b4913c)
+ tests: remove uses of GIT_TEST_GETTEXT_POISON=false
+ tests: remove support for GIT_TEST_GETTEXT_POISON
+ ci: remove GETTEXT_POISON jobs
Get rid of "GETTEXT_POISON" support altogether, which may or may
not be controversial.
Will merge to 'master'.
* bc/signed-objects-with-both-hashes (2021-01-18) 6 commits
- gpg-interface: remove other signature headers before verifying
- ref-filter: hoist signature parsing
- commit: allow parsing arbitrary buffers with headers
- gpg-interface: improve interface for parsing tags
- commit: ignore additional signatures when parsing signed commits
- ref-filter: switch some uses of unsigned long to size_t
Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
Looking good.
* js/rebase-i-commit-cleanup-fix (2021-01-28) 1 commit
(merged to 'next' on 2021-01-31 at 358f562e1f)
+ rebase -i: do leave commit message intact in fixup! chains
When "git rebase -i" processes "fixup" insn, there is no reason to
clean up the commit log message, but we did the usual stripspace
processing. This has been corrected.
Will merge to 'master'.
* tb/pack-revindex-on-disk (2021-01-28) 10 commits
(merged to 'next' on 2021-02-01 at bd6a780213)
+ t5325: check both on-disk and in-memory reverse index
+ pack-revindex: ensure that on-disk reverse indexes are given precedence
+ t: support GIT_TEST_WRITE_REV_INDEX
+ t: prepare for GIT_TEST_WRITE_REV_INDEX
+ Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'
+ builtin/pack-objects.c: respect 'pack.writeReverseIndex'
+ builtin/index-pack.c: write reverse indexes
+ builtin/index-pack.c: allow stripping arbitrary extensions
+ pack-write.c: prepare to write 'pack-*.rev' files
+ packfile: prepare for the existence of '*.rev' files
Introduce an on-disk file to record revindex for packdata, which
traditionally was always created on the fly and only in-core.
Will merge to 'master'.
* en/merge-ort-perf (2021-01-23) 6 commits
(merged to 'next' on 2021-02-01 at ca3c07579b)
+ merge-ort: begin performance work; instrument with trace2_region_* calls
+ merge-ort: ignore the directory rename split conflict for now
+ merge-ort: fix massive leak
+ Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
+ Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
+ Merge branch 'en/diffcore-rename' into en/merge-ort-perf
(this branch uses en/ort-conflict-handling and en/ort-directory-rename.)
The "ort" merge strategy.
Will merge to 'master'.
* ds/cache-tree-basics (2021-01-15) 10 commits
(merged to 'next' on 2021-01-25 at 29ee74df7b)
+ cache-tree: speed up consecutive path comparisons
+ cache-tree: use ce_namelen() instead of strlen()
+ index-format: discuss recursion of cache-tree better
+ index-format: update preamble to cache tree extension
+ index-format: use 'cache tree' over 'cached tree'
+ cache-tree: trace regions for prime_cache_tree
+ cache-tree: trace regions for I/O
+ cache-tree: use trace2 in cache_tree_update()
+ unpack-trees: add trace2 regions
+ tree-walk: report recursion counts
(this branch is used by ds/more-index-cleanups.)
Document, clean-up and optimize the code around the cache-tree
extension in the index.
Will merge to 'master'.
* en/ort-conflict-handling (2021-01-04) 10 commits
(merged to 'next' on 2021-01-25 at 369c1516c4)
+ merge-ort: add handling for different types of files at same path
+ merge-ort: copy find_first_merges() implementation from merge-recursive.c
+ merge-ort: implement format_commit()
+ merge-ort: copy and adapt merge_submodule() from merge-recursive.c
+ merge-ort: copy and adapt merge_3way() from merge-recursive.c
+ merge-ort: flesh out implementation of handle_content_merge()
+ merge-ort: handle book-keeping around two- and three-way content merge
+ merge-ort: implement unique_path() helper
+ merge-ort: handle directory/file conflicts that remain
+ merge-ort: handle D/F conflict where directory disappears due to merge
(this branch is used by en/merge-ort-perf.)
ORT merge strategy learns more support for merge conflicts.
Will merge to 'master'.
* ak/corrected-commit-date (2021-01-18) 11 commits
(merged to 'next' on 2021-01-26 at deae33ec7d)
+ doc: add corrected commit date info
+ commit-reach: use corrected commit dates in paint_down_to_common()
+ commit-graph: use generation v2 only if entire chain does
+ commit-graph: implement generation data chunk
+ commit-graph: implement corrected commit date
+ commit-graph: return 64-bit generation number
+ commit-graph: add a slab to store topological levels
+ t6600-test-reach: generalize *_three_modes
+ commit-graph: consolidate fill_commit_graph_info
+ revision: parse parent in indegree_walk_step()
+ commit-graph: fix regression when computing Bloom filters
(this branch is used by ds/chunked-file-api, ds/commit-graph-genno-fix and ds/merge-base-independent.)
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Will merge to 'master'.
* mr/bisect-in-c-4 (2021-02-03) 7 commits
- bisect--helper: retire `--check-and-set-terms` subcommand
- bisect--helper: reimplement `bisect_skip` shell function in C
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: use `res` instead of return in BISECT_RESET case option
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: reimplement `bisect_replay` shell function in C
- bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
Will merge to 'next'.
* jt/clone-unborn-head (2021-02-01) 3 commits
- clone: respect remote unborn HEAD
- connect, transport: encapsulate arg in struct
- ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
Looking good, modulo some minor documentation nits.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* so/log-diff-merge (2020-12-21) 32 commits
(merged to 'next' on 2021-01-25 at 63977ef287)
+ t4013: add tests for --diff-merges=first-parent
+ doc/git-show: include --diff-merges description
+ doc/rev-list-options: document --first-parent changes merges format
+ doc/diff-generate-patch: mention new --diff-merges option
+ doc/git-log: describe new --diff-merges options
+ diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
+ diff-merges: add old mnemonic counterparts to --diff-merges
+ diff-merges: let new options enable diff without -p
+ diff-merges: do not imply -p for new options
+ diff-merges: implement new values for --diff-merges
+ diff-merges: make -m/-c/--cc explicitly mutually exclusive
+ diff-merges: refactor opt settings into separate functions
+ diff-merges: get rid of now empty diff_merges_init_revs()
+ diff-merges: group diff-merge flags next to each other inside 'rev_info'
+ diff-merges: split 'ignore_merges' field
+ diff-merges: fix -m to properly override -c/--cc
+ t4013: add tests for -m failing to override -c/--cc
+ t4013: support test_expect_failure through ':failure' magic
+ diff-merges: revise revs->diff flag handling
+ diff-merges: handle imply -p on -c/--cc logic for log.c
+ diff-merges: introduce revs->first_parent_merges flag
+ diff-merges: new function diff_merges_set_dense_combined_if_unset()
+ diff-merges: new function diff_merges_suppress()
+ diff-merges: re-arrange functions to match the order they are called in
+ diff-merges: rename diff_merges_default_to_enable() to match semantics
+ diff-merges: move checks for first_parent_only out of the module
+ diff-merges: rename all functions to have common prefix
+ revision: move diff merges functions to its own diff-merges.c
+ revision: provide implementation for diff merges tweaks
+ revision: factor out initialization of diff-merge related settings
+ revision: factor out setup of diff-merge related settings
+ revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Will merge to 'master'.
* es/config-hooks (2020-12-21) 34 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
--------------------------------------------------
[Discarded]
* ds/update-index (2021-01-09) 14 commits
. update-index: remove static globals from callbacks
. update-index: reduce static globals, part 2
. update-index: reduce static globals, part 1
. update-index: remove ce_match_stat(), all macros
. update-index: replace several compatibility macros
. update-index: use add_index_entry()
. update-index: use remove_file_from_index()
. update-index: use index_name_pos() over cache_name_pos()
. update-index: use istate->cache_changed
. update-index: use istate->cache_nr over active_nr
. update-index: use istate->cache over active_cache
. update-index: drop the_index, the_repository
. rm: remove compatilibity macros
. mv: remove index compatibility macros
(this branch uses ag/merge-strategies-in-c.)
The implementation of a few commands lost reliance of "the_index"
compatibility macros by explicitly passing the index_state through
the callchain.
Retracted for now.
cf. <a6906459-3a93-ecad-c460-b6c763819389@gmail.com>
* fc/mergetool-automerge (2021-01-09) 8 commits
. fixup! mergetool: break setup_tool out into separate initialization function
. fixup! fixup! mergetool: add automerge configuration
. fixup! mergetool: add automerge configuration
. mergetool: add automerge_enabled tool-specific override function
. mergetool: break setup_tool out into separate initialization function
. mergetool: add per-tool support for the autoMerge flag
. mergetool: alphabetize the mergetool config docs
. mergetool: add automerge configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Superseded by the sh/mergetool-hideresolved topic.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Jan 2021, #06; Sat, 30)
@ 2021-01-31 0:00 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-01-31 0:00 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[New Topics]
* ab/lose-grep-debug (2021-01-26) 1 commit
- grep/log: remove hidden --debug and --grep-debug options
Lose the debugging aid that may have been useful in the past, but
no longer would be.
Will merge to 'next'.
* ds/chunked-file-api (2021-01-27) 17 commits
- chunk-format: add technical docs
- chunk-format: restore duplicate chunk checks
- midx: use 64-bit multiplication for chunk sizes
- midx: use chunk-format read API
- commit-graph: use chunk-format read API
- chunk-format: create read chunk API
- midx: use chunk-format API in write_midx_internal()
- midx: drop chunk progress during write
- midx: return success/failure in chunk write methods
- midx: add num_large_offsets to write_midx_context
- midx: add pack_perm to write_midx_context
- midx: add entries to write_midx_context
- midx: use context in write_midx_pack_names()
- midx: rename pack_info to write_midx_context
- commit-graph: use chunk-format write API
- chunk-format: create chunk format write API
- commit-graph: anonymize data in chunk_write_fn
(this branch uses ak/corrected-commit-date; is tangled with ds/merge-base-independent.)
* ds/merge-base-independent (2021-01-28) 3 commits
- commit-reach: use heuristic in remove_redundant()
- commit-reach: move compare_commits_by_gen
- commit-reach: use one walk in remove_redundant()
(this branch uses ak/corrected-commit-date; is tangled with ds/chunked-file-api.)
The code to implement "git merge-base --independent" was poorly
done and was kept from the very beginning of the feature.
Will merge to 'next'.
* jk/pretty-lazy-load-commit (2021-01-28) 1 commit
- pretty: lazy-load commit data when expanding user-format
Some pretty-format specifiers do not need the data in commit object
(e.g. "%H"), but we were over-eager to load and parse it, which has
been made even lazier.
Will merge to 'next'.
* jk/t0000-cleanups (2021-01-28) 4 commits
- t0000: consistently use single quotes for outer tests
- t0000: run cleaning test inside sub-test
- t0000: run prereq tests inside sub-test
- t0000: keep clean-up tests together
Code clean-up.
Will merge to 'next'.
* jk/use-oid-pos (2021-01-28) 6 commits
- oid_pos(): access table through const pointers
- hash_pos(): convert to oid_pos()
- rerere: use strmap to store rerere directories
- rerere: tighten rr-cache dirname check
- rerere: check dirname format while iterating rr_cache directory
- commit_graft_pos(): take an oid instead of a bare hash
Code clean-up to ensure our use of hashtables using object names as
keys use the "struct object_id" objects, not the raw hash values.
Will merge to 'next'.
* jk/weather-balloon-require-variadic-macro (2021-01-27) 1 commit
- git-compat-util: always enable variadic macros
We've carried compatibility codepaths for compilers without
variadic macros for quite some time, but the world may be ready for
them to be removed. Force compilation failure on exotic platforms
where variadic macros are not available to find out who screams in
such a way that we can easily revert if the world is not ready.
Will merge to 'next'.
* pb/ci-matrix-wo-shortcut (2021-01-27) 1 commit
- ci: do not cancel all jobs of a matrix if one fails
Our setting of GitHub CI test jobs were a bit too eager to give up
once there is even one failure found. Tweak the knob to let
independent jobs to keep running, so that we can find more failures
in a single run.
Will merge to 'next'.
* sg/test-stress-jobs (2021-01-26) 1 commit
- test-lib: prevent '--stress-jobs=X' from being ignored
Test framework fix.
Will merge to 'next'.
* hv/trailer-formatting (2021-01-30) 5 commits
- SQUASH???
- SQUASH: fix sparse error
- ref-filter: use pretty.c logic for trailers
- pretty.c: capture invalid trailer argument
- pretty.c: refactor trailer logic to `format_set_trailers_options()`
The logic to handle "trailer" related placeholders in the
"--format=" mechanisms in the "log" family and "for-each-ref"
family is getting unified.
Expecting further work.
* jk/p5303-sed-portability-fix (2021-01-29) 1 commit
- p5303: avoid sed GNU-ism
A perf script was made more portable.
Will merge to 'next'.
* pb/blame-funcname-range-userdiff (2021-01-30) 1 commit
- annotate-tests: quote variable expansions containing path names
Test fix.
Will merge to 'next'.
* sh/mergetool-hideresolved (2021-01-29) 3 commits
- mergetool: add per-tool support and overrides for the hideResolved flag
- mergetool: break setup_tool out into separate initialization function
- mergetool: add hideResolved configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Getting there.
* tb/precompose-prefix-too (2021-01-29) 1 commit
- MacOS: precompose_argv_prefix()
When commands are started from a subdirectory, they may have to
compare the path to the subdirectory (called prefix and found out
from $(pwd)) with the tracked paths. On macOS, $(pwd) and
readdir() yield decomposed path, while the tracked paths are
usually normalized to the precomposed form, causing mismatch. This
has been fixed by taking the same approach used to normalize the
command line arguments.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* sg/t7800-difftool-robustify (2021-01-09) 1 commit
- t7800-difftool: don't accidentally match tmp dirs
Test fix.
Not working on Windows.
cf. https://github.com/git/git/runs/1660588243?check_suite_focus=true#step:7:4186
* fc/bash-completion-post-2.29 (2020-12-23) 4 commits
. 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.*
Seems to break tests on Windows
* ss/submodule-add-in-c (2020-12-15) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Expecting a reroll.
The patches are split incorrectly; part of 1/3 belongs to 2/3
cf. <nycvar.QRO.7.76.6.2012190104140.56@tvgsbejvaqbjf.bet>
It seems to introduce a segfault on 'seen'.
cf. <xmqqft3xflw7.fsf@gitster.c.googlers.com>
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
Break out and fast-track bugfix from the remainder of the topic.
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
- docs: document symlink restrictions for .git* files
- fsck: complain when .gitattributes or .gitignore is a symlink
- verify_path(): disallow symlinks in .gitattributes and .gitignore
- t0060: test obscured .gitattributes and .gitignore matching
- t7450: test .gitmodules symlink matching against obscured names
- t7450: test verify_path() handling of gitmodules
- t7415: rename to expand scope
- fsck_tree(): wrap some long lines
- fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
has potential consequences that is more/less grave, so that these
projects can opt out of the new checks?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* jc/war-on-dashed-git (2020-12-21) 2 commits
- fixup??? git: catch an attempt to run "git-foo"
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Got enough review comments to get updated.
--------------------------------------------------
[Cooking]
* cm/rebase-i (2021-01-29) 9 commits
- doc/git-rebase: add documentation for fixup [-C|-c] options
- rebase -i: teach --autosquash to work with amend!
- t3437: test script for fixup [-C|-c] options in interactive rebase
- rebase -i: add fixup [-C | -c] command
- sequencer: use const variable for commit message comments
- sequencer: pass todo_item to do_pick_commit()
- rebase -i: comment out squash!/fixup! subjects from squash message
- sequencer: factor out code to append squash message
- rebase -i: only write fixup-message when it's needed
"rebase -i" is getting cleaned up and also enhanced.
It seems to break t3415 when merged to 'seen'.
* ds/maintenance-prefetch-cleanup (2021-01-20) 2 commits
(merged to 'next' on 2021-01-26 at 23efa6ebc3)
+ t7900: clean up some broken refs
+ maintenance: set log.excludeDecoration durin prefetch
Test clean-up plus UI improvement by hiding extra refs that
the prefetch task uses from "log --decorate" output.
Will merge to 'master'.
* ds/more-index-cleanups (2021-01-23) 9 commits
- t1092: test interesting sparse-checkout scenarios
- test-lib: test_region looks for trace2 regions
- sparse-checkout: load sparse-checkout patterns
- name-hash: use trace2 regions for init
- repository: add repo reference to index_state
- fsmonitor: de-duplicate BUG()s around dirty bits
- cache-tree: extract subtree_pos()
- cache-tree: simplify verify_cache() prototype
- cache-tree: clean up cache_tree_update()
(this branch uses ds/cache-tree-basics.)
Cleaning various codepaths up.
Will merge to 'next'.
* jt/packfile-as-uri-doc (2021-01-20) 1 commit
(merged to 'next' on 2021-01-26 at 50500a8982)
+ Doc: clarify contents of packfile sent as URI
Doc fix for packfile URI feature.
Will merge to 'master'.
* rs/worktree-list-verbose (2021-01-30) 7 commits
- worktree: teach `list` verbose mode
- worktree: teach `list` to annotate prunable worktree
- worktree: teach `list --porcelain` to annotate locked worktree
- t2402: ensure locked worktree is properly cleaned up
- worktree: teach worktree_lock_reason() to gently handle main worktree
- worktree: teach worktree to lazy-load "prunable" reason
- worktree: libify should_prune_worktree()
`git worktree list` now annotates worktrees as prunable, shows
locked and prunable attributes in --porcelain mode, and gained
a --verbose option.
Will merge to 'next'.
cf. <CAPig+cTt-TyOR8kc6YvBVLpf-bgFdJ+FVYA2NvG_Vvn7tMbBkQ@mail.gmail.com>
* tb/geometric-repack (2021-01-20) 10 commits
. builtin/repack.c: add '--geometric' option
. builtin/repack.c: extract loose object handling
. builtin/pack-objects.c: teach '--keep-pack-stdin'
. packfile: add kept-pack cache for find_kept_pack_entry()
. pack-objects: rewrite honor-pack-keep logic
. p5303: measure time to repack with keep
. p5303: add missing &&-chains
. builtin/pack-objects.c: learn '--assume-kept-packs-closed'
. revision: learn '--no-kept-objects'
. packfile: introduce 'find_kept_pack_entry()'
"git repack" so far has been only capable of repacking everything
under the sun into a single pack (or split by size). A cleverer
strategy to reduce the cost of repacking a repository has been
introduced.
Expecting further work.
* zh/ls-files-deduplicate (2021-01-23) 3 commits
(merged to 'next' on 2021-01-26 at af7522d2cf)
+ ls-files.c: add --deduplicate option
+ ls_files.c: consolidate two for loops into one
+ ls_files.c: bugfix for --deleted and --modified
"git ls-files" can and does show multiple entries when the index is
unmerged, which is a source for confusion unless -s/-u option is in
use. A new option --deduplicate has been introduced.
Will merge to 'master'.
* ah/rebase-no-fork-point-config (2021-01-21) 1 commit
- rebase: add a config option for --no-fork-point
"git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.
Expecting a reroll to update its tests.
cf. <CAMMLpeTDNLUz9UVnL3aVK=J7X50Sq8L-OVGaoEsT5AY6EQON-g@mail.gmail.com>
* jk/peel-iterated-oid (2021-01-21) 1 commit
(merged to 'next' on 2021-01-26 at 023758f4ee)
+ refs: switch peel_ref() to peel_iterated_oid()
The peel_ref() API has been replaced with peel_iterated_oid().
Will merge to 'master'.
* jk/run-command-use-shell-doc (2021-01-22) 1 commit
(merged to 'next' on 2021-01-26 at f9df80d861)
+ run-command: document use_shell option
The .use_shell flag in struct child_process that is passed to
run_command() API has been clarified with a bit more documentation.
Will merge to 'master'.
* js/range-diff-wo-dotdot (2021-01-27) 3 commits
- range-diff(docs): explain how to specify commit ranges
- range-diff/format-patch: handle commit ranges other than A..B
- range-diff/format-patch: refactor check for commit range
There are other ways than ".." for a single token to denote a
"commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
range-diff" did not understand them.
Getting there.
cf. <pull.841.v3.git.1611765444.gitgitgadget@gmail.com>
* js/skip-dashed-built-ins-from-config-mak (2021-01-21) 1 commit
(merged to 'next' on 2021-01-26 at 2d727a37f9)
+ SKIP_DASHED_BUILT_INS: respect `config.mak`
Build fix.
Will merge to 'master'.
* jx/t5411-unique-filenames (2021-01-22) 2 commits
- t5411: refactor check of refs using test_cmp_refs
- t5411: use different out file to prevent overwriting
Avoid individual tests in t5411 from getting affected by each other
by forcing them to use separate output files during the test.
* ph/use-delete-refs (2021-01-21) 1 commit
(merged to 'next' on 2021-01-26 at e03486152e)
+ use delete_refs when deleting tags or branches
When removing many branches and tags, the code used to do so one
ref at a time. There is another API it can use to delete multiple
refs, and it makes quite a lot of performance difference when the
refs are packed.
Will merge to 'master'.
* tb/ls-refs-optim (2021-01-22) 3 commits
(merged to 'next' on 2021-01-26 at 09edbf7d9a)
+ ls-refs.c: traverse prefixes of disjoint "ref-prefix" sets
+ ls-refs.c: initialize 'prefixes' before using it
+ refs: expose 'for_each_fullref_in_prefixes'
The ls-refs protocol operation has been optimized to narrow the
sub-hierarchy of refs/ it walks to produce response.
Will merge to 'master'.
* ab/grep-pcre-invalid-utf8 (2021-01-24) 2 commits
- grep/pcre2: better support invalid UTF-8 haystacks
- grep/pcre2 tests: don't rely on invalid UTF-8 data test
Update support for invalid UTF-8 in PCRE2.
Will merge to 'next'.
* ab/retire-pcre1 (2021-01-23) 2 commits
- Remove support for v1 of the PCRE library
- config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag
The support for deprecated PCRE1 library has been dropped.
Will merge to 'next'.
* jt/transfer-fsck-across-packs (2021-01-25) 5 commits
- SQUASH??? test fix
- fetch-pack: print and use dangling .gitmodules
- fetch-pack: with packfile URIs, use index-pack arg
- http-fetch: allow custom index-pack args
- http: allow custom index-pack args
The approach to "fsck" the incoming objects in "index-pack" is
attractive for performance reasons (we have them already in core,
inflated and ready to be inspected), but fundamentally cannot be
applied fully when we receive more than one pack stream, as a tree
object in one pack may refer to a blob object in another pack as
".gitmodules", when we want to inspect blobs that are used as
".gitmodules" file, for example. Teach "index-pack" to emit
objects that must be inspected later and check them in the calling
"fetch-pack" process.
* jv/pack-objects-narrower-ref-iteration (2021-01-22) 1 commit
(merged to 'next' on 2021-01-26 at 8a0d178c01)
+ builtin/pack-objects.c: avoid iterating all refs
The "pack-objects" command needs to iterate over all the tags when
automatic tag following is enabled, but it actually iterated over
all refs and then discarded everything outside "refs/tags/"
hierarchy, which was quite wasteful.
Will merge to 'master'.
* jv/upload-pack-filter-spec-quotefix (2021-01-28) 1 commit
- upload-pack.c: fix filter spec quoting bug
Fix in passing custom args from "git clone" to "upload-pack" on the
other side.
Will merge to 'next'.
* ab/fsck-doc-fix (2021-01-20) 1 commit
(merged to 'next' on 2021-01-25 at e3db0fe96f)
+ fsck doc: remove ancient out-of-date diagnostics
Documentation for "git fsck" lost stale bits that has become
incorrect.
Will merge to 'master'.
* ab/tests-various-fixup (2021-01-23) 10 commits
- rm tests: actually test for SIGPIPE in SIGPIPE test
- archive tests: use a cheaper "zipinfo -h" invocation to get header
- upload-pack tests: avoid a non-zero "grep" exit status
- git-svn tests: rewrite brittle tests to use "--[no-]merges".
- git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty
- git svn mergeinfo tests: modernize redirection & quoting style
- cache-tree tests: explicitly test HEAD and index differences
- cache-tree tests: use a sub-shell with less indirection
- cache-tree tests: remove unused $2 parameter
- cache-tree tests: refactor for modern test style
Various test updates.
Will merge to 'next'.
* en/ort-directory-rename (2021-01-20) 18 commits
- merge-ort: fix a directory rename detection bug
- merge-ort: process_renames() now needs more defensiveness
- merge-ort: implement apply_directory_rename_modifications()
- merge-ort: add a new toplevel_dir field
- merge-ort: implement handle_path_level_conflicts()
- merge-ort: implement check_for_directory_rename()
- merge-ort: implement apply_dir_rename() and check_dir_renamed()
- merge-ort: implement compute_collisions()
- merge-ort: modify collect_renames() for directory rename handling
- merge-ort: implement handle_directory_level_conflicts()
- merge-ort: implement compute_rename_counts()
- merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
- merge-ort: add outline of get_provisional_directory_renames()
- merge-ort: add outline for computing directory renames
- merge-ort: collect which directories are removed in dirs_removed
- merge-ort: initialize and free new directory rename data structures
- merge-ort: add new data structures for directory rename detection
- Merge branch 'en/merge-ort-3' into en/ort-directory-rename
(this branch is used by en/merge-ort-perf.)
ORT merge strategy learns to infer "renamed directory" while
merging.
Will merge to 'next'.
* ab/detox-gettext-tests (2021-01-21) 3 commits
- tests: remove uses of GIT_TEST_GETTEXT_POISON=false
- tests: remove support for GIT_TEST_GETTEXT_POISON
- ci: remove GETTEXT_POISON jobs
Get rid of "GETTEXT_POISON" support altogether, which may or may
not be controversial.
* bc/signed-objects-with-both-hashes (2021-01-18) 6 commits
- gpg-interface: remove other signature headers before verifying
- ref-filter: hoist signature parsing
- commit: allow parsing arbitrary buffers with headers
- gpg-interface: improve interface for parsing tags
- commit: ignore additional signatures when parsing signed commits
- ref-filter: switch some uses of unsigned long to size_t
Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
Looking good.
* js/rebase-i-commit-cleanup-fix (2021-01-28) 1 commit
- rebase -i: do leave commit message intact in fixup! chains
When "git rebase -i" processes "fixup" insn, there is no reason to
clean up the commit log message, but we did the usual stripspace
processing. This has been corrected.
Will merge to 'next'.
* tb/pack-revindex-on-disk (2021-01-28) 10 commits
- t5325: check both on-disk and in-memory reverse index
- pack-revindex: ensure that on-disk reverse indexes are given precedence
- t: support GIT_TEST_WRITE_REV_INDEX
- t: prepare for GIT_TEST_WRITE_REV_INDEX
- Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'
- builtin/pack-objects.c: respect 'pack.writeReverseIndex'
- builtin/index-pack.c: write reverse indexes
- builtin/index-pack.c: allow stripping arbitrary extensions
- pack-write.c: prepare to write 'pack-*.rev' files
- packfile: prepare for the existence of '*.rev' files
Introduce an on-disk file to record revindex for packdata, which
traditionally was always created on the fly and only in-core.
Looking good.
* en/merge-ort-perf (2021-01-23) 6 commits
- merge-ort: begin performance work; instrument with trace2_region_* calls
- merge-ort: ignore the directory rename split conflict for now
- merge-ort: fix massive leak
- Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
- Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
- Merge branch 'en/diffcore-rename' into en/merge-ort-perf
(this branch uses en/ort-conflict-handling and en/ort-directory-rename.)
The "ort" merge strategy.
Will merge to 'next'.
* ds/cache-tree-basics (2021-01-15) 10 commits
(merged to 'next' on 2021-01-25 at 29ee74df7b)
+ cache-tree: speed up consecutive path comparisons
+ cache-tree: use ce_namelen() instead of strlen()
+ index-format: discuss recursion of cache-tree better
+ index-format: update preamble to cache tree extension
+ index-format: use 'cache tree' over 'cached tree'
+ cache-tree: trace regions for prime_cache_tree
+ cache-tree: trace regions for I/O
+ cache-tree: use trace2 in cache_tree_update()
+ unpack-trees: add trace2 regions
+ tree-walk: report recursion counts
(this branch is used by ds/more-index-cleanups.)
Document, clean-up and optimize the code around the cache-tree
extension in the index.
Will merge to 'master'.
* en/ort-conflict-handling (2021-01-04) 10 commits
(merged to 'next' on 2021-01-25 at 369c1516c4)
+ merge-ort: add handling for different types of files at same path
+ merge-ort: copy find_first_merges() implementation from merge-recursive.c
+ merge-ort: implement format_commit()
+ merge-ort: copy and adapt merge_submodule() from merge-recursive.c
+ merge-ort: copy and adapt merge_3way() from merge-recursive.c
+ merge-ort: flesh out implementation of handle_content_merge()
+ merge-ort: handle book-keeping around two- and three-way content merge
+ merge-ort: implement unique_path() helper
+ merge-ort: handle directory/file conflicts that remain
+ merge-ort: handle D/F conflict where directory disappears due to merge
(this branch is used by en/merge-ort-perf.)
ORT merge strategy learns more support for merge conflicts.
Will merge to 'master'.
* ak/corrected-commit-date (2021-01-18) 11 commits
(merged to 'next' on 2021-01-26 at deae33ec7d)
+ doc: add corrected commit date info
+ commit-reach: use corrected commit dates in paint_down_to_common()
+ commit-graph: use generation v2 only if entire chain does
+ commit-graph: implement generation data chunk
+ commit-graph: implement corrected commit date
+ commit-graph: return 64-bit generation number
+ commit-graph: add a slab to store topological levels
+ t6600-test-reach: generalize *_three_modes
+ commit-graph: consolidate fill_commit_graph_info
+ revision: parse parent in indegree_walk_step()
+ commit-graph: fix regression when computing Bloom filters
(this branch is used by ds/chunked-file-api and ds/merge-base-independent.)
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Will merge to 'master'.
* mr/bisect-in-c-4 (2021-01-26) 7 commits
- bisect--helper: retire `--check-and-set-terms` subcommand
- bisect--helper: reimplement `bisect_skip` shell function in C
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: use `res` instead of return in BISECT_RESET case option
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: reimplement `bisect_replay` shell function in C
- bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
Will merge to 'next'.
* jt/clone-unborn-head (2021-01-28) 5 commits
- transport-internal.h: fix a 'hdr-check' warning
- ls-refs: don't peel NULL oid
- clone: respect remote unborn HEAD
- connect, transport: encapsulate arg in struct
- ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
Looking good, but the tip one from Ramsay may want to be squashed
into the step that introduces the problem.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* so/log-diff-merge (2020-12-21) 32 commits
(merged to 'next' on 2021-01-25 at 63977ef287)
+ t4013: add tests for --diff-merges=first-parent
+ doc/git-show: include --diff-merges description
+ doc/rev-list-options: document --first-parent changes merges format
+ doc/diff-generate-patch: mention new --diff-merges option
+ doc/git-log: describe new --diff-merges options
+ diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
+ diff-merges: add old mnemonic counterparts to --diff-merges
+ diff-merges: let new options enable diff without -p
+ diff-merges: do not imply -p for new options
+ diff-merges: implement new values for --diff-merges
+ diff-merges: make -m/-c/--cc explicitly mutually exclusive
+ diff-merges: refactor opt settings into separate functions
+ diff-merges: get rid of now empty diff_merges_init_revs()
+ diff-merges: group diff-merge flags next to each other inside 'rev_info'
+ diff-merges: split 'ignore_merges' field
+ diff-merges: fix -m to properly override -c/--cc
+ t4013: add tests for -m failing to override -c/--cc
+ t4013: support test_expect_failure through ':failure' magic
+ diff-merges: revise revs->diff flag handling
+ diff-merges: handle imply -p on -c/--cc logic for log.c
+ diff-merges: introduce revs->first_parent_merges flag
+ diff-merges: new function diff_merges_set_dense_combined_if_unset()
+ diff-merges: new function diff_merges_suppress()
+ diff-merges: re-arrange functions to match the order they are called in
+ diff-merges: rename diff_merges_default_to_enable() to match semantics
+ diff-merges: move checks for first_parent_only out of the module
+ diff-merges: rename all functions to have common prefix
+ revision: move diff merges functions to its own diff-merges.c
+ revision: provide implementation for diff merges tweaks
+ revision: factor out initialization of diff-merge related settings
+ revision: factor out setup of diff-merge related settings
+ revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Will merge to 'master'.
* es/config-hooks (2020-12-21) 34 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
--------------------------------------------------
[Discarded]
* ds/update-index (2021-01-09) 14 commits
. update-index: remove static globals from callbacks
. update-index: reduce static globals, part 2
. update-index: reduce static globals, part 1
. update-index: remove ce_match_stat(), all macros
. update-index: replace several compatibility macros
. update-index: use add_index_entry()
. update-index: use remove_file_from_index()
. update-index: use index_name_pos() over cache_name_pos()
. update-index: use istate->cache_changed
. update-index: use istate->cache_nr over active_nr
. update-index: use istate->cache over active_cache
. update-index: drop the_index, the_repository
. rm: remove compatilibity macros
. mv: remove index compatibility macros
(this branch uses ag/merge-strategies-in-c.)
The implementation of a few commands lost reliance of "the_index"
compatibility macros by explicitly passing the index_state through
the callchain.
Retracted for now.
cf. <a6906459-3a93-ecad-c460-b6c763819389@gmail.com>
* fc/mergetool-automerge (2021-01-09) 8 commits
. fixup! mergetool: break setup_tool out into separate initialization function
. fixup! fixup! mergetool: add automerge configuration
. fixup! mergetool: add automerge configuration
. mergetool: add automerge_enabled tool-specific override function
. mergetool: break setup_tool out into separate initialization function
. mergetool: add per-tool support for the autoMerge flag
. mergetool: alphabetize the mergetool config docs
. mergetool: add automerge configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Superseded by the sh/mergetool-hideresolved topic.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Jan 2021, #05; Mon, 25)
@ 2021-01-26 1:59 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-01-26 1:59 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The fourth batch of topics are now in 'master'. Dscho's "we
shouldn't break our tests, or reduce coverage by them, when 'git
init' starts using 'main' as the fallback default name for the
initial branch topic is in. Two of the topics have especially
noteworthy impact to end-users and developers, so I've added the
following to the draft release notes:
Backward incompatible and other important changes
* The "pack-redundant" command, which has been left stale with almost
unusable performance issues, now warns loudly when it gets used, as
we no longer want to recommend its use (instead just "repack -d"
instead).
* The development community has adopted Contributor Covenant v2.0 to
update from v1.4 that we have been using.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/branch-sort (2021-01-07) 7 commits
(merged to 'next' on 2021-01-12 at 1231feea7c)
+ branch: show "HEAD detached" first under reverse sort
+ branch: sort detached HEAD based on a flag
+ ref-filter: move ref_sorting flags to a bitfield
+ ref-filter: move "cmp_fn" assignment into "else if" arm
+ ref-filter: add braces to if/else if/else chain
+ branch tests: add to --sort tests
+ branch: change "--local" to "--list" in comment
The implementation of "git branch --sort" wrt the detached HEAD
display has always been hacky, which has been cleaned up.
* ab/coc-update-to-2.0 (2021-01-13) 3 commits
(merged to 'next' on 2021-01-15 at 4859c12625)
+ CoC: update to version 2.0 + local changes
+ CoC: explicitly take any whitespace breakage
+ CoC: Update word-wrapping to match upstream
Update the Code-of-conduct to version 2.0 from the upstream (we've
been using version 1.4).
* ab/mailmap (2021-01-12) 22 commits
(merged to 'next' on 2021-01-13 at a3ce27912f)
+ shortlog: remove unused(?) "repo-abbrev" feature
+ mailmap doc + tests: document and test for case-insensitivity
+ mailmap tests: add tests for empty "<>" syntax
+ mailmap tests: add tests for whitespace syntax
+ mailmap tests: add a test for comment syntax
+ mailmap doc + tests: add better examples & test them
+ tests: refactor a few tests to use "test_commit --append"
+ test-lib functions: add an --append option to test_commit
+ test-lib functions: add --author support to test_commit
+ test-lib functions: document arguments to test_commit
+ test-lib functions: expand "test_commit" comment template
+ mailmap: test for silent exiting on missing file/blob
+ mailmap tests: get rid of overly complex blame fuzzing
+ mailmap tests: add a test for "not a blob" error
+ mailmap tests: remove redundant entry in test
+ mailmap tests: improve --stdin tests
+ mailmap tests: modernize syntax & test idioms
+ mailmap tests: use our preferred whitespace syntax
+ mailmap doc: start by mentioning the comment syntax
+ check-mailmap doc: note config options
+ mailmap doc: quote config variables `like.this`
+ mailmap doc: create a new "gitmailmap(5)" man page
(this branch is used by ab/mailmap-fixup.)
Clean-up docs, codepaths and tests around mailmap.
* ab/mailmap-fixup (2021-01-14) 4 commits
(merged to 'next' on 2021-01-15 at ef14e2263d)
+ t4203: make blame output massaging more robust
+ mailmap doc: use correct environment variable 'GIT_WORK_TREE'
+ t4203: stop losing return codes of git commands
+ test-lib-functions.sh: fix usage for test_commit()
(this branch uses ab/mailmap.)
Follow-up fixes and improvements to ab/mailmap topic.
* ab/mktag (2021-01-06) 23 commits
(merged to 'next' on 2021-01-08 at 6f9e11ad97)
+ mktag: add a --[no-]strict option
+ mktag: mark strings for translation
+ mktag: convert to parse-options
+ mktag: allow omitting the header/body \n separator
+ mktag: allow turning off fsck.extraHeaderEntry
+ fsck: make fsck_config() re-usable
+ mktag: use fsck instead of custom verify_tag()
+ mktag: use puts(str) instead of printf("%s\n", str)
+ mktag: remove redundant braces in one-line body "if"
+ mktag: use default strbuf_read() hint
+ mktag tests: test verify_object() with replaced objects
+ mktag tests: improve verify_object() test coverage
+ mktag tests: test "hash-object" compatibility
+ mktag tests: stress test whitespace handling
+ mktag tests: run "fsck" after creating "mytag"
+ mktag tests: don't create "mytag" twice
+ mktag tests: don't redirect stderr to a file needlessly
+ mktag tests: remove needless SHA-1 hardcoding
+ mktag tests: use "test_commit" helper
+ mktag tests: don't needlessly use a subshell
+ mktag doc: update to explain why to use this
+ mktag doc: grammar fix, when exists -> when it exists
+ mktag doc: say <hash> not <sha1>
"git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
* cc/write-promisor-file (2021-01-14) 3 commits
(merged to 'next' on 2021-01-14 at 9d773d4734)
+ pack-write: die on error in write_promisor_file()
+ fetch-pack: refactor writing promisor file
+ fetch-pack: rename helper to create_promisor_file()
A bit of code refactoring.
* dl/reflog-with-single-entry (2021-01-11) 2 commits
(merged to 'next' on 2021-01-13 at 09b33209c4)
+ refs: allow @{n} to work with n-sized reflog
+ refs: factor out set_read_ref_cutoffs()
After expiring a reflog and making a single commit, the reflog for
the branch would record a single entry that knows both @{0} and
@{1}, but we failed to answer "what commit were we on?", i.e. @{1}
* en/diffcore-rename (2021-01-04) 9 commits
(merged to 'next' on 2021-01-12 at fa769ebc35)
+ diffcore-rename: remove unnecessary duplicate entry checks
+ diffcore-rename: accelerate rename_dst setup
+ diffcore-rename: simplify and accelerate register_rename_src()
+ t4058: explore duplicate tree entry handling in a bit more detail
+ t4058: add more tests and documentation for duplicate tree entry handling
+ diffcore-rename: reduce jumpiness in progress counters
+ diffcore-rename: simplify limit check
+ diffcore-rename: avoid usage of global in too_many_rename_candidates()
+ diffcore-rename: rename num_create to num_destinations
(this branch is used by en/merge-ort-perf.)
File-level rename detection updates.
* en/merge-ort-3 (2020-12-15) 11 commits
(merged to 'next' on 2021-01-08 at fe481b9627)
+ merge-ort: add implementation of type-changed rename handling
+ merge-ort: add implementation of normal rename handling
+ merge-ort: add implementation of rename collisions
+ merge-ort: add implementation of rename/delete conflicts
+ merge-ort: add implementation of both sides renaming differently
+ merge-ort: add implementation of both sides renaming identically
+ merge-ort: add basic outline for process_renames()
+ merge-ort: implement compare_pairs() and collect_renames()
+ merge-ort: implement detect_regular_renames()
+ merge-ort: add initial outline for basic rename detection
+ merge-ort: add basic data structures for handling renames
(this branch is used by en/merge-ort-perf and en/ort-directory-rename.)
Rename detection is added to the "ORT" merge strategy.
* jc/deprecate-pack-redundant (2020-12-15) 1 commit
(merged to 'next' on 2021-01-12 at 14034c7892)
+ pack-redundant: gauge the usage before proposing its removal
Warn loudly when the "pack-redundant" command, which has been left
stale with almost unusable performance issues, gets used, as we no
longer want to recommend its use (instead just "repack -d" instead).
* jk/forbid-lf-in-git-url (2021-01-07) 2 commits
(merged to 'next' on 2021-01-12 at 88a1d937ae)
+ fsck: reject .gitmodules git:// urls with newlines
+ git_connect_git(): forbid newlines in host and path
Newline characters in the host and path part of git:// URL are
now forbidden.
* jk/log-cherry-pick-duplicate-patches (2021-01-12) 1 commit
(merged to 'next' on 2021-01-13 at abcfbf8603)
+ patch-ids: handle duplicate hashmap entries
When more than one commit with the same patch ID appears on one
side, "git log --cherry-pick A...B" did not exclude them all when a
commit with the same patch ID appears on the other side. Now it
does.
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
(merged to 'next' on 2021-01-13 at 0e93f0d529)
+ tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
+ t99*: adjust the references to the default branch name "main"
+ tests(git-p4): transition to the default branch name `main`
+ t9[5-7]*: adjust the references to the default branch name "main"
+ t9[0-4]*: adjust the references to the default branch name "main"
+ t8*: adjust the references to the default branch name "main"
+ t7[5-9]*: adjust the references to the default branch name "main"
+ t7[0-4]*: adjust the references to the default branch name "main"
+ t6[4-9]*: adjust the references to the default branch name "main"
+ t64*: preemptively adjust alignment to prepare for `master` -> `main`
+ t6[0-3]*: adjust the references to the default branch name "main"
+ t5[6-9]*: adjust the references to the default branch name "main"
+ t55[4-9]*: adjust the references to the default branch name "main"
+ t55[23]*: adjust the references to the default branch name "main"
+ t551*: adjust the references to the default branch name "main"
+ t550*: adjust the references to the default branch name "main"
+ t5503: prepare aligned comment for replacing `master` with `main`
+ t5[0-4]*: adjust the references to the default branch name "main"
+ t5323: prepare centered comment for `master` -> `main`
+ t4*: adjust the references to the default branch name "main"
+ t3[5-9]*: adjust the references to the default branch name "main"
+ t34*: adjust the references to the default branch name "main"
+ t3416: preemptively adjust alignment in a comment
+ t3[0-3]*: adjust the references to the default branch name "main"
+ t2*: adjust the references to the default branch name "main"
+ t[01]*: adjust the references to the default branch name "main"
+ t0060: preemptively adjust alignment
+ tests: mark tests relying on the current default for `init.defaultBranch`
+ Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
* jx/bundle (2021-01-11) 3 commits
(merged to 'next' on 2021-01-14 at 749a907dd2)
+ bundle: arguments can be read from stdin
+ bundle: lost objects when removing duplicate pendings
+ test: add helper functions for git-bundle
"git bundle" learns "--stdin" option to read its refs from the
standard input. Also, it now does not lose refs whey they point
at the same object.
* ma/more-opaque-lock-file (2021-01-06) 5 commits
(merged to 'next' on 2021-01-12 at f246e38b50)
+ read-cache: try not to peek into `struct {lock_,temp}file`
+ refs/files-backend: don't peek into `struct lock_file`
+ midx: don't peek into `struct lock_file`
+ commit-graph: don't peek into `struct lock_file`
+ builtin/gc: don't peek into `struct lock_file`
Code clean-up.
* ps/config-env-pairs (2021-01-15) 8 commits
(merged to 'next' on 2021-01-15 at 4ed0341270)
+ config: allow specifying config entries via envvar pairs
+ environment: make `getenv_safe()` a public function
+ config: store "git -c" variables using more robust format
+ config: parse more robust format in GIT_CONFIG_PARAMETERS
+ config: extract function to parse config pairs
+ quote: make sq_dequote_step() a public function
+ config: add new way to pass config via `--config-env`
+ git: add `--super-prefix` to usage string
Introduce two new ways to feed configuration variable-value pairs
via environment variables, and tweak the way GIT_CONFIG_PARAMETERS
encodes variable/value pairs to make it more robust.
* ps/fetch-atomic (2021-01-12) 5 commits
(merged to 'next' on 2021-01-13 at a8896d0873)
+ fetch: implement support for atomic reference updates
+ fetch: allow passing a transaction to `s_update_ref()`
+ fetch: refactor `s_update_ref` to use common exit path
+ fetch: use strbuf to format FETCH_HEAD updates
+ fetch: extract writing to FETCH_HEAD
"git fetch" learns to treat ref updates atomically in all-or-none
fashion, just like "git push" does, with the new "--atomic" option.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-12-08) 1 commit
(merged to 'next' on 2021-01-12 at 2aca21c42e)
+ diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
* tb/pack-revindex-api (2021-01-14) 21 commits
(merged to 'next' on 2021-01-15 at 1f2997979c)
+ for_each_object_in_pack(): clarify pack vs index ordering
+ pack-revindex.c: avoid direct revindex access in 'offset_to_pack_pos()'
+ pack-revindex: hide the definition of 'revindex_entry'
+ pack-revindex: remove unused 'find_revindex_position()'
+ pack-revindex: remove unused 'find_pack_revindex()'
+ builtin/gc.c: guess the size of the revindex
+ for_each_object_in_pack(): convert to new revindex API
+ unpack_entry(): convert to new revindex API
+ packed_object_info(): convert to new revindex API
+ retry_bad_packed_offset(): convert to new revindex API
+ get_delta_base_oid(): convert to new revindex API
+ rebuild_existing_bitmaps(): convert to new revindex API
+ try_partial_reuse(): convert to new revindex API
+ get_size_by_pos(): convert to new revindex API
+ show_objects_for_type(): convert to new revindex API
+ bitmap_position_packfile(): convert to new revindex API
+ check_object(): convert to new revindex API
+ write_reused_pack_verbatim(): convert to new revindex API
+ write_reused_pack_one(): convert to new revindex API
+ write_reuse_object(): convert to new revindex API
+ pack-revindex: introduce a new API
(this branch is used by tb/pack-revindex-on-disk.)
Abstract accesses to in-core revindex that allows enumerating
objects stored in a packfile in the order they appear in the pack,
in preparation for introducing an on-disk precomputed revindex.
--------------------------------------------------
[New Topics]
* cm/rebase-i (2021-01-24) 9 commits
. doc/git-rebase: add documentation for fixup [-C|-c] options
. rebase -i: teach --autosquash to work with amend!
. t3437: test script for fixup [-C|-c] options in interactive rebase
. rebase -i: add fixup [-C | -c] command
. sequencer: use const variable for commit message comments
. sequencer: pass todo_item to do_pick_commit()
. rebase -i: comment out squash!/fixup! subjects from squash message
. sequencer: factor out code to append squash message
. rebase -i: only write fixup-message when it's needed
"rebase -i" is getting cleaned up and also enhanced.
It seems to break t3415 when merged to 'seen'.
* ds/maintenance-prefetch-cleanup (2021-01-20) 2 commits
- t7900: clean up some broken refs
- maintenance: set log.excludeDecoration durin prefetch
Test clean-up plus UI improvement by hiding extra refs that
the prefetch task uses from "log --decorate" output.
Will merge to 'next'.
* ds/more-index-cleanups (2021-01-23) 9 commits
- t1092: test interesting sparse-checkout scenarios
- test-lib: test_region looks for trace2 regions
- sparse-checkout: load sparse-checkout patterns
- name-hash: use trace2 regions for init
- repository: add repo reference to index_state
- fsmonitor: de-duplicate BUG()s around dirty bits
- cache-tree: extract subtree_pos()
- cache-tree: simplify verify_cache() prototype
- cache-tree: clean up cache_tree_update()
(this branch uses ds/cache-tree-basics.)
Cleaning various codepaths up.
Will merge to 'next'.
* jt/packfile-as-uri-doc (2021-01-20) 1 commit
- Doc: clarify contents of packfile sent as URI
Doc fix for packfile URI feature.
Will merge to 'next'.
* rs/worktree-list-verbose (2021-01-20) 7 commits
- worktree: teach `list` verbose mode
- worktree: teach `list` to annotate prunable worktree
- worktree: teach `list --porcelain` to annotate locked worktree
- t2402: ensure locked worktree is properly cleaned up
- worktree: teach worktree_lock_reason() to gently handle main worktree
- worktree: teach worktree to lazy-load "prunable" reason
- worktree: libify should_prune_worktree()
The "list" subcommand of "git worktree" learns to show more info in
its verbose mode.
Expecting a reroll.
cf. <gohp6kv9bq4a32.fsf@gmail.com>
* tb/geometric-repack (2021-01-20) 10 commits
- builtin/repack.c: add '--geometric' option
- builtin/repack.c: extract loose object handling
- builtin/pack-objects.c: teach '--keep-pack-stdin'
- packfile: add kept-pack cache for find_kept_pack_entry()
- pack-objects: rewrite honor-pack-keep logic
- p5303: measure time to repack with keep
- p5303: add missing &&-chains
- builtin/pack-objects.c: learn '--assume-kept-packs-closed'
- revision: learn '--no-kept-objects'
- packfile: introduce 'find_kept_pack_entry()'
"git repack" so far has been only capable of repacking everything
under the sun into a single pack (or split by size). A cleverer
strategy to reduce the cost of repacking a repository has been
introduced.
* zh/ls-files-deduplicate (2021-01-23) 3 commits
- ls-files.c: add --deduplicate option
- ls_files.c: consolidate two for loops into one
- ls_files.c: bugfix for --deleted and --modified
"git ls-files" can and does show multiple entries when the index is
unmerged, which is a source for confusion unless -s/-u option is in
use. A new option --deduplicate has been introduced.
Will merge to 'next'.
* ah/rebase-no-fork-point-config (2021-01-21) 1 commit
- rebase: add a config option for --no-fork-point
"git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.
Expecting a reroll to update its tests.
cf. <CAMMLpeTDNLUz9UVnL3aVK=J7X50Sq8L-OVGaoEsT5AY6EQON-g@mail.gmail.com>
* jk/peel-iterated-oid (2021-01-21) 1 commit
- refs: switch peel_ref() to peel_iterated_oid()
The peel_ref() API has been replaed with peel_iterated_oid().
Will merge to 'next'.
* jk/run-command-use-shell-doc (2021-01-22) 1 commit
- run-command: document use_shell option
The .use_shell flag in struct child_process that is passed to
run_command() API has been clarified with a bit more documentation.
Will merge to 'next'.
* js/range-diff-wo-dotdot (2021-01-21) 3 commits
- range-diff(docs): explain how to specify commit ranges
- range-diff: handle commit ranges other than A..B
- range-diff: refactor check for commit range
There are other ways than ".." for a single token to denote a
"commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
range-diff" did not understand them.
Getting closer.
cf. <xmqqzh107m5d.fsf@gitster.c.googlers.com>
* js/skip-dashed-built-ins-from-config-mak (2021-01-21) 1 commit
- SKIP_DASHED_BUILT_INS: respect `config.mak`
Build fix.
Will merge to 'next'.
* jx/t5411-unique-filenames (2021-01-22) 2 commits
- t5411: refactor check of refs using test_cmp_refs
- t5411: use different out file to prevent overwriting
Avoid individual tests in t5411 from getting affected by each other
by forcing them to use separate output files during the test.
* ph/use-delete-refs (2021-01-21) 1 commit
- use delete_refs when deleting tags or branches
When removing many branches and tags, the code used to do so one
ref at a time. There is another API it can use to delete multiple
refs, and it makes quite a lot of performance difference when the
refs are packed.
Will merge to 'next'.
* tb/ls-refs-optim (2021-01-22) 3 commits
- ls-refs.c: traverse prefixes of disjoint "ref-prefix" sets
- ls-refs.c: initialize 'prefixes' before using it
- refs: expose 'for_each_fullref_in_prefixes'
The ls-refs protocol operation has been optimized to narrow the
sub-hiearchy of refs/ it walks to produce response.
Will merge to 'next'.
* ab/grep-pcre-invalid-utf8 (2021-01-24) 2 commits
- grep/pcre2: better support invalid UTF-8 haystacks
- grep/pcre2 tests: don't rely on invalid UTF-8 data test
* ab/retire-pcre1 (2021-01-23) 2 commits
- Remove support for v1 of the PCRE library
- config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag
* jt/transfer-fsck-across-packs (2021-01-23) 4 commits
- fetch-pack: print and use dangling .gitmodules
- fetch-pack: with packfile URIs, use index-pack arg
- http-fetch: allow custom index-pack args
- http: allow custom index-pack args
The approach to "fsck" the incoming objects in "index-pack" is
attractive for performance reasons (we have them already in core,
inflated and ready to be inspected), but fundamentally cannot be
applied fully when we receive more than one pack stream, as a tree
object in one pack may refer to a blob object in another pack as
".gitmodules", when we want to inspect blobs that are used as
".gitmodules" file, for example. Teach "index-pack" to emit
objects that must be inspected later and check them in the calling
"fetch-pack" process.
* jv/pack-objects-narrower-ref-iteration (2021-01-22) 1 commit
- builtin/pack-objects.c: avoid iterating all refs
The "pack-objects" command needs to iterate over all the tags when
automatic tag following is enabled, but it actually iterated over
all refs and then discarded everything outside "refs/tags/"
hierarchy, which was quite wasteful.
Will merge to 'next'.
* jv/upload-pack-filter-spec-quotefix (2021-01-25) 1 commit
- upload-pack.c: fix filter spec quoting bug
--------------------------------------------------
[Stalled]
* ss/submodule-add-in-c (2020-12-15) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Expecting a reroll.
The patches are split incorrectly; part of 1/3 belongs to 2/3
cf. <nycvar.QRO.7.76.6.2012190104140.56@tvgsbejvaqbjf.bet>
It seems to introduce a segfault on 'seen'.
cf. <xmqqft3xflw7.fsf@gitster.c.googlers.com>
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
Break out and fast-track bugfix from the remainder of the topic.
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
- docs: document symlink restrictions for .git* files
- fsck: complain when .gitattributes or .gitignore is a symlink
- verify_path(): disallow symlinks in .gitattributes and .gitignore
- t0060: test obscured .gitattributes and .gitignore matching
- t7450: test .gitmodules symlink matching against obscured names
- t7450: test verify_path() handling of gitmodules
- t7415: rename to expand scope
- fsck_tree(): wrap some long lines
- fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
has potential consequences that is more/less grave, so that these
projects can opt out of the new checks?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* jc/war-on-dashed-git (2020-12-21) 2 commits
- fixup??? git: catch an attempt to run "git-foo"
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
(this branch is used by ds/update-index.)
The resolve and octopus merge strategy backends have been rewritten
in C.
Got enough review comments to get updated.
--------------------------------------------------
[Cooking]
* ab/fsck-doc-fix (2021-01-20) 1 commit
(merged to 'next' on 2021-01-25 at e3db0fe96f)
+ fsck doc: remove ancient out-of-date diagnostics
Documentation for "git fsck" lost stale bits that has become
incorrect.
Will merge to 'master'.
* ab/tests-various-fixup (2021-01-23) 10 commits
- rm tests: actually test for SIGPIPE in SIGPIPE test
- archive tests: use a cheaper "zipinfo -h" invocation to get header
- upload-pack tests: avoid a non-zero "grep" exit status
- git-svn tests: rewrite brittle tests to use "--[no-]merges".
- git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty
- git svn mergeinfo tests: modernize redirection & quoting style
- cache-tree tests: explicitly test HEAD and index differences
- cache-tree tests: use a sub-shell with less indirection
- cache-tree tests: remove unused $2 parameter
- cache-tree tests: refactor for modern test style
Various test updates.
Will merge to 'next'.
* en/ort-directory-rename (2021-01-20) 18 commits
- merge-ort: fix a directory rename detection bug
- merge-ort: process_renames() now needs more defensiveness
- merge-ort: implement apply_directory_rename_modifications()
- merge-ort: add a new toplevel_dir field
- merge-ort: implement handle_path_level_conflicts()
- merge-ort: implement check_for_directory_rename()
- merge-ort: implement apply_dir_rename() and check_dir_renamed()
- merge-ort: implement compute_collisions()
- merge-ort: modify collect_renames() for directory rename handling
- merge-ort: implement handle_directory_level_conflicts()
- merge-ort: implement compute_rename_counts()
- merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
- merge-ort: add outline of get_provisional_directory_renames()
- merge-ort: add outline for computing directory renames
- merge-ort: collect which directories are removed in dirs_removed
- merge-ort: initialize and free new directory rename data structures
- merge-ort: add new data structures for directory rename detection
- Merge branch 'en/merge-ort-3' into en/ort-directory-rename
(this branch is used by en/merge-ort-perf.)
ORT merge strategy learns to infer "renamed directory" while
merging.
* ab/detox-gettext-tests (2021-01-21) 3 commits
- tests: remove uses of GIT_TEST_GETTEXT_POISON=false
- tests: remove support for GIT_TEST_GETTEXT_POISON
- ci: remove GETTEXT_POISON jobs
Get rid of "GETTEXT_POISON" support altogether, which may or may
not be controversial.
* bc/signed-objects-with-both-hashes (2021-01-18) 6 commits
- gpg-interface: remove other signature headers before verifying
- ref-filter: hoist signature parsing
- commit: allow parsing arbitrary buffers with headers
- gpg-interface: improve interface for parsing tags
- commit: ignore additional signatures when parsing signed commits
- ref-filter: switch some uses of unsigned long to size_t
Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
Looking good.
* ds/update-index (2021-01-09) 14 commits
- update-index: remove static globals from callbacks
- update-index: reduce static globals, part 2
- update-index: reduce static globals, part 1
- update-index: remove ce_match_stat(), all macros
- update-index: replace several compatibility macros
- update-index: use add_index_entry()
- update-index: use remove_file_from_index()
- update-index: use index_name_pos() over cache_name_pos()
- update-index: use istate->cache_changed
- update-index: use istate->cache_nr over active_nr
- update-index: use istate->cache over active_cache
- update-index: drop the_index, the_repository
- rm: remove compatilibity macros
- mv: remove index compatibility macros
(this branch uses ag/merge-strategies-in-c.)
The implementation of a few commands lost reliance of "the_index"
compatibility macros by explicitly passing the index_state through
the callchain.
Unfortunately the base topic still needs to solidify.
* js/rebase-i-commit-cleanup-fix (2021-01-12) 1 commit
- rebase -i: do leave commit message intact in fixup! chains
When "git rebase -i" processes "fixup" insn, there is no reason to
clean up the commit log message, but we did the usual stripspace
processing. This has been corrected.
A bit more tests to document what is still broken have been offered.
cf. <20210112204939.1095-1-martin.agren@gmail.com>
* tb/pack-revindex-on-disk (2021-01-14) 8 commits
- pack-revindex: ensure that on-disk reverse indexes are given precedence
- t: support GIT_TEST_WRITE_REV_INDEX
- t: prepare for GIT_TEST_WRITE_REV_INDEX
- Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'
- builtin/pack-objects.c: respect 'pack.writeReverseIndex'
- builtin/index-pack.c: write reverse indexes
- pack-write.c: prepare to write 'pack-*.rev' files
- packfile: prepare for the existence of '*.rev' files
Introduce an on-disk file to record revindex for packdata, which
traditionally was always created on the fly and only in-core.
* en/merge-ort-perf (2021-01-23) 6 commits
- merge-ort: begin performance work; instrument with trace2_region_* calls
- merge-ort: ignore the directory rename split conflict for now
- merge-ort: fix massive leak
- Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
- Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
- Merge branch 'en/diffcore-rename' into en/merge-ort-perf
(this branch uses en/ort-conflict-handling and en/ort-directory-rename.)
The "ort" merge strategy.
* ds/cache-tree-basics (2021-01-15) 10 commits
(merged to 'next' on 2021-01-25 at 29ee74df7b)
+ cache-tree: speed up consecutive path comparisons
+ cache-tree: use ce_namelen() instead of strlen()
+ index-format: discuss recursion of cache-tree better
+ index-format: update preamble to cache tree extension
+ index-format: use 'cache tree' over 'cached tree'
+ cache-tree: trace regions for prime_cache_tree
+ cache-tree: trace regions for I/O
+ cache-tree: use trace2 in cache_tree_update()
+ unpack-trees: add trace2 regions
+ tree-walk: report recursion counts
(this branch is used by ds/more-index-cleanups.)
Document, clean-up and optimize the code around the cache-tree
extension in the index.
Will merge to 'master'.
* en/ort-conflict-handling (2021-01-04) 10 commits
(merged to 'next' on 2021-01-25 at 369c1516c4)
+ merge-ort: add handling for different types of files at same path
+ merge-ort: copy find_first_merges() implementation from merge-recursive.c
+ merge-ort: implement format_commit()
+ merge-ort: copy and adapt merge_submodule() from merge-recursive.c
+ merge-ort: copy and adapt merge_3way() from merge-recursive.c
+ merge-ort: flesh out implementation of handle_content_merge()
+ merge-ort: handle book-keeping around two- and three-way content merge
+ merge-ort: implement unique_path() helper
+ merge-ort: handle directory/file conflicts that remain
+ merge-ort: handle D/F conflict where directory disappears due to merge
(this branch is used by en/merge-ort-perf.)
ORT merge strategy learns more support for merge conflicts.
Will merge to 'master'.
* sg/t7800-difftool-robustify (2021-01-09) 1 commit
- t7800-difftool: don't accidentally match tmp dirs
Test fix.
Not working on Windows.
cf. https://github.com/git/git/runs/1660588243?check_suite_focus=true#step:7:4186
* ak/corrected-commit-date (2021-01-18) 11 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: return 64-bit generation number
- commit-graph: add a slab to store topological levels
- t6600-test-reach: generalize *_three_modes
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Will merge to 'next'.
* fc/mergetool-automerge (2021-01-09) 8 commits
. fixup! mergetool: break setup_tool out into separate initialization function
. fixup! fixup! mergetool: add automerge configuration
. fixup! mergetool: add automerge configuration
. mergetool: add automerge_enabled tool-specific override function
. mergetool: break setup_tool out into separate initialization function
. mergetool: add per-tool support for the autoMerge flag
. mergetool: alphabetize the mergetool config docs
. mergetool: add automerge configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Breaks tests on Windows
cf. https://github.com/git/git/runs/1675932107?check_suite_focus=true#step:7:10373
* mr/bisect-in-c-4 (2021-01-23) 8 commits
- SQUASH???
- bisect--helper: retire `--check-and-set-terms` subcommand
- bisect--helper: reimplement `bisect_skip` shell function in C
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: use `res` instead of return in BISECT_RESET case option
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: reimplement `bisect_replay` shell function in C
- bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
What's the status of this thing?
* jt/clone-unborn-head (2020-12-22) 3 commits
. clone: respect remote unborn HEAD
. connect, transport: add no-op arg for future patch
. ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
What's the status of this thing?
* fc/bash-completion-post-2.29 (2020-12-23) 4 commits
. 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.*
Seems to break tests on Windows
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* so/log-diff-merge (2020-12-21) 32 commits
(merged to 'next' on 2021-01-25 at 63977ef287)
+ t4013: add tests for --diff-merges=first-parent
+ doc/git-show: include --diff-merges description
+ doc/rev-list-options: document --first-parent changes merges format
+ doc/diff-generate-patch: mention new --diff-merges option
+ doc/git-log: describe new --diff-merges options
+ diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
+ diff-merges: add old mnemonic counterparts to --diff-merges
+ diff-merges: let new options enable diff without -p
+ diff-merges: do not imply -p for new options
+ diff-merges: implement new values for --diff-merges
+ diff-merges: make -m/-c/--cc explicitly mutually exclusive
+ diff-merges: refactor opt settings into separate functions
+ diff-merges: get rid of now empty diff_merges_init_revs()
+ diff-merges: group diff-merge flags next to each other inside 'rev_info'
+ diff-merges: split 'ignore_merges' field
+ diff-merges: fix -m to properly override -c/--cc
+ t4013: add tests for -m failing to override -c/--cc
+ t4013: support test_expect_failure through ':failure' magic
+ diff-merges: revise revs->diff flag handling
+ diff-merges: handle imply -p on -c/--cc logic for log.c
+ diff-merges: introduce revs->first_parent_merges flag
+ diff-merges: new function diff_merges_set_dense_combined_if_unset()
+ diff-merges: new function diff_merges_suppress()
+ diff-merges: re-arrange functions to match the order they are called in
+ diff-merges: rename diff_merges_default_to_enable() to match semantics
+ diff-merges: move checks for first_parent_only out of the module
+ diff-merges: rename all functions to have common prefix
+ revision: move diff merges functions to its own diff-merges.c
+ revision: provide implementation for diff merges tweaks
+ revision: factor out initialization of diff-merge related settings
+ revision: factor out setup of diff-merge related settings
+ revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Will merge to 'master'.
* es/config-hooks (2020-12-21) 34 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
--------------------------------------------------
[Discarded]
* jc/config-pretend-gitdir (2020-12-15) 1 commit
. config: --pretend-git-dir for includeIf:gitdir
It turns out that the original "problem" that inspired the feature
was working as designed.
cf. <CAPQE4+rhWT9kgusNXOw5cnJ-oFq++4G1FMaXvQ3wppQ0GE0hSA@mail.gmail.com>
* bc/hashed-mailmap (2020-12-12) 1 commit
. mailmap: support hashed entries in mailmaps
The mailmap database learned to take hashed value as the original
side of mapping.
Retracted for now.
cf. <X/uvhc5Hpu792qA/@camp.crustytoothpaste.net>
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Jan 2021, #04; Sat, 16)
@ 2021-01-16 21:59 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-01-16 21:59 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The third batch of topics are now in 'master'. Most of these cooked
for shorter than usual in 'next' (I usually try to keep any topic in
'next' for at least a week), but many of them are mostly benign doc
and test fixes.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[New Topics]
* ab/fsck-doc-fix (2021-01-16) 1 commit
- fsck doc: remove ancient out-of-date diagnostics
Documentation for "git fsck" lost stale bits that has become
incorrect.
Will merge to 'next'.
* ab/tests-various-fixup (2021-01-16) 11 commits
- tests: add a "set -o pipefail" for a patched bash
- tests: split up bash detection library
- archive tests: use a cheaper "zipinfo -h" invocation to get header
- upload-pack tests: avoid a non-zero "grep" exit status
- rm tests: actually test for SIGPIPE in SIGPIPE test
- git-svn tests: rewrite brittle tests to use "--[no-]merges".
- git svn mergeinfo tests: refactor "test -z" to use test_must_be_empty
- git svn mergeinfo tests: modernize redirection & quoting style
- cache-tree tests: refactor overly complex function
- cache-tree tests: use a sub-shell with less indirection
- cache-tree tests: remove unused $2 parameter
Various test updates.
Looking good.
--------------------------------------------------
[Graduated to 'master']
* ab/gettext-charset-comment-fix (2021-01-11) 2 commits
(merged to 'next' on 2021-01-12 at bc7f60e246)
+ gettext.c: remove/reword a mostly-useless comment
+ Makefile: remove a warning about old GETTEXT_POISON flag
Comments update.
* ad/t4129-setfacl-target-fix (2021-01-09) 1 commit
(merged to 'next' on 2021-01-12 at e09694772a)
+ t4129: fix setfacl-related permissions failure
Test fix.
* bc/doc-status-short (2021-01-11) 1 commit
(merged to 'next' on 2021-01-13 at 6093625f0c)
+ docs: rephrase and clarify the git status --short format
Doc update.
* dl/p4-encode-after-kw-expansion (2020-12-23) 1 commit
(merged to 'next' on 2021-01-13 at 8fce17d998)
+ git-p4: fix syncing file types with pattern
Text encoding fix for "git p4".
* ds/for-each-repo-noopfix (2021-01-07) 1 commit
(merged to 'next' on 2021-01-12 at 92f83b5db1)
+ for-each-repo: do nothing on empty config
"git for-each-repo --config=<var> <cmd>" should not run <cmd> for
any repository when the configuration variable <var> is not defined
even once.
* ds/maintenance-part-4 (2021-01-05) 4 commits
(merged to 'next' on 2021-01-08 at 1f98c859ea)
+ maintenance: use Windows scheduled tasks
+ maintenance: use launchctl on macOS
+ maintenance: include 'cron' details in docs
+ maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
* jc/macos-install-dependencies-fix (2021-01-14) 1 commit
(merged to 'next' on 2021-01-14 at 5a11de010b)
+ ci/install-depends: attempt to fix "brew cask" stuff
Fix for procedure to building CI test environment for mac.
* jc/sign-off (2021-01-07) 1 commit
(merged to 'next' on 2021-01-12 at 0d9a2a9a41)
+ SubmittingPatches: tighten wording on "sign-off" procedure
Doc update.
* jk/t5516-deflake (2021-01-09) 1 commit
(merged to 'next' on 2021-01-12 at ed5317a798)
+ t5516: loosen "not our ref" error check
Test fix.
* mt/t4129-with-setgid-dir (2021-01-06) 1 commit
(merged to 'next' on 2021-01-12 at 7a54dd92d8)
+ t4129: don't fail if setgid is set in the test directory
Some tests expect that "ls -l" output has either '-' or 'x' for
group executable bit, but setgid bit can be inherited from parent
directory and make these fields 'S' or 's' instead, causing test
failures.
* pb/mergetool-tool-help-fix (2021-01-06) 1 commit
(merged to 'next' on 2021-01-12 at ba0f76b413)
+ mergetool--lib: fix '--tool-help' to correctly show available tools
Fix 2.29 regression where "git mergetool --tool-help" fails to list
all the available tools.
* tb/local-clone-race-doc (2021-01-11) 1 commit
(merged to 'next' on 2021-01-14 at b86c0426de)
+ Documentation/git-clone.txt: document race with --local
Doc update.
* ug/doc-lose-dircache (2021-01-09) 1 commit
(merged to 'next' on 2021-01-12 at 28310380a5)
+ doc: remove "directory cache" from man pages
Doc update.
* vv/send-email-with-less-secure-apps-access (2021-01-07) 1 commit
(merged to 'next' on 2021-01-12 at 53243ca7e7)
+ git-send-email.txt: mention less secure app access with Gmail
Doc update.
--------------------------------------------------
[Stalled]
* ss/submodule-add-in-c (2020-12-15) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Expecting a reroll.
The patches are split incorrectly; part of 1/3 belongs to 2/3
cf. <nycvar.QRO.7.76.6.2012190104140.56@tvgsbejvaqbjf.bet>
It seems to introduce a segfault on 'seen'.
cf. <xmqqft3xflw7.fsf@gitster.c.googlers.com>
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
Break out and fast-track bugfix from the remainder of the topic.
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
- docs: document symlink restrictions for .git* files
- fsck: complain when .gitattributes or .gitignore is a symlink
- verify_path(): disallow symlinks in .gitattributes and .gitignore
- t0060: test obscured .gitattributes and .gitignore matching
- t7450: test .gitmodules symlink matching against obscured names
- t7450: test verify_path() handling of gitmodules
- t7415: rename to expand scope
- fsck_tree(): wrap some long lines
- fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
has potential consequences that is more/less grave, so that these
projects can opt out of the new checks?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* jc/war-on-dashed-git (2020-12-21) 2 commits
- fixup??? git: catch an attempt to run "git-foo"
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
(this branch is used by ds/update-index.)
The resolve and octopus merge strategy backends have been rewritten
in C.
Got enough review comments to get updated.
--------------------------------------------------
[Cooking]
* en/ort-directory-rename (2021-01-07) 18 commits
- merge-ort: fix a directory rename detection bug
- merge-ort: process_renames() now needs more defensiveness
- merge-ort: implement apply_directory_rename_modifications()
- merge-ort: add a new toplevel_dir field
- merge-ort: implement handle_path_level_conflicts()
- merge-ort: implement check_for_directory_rename()
- merge-ort: implement apply_dir_rename() and check_dir_renamed()
- merge-ort: implement compute_collisions()
- merge-ort: modify collect_renames() for directory rename handling
- merge-ort: implement handle_directory_level_conflicts()
- merge-ort: implement compute_rename_counts()
- merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
- merge-ort: add outline of get_provisional_directory_renames()
- merge-ort: add outline for computing directory renames
- merge-ort: collect which directories are removed in dirs_removed
- merge-ort: initialize and free new directory rename data structures
- merge-ort: add new data structures for directory rename detection
- Merge branch 'en/merge-ort-3' into en/ort-directory-rename
(this branch is used by en/merge-ort-perf; uses en/merge-ort-3.)
ORT merge strategy learns to infer "renamed directory" while
merging.
* jk/forbid-lf-in-git-url (2021-01-07) 2 commits
(merged to 'next' on 2021-01-12 at 88a1d937ae)
+ fsck: reject .gitmodules git:// urls with newlines
+ git_connect_git(): forbid newlines in host and path
Newline characters in the host and path part of git:// URL are
now forbidden.
Will merge to 'master'.
* ps/fetch-atomic (2021-01-12) 5 commits
(merged to 'next' on 2021-01-13 at a8896d0873)
+ fetch: implement support for atomic reference updates
+ fetch: allow passing a transaction to `s_update_ref()`
+ fetch: refactor `s_update_ref` to use common exit path
+ fetch: use strbuf to format FETCH_HEAD updates
+ fetch: extract writing to FETCH_HEAD
"git fetch" learns to treat ref updates atomically in all-or-none
fashion, just like "git push" does, with the new "--atomic" option.
Will merge to 'master'.
* ab/detox-gettext-tests (2021-01-11) 6 commits
- tests: remove uses of GIT_TEST_GETTEXT_POISON=false
- tests: (almost) remove C_LOCALE_OUTPUT prerequisites
- tests: (almost) remove use of "test_i18ngrep !"
- tests: remove misc use of test_i18n{cmp,grep}
- tests: remove support for GIT_TEST_GETTEXT_POISON
- ci: remove GETTEXT_POISON jobs
Get rid of "GETTEXT_POISON" support altogether, which may or may
not be controversial.
* bc/signed-objects-with-both-hashes (2021-01-11) 6 commits
- SQUASH??? ulong vs size_t
- gpg-interface: remove other signature headers before verifying
- ref-filter: hoist signature parsing
- commit: allow parsing arbitrary buffers with headers
- gpg-interface: improve interface for parsing tags
- commit: ignore additional signatures when parsing signed commits
Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
* ds/update-index (2021-01-09) 14 commits
- update-index: remove static globals from callbacks
- update-index: reduce static globals, part 2
- update-index: reduce static globals, part 1
- update-index: remove ce_match_stat(), all macros
- update-index: replace several compatibility macros
- update-index: use add_index_entry()
- update-index: use remove_file_from_index()
- update-index: use index_name_pos() over cache_name_pos()
- update-index: use istate->cache_changed
- update-index: use istate->cache_nr over active_nr
- update-index: use istate->cache over active_cache
- update-index: drop the_index, the_repository
- rm: remove compatilibity macros
- mv: remove index compatibility macros
(this branch uses ag/merge-strategies-in-c.)
The implementation of a few commands lost reliance of "the_index"
compatibility macros by explicitly passing the index_state through
the callchain.
Unfortunately the base topic still needs to solidify.
* jx/bundle (2021-01-11) 3 commits
(merged to 'next' on 2021-01-14 at 749a907dd2)
+ bundle: arguments can be read from stdin
+ bundle: lost objects when removing duplicate pendings
+ test: add helper functions for git-bundle
"git bundle" learns "--stdin" option to read its refs from the
standard input. Also, it now does not lose refs whey they point
at the same object.
Will merge to 'master'.
* ab/mailmap (2021-01-12) 22 commits
(merged to 'next' on 2021-01-13 at a3ce27912f)
+ shortlog: remove unused(?) "repo-abbrev" feature
+ mailmap doc + tests: document and test for case-insensitivity
+ mailmap tests: add tests for empty "<>" syntax
+ mailmap tests: add tests for whitespace syntax
+ mailmap tests: add a test for comment syntax
+ mailmap doc + tests: add better examples & test them
+ tests: refactor a few tests to use "test_commit --append"
+ test-lib functions: add an --append option to test_commit
+ test-lib functions: add --author support to test_commit
+ test-lib functions: document arguments to test_commit
+ test-lib functions: expand "test_commit" comment template
+ mailmap: test for silent exiting on missing file/blob
+ mailmap tests: get rid of overly complex blame fuzzing
+ mailmap tests: add a test for "not a blob" error
+ mailmap tests: remove redundant entry in test
+ mailmap tests: improve --stdin tests
+ mailmap tests: modernize syntax & test idioms
+ mailmap tests: use our preferred whitespace syntax
+ mailmap doc: start by mentioning the comment syntax
+ check-mailmap doc: note config options
+ mailmap doc: quote config variables `like.this`
+ mailmap doc: create a new "gitmailmap(5)" man page
(this branch is used by ab/mailmap-fixup.)
Clean-up docs, codepaths and tests around mailmap.
Will merge to 'master'.
* jk/log-cherry-pick-duplicate-patches (2021-01-12) 1 commit
(merged to 'next' on 2021-01-13 at abcfbf8603)
+ patch-ids: handle duplicate hashmap entries
When more than one commit with the same patch ID appears on one
side, "git log --cherry-pick A...B" did not exclude them all when a
commit with the same patch ID appears on the other side. Now it
does.
Will merge to 'master'.
* tb/pack-revindex-api (2021-01-14) 21 commits
(merged to 'next' on 2021-01-15 at 1f2997979c)
+ for_each_object_in_pack(): clarify pack vs index ordering
+ pack-revindex.c: avoid direct revindex access in 'offset_to_pack_pos()'
+ pack-revindex: hide the definition of 'revindex_entry'
+ pack-revindex: remove unused 'find_revindex_position()'
+ pack-revindex: remove unused 'find_pack_revindex()'
+ builtin/gc.c: guess the size of the revindex
+ for_each_object_in_pack(): convert to new revindex API
+ unpack_entry(): convert to new revindex API
+ packed_object_info(): convert to new revindex API
+ retry_bad_packed_offset(): convert to new revindex API
+ get_delta_base_oid(): convert to new revindex API
+ rebuild_existing_bitmaps(): convert to new revindex API
+ try_partial_reuse(): convert to new revindex API
+ get_size_by_pos(): convert to new revindex API
+ show_objects_for_type(): convert to new revindex API
+ bitmap_position_packfile(): convert to new revindex API
+ check_object(): convert to new revindex API
+ write_reused_pack_verbatim(): convert to new revindex API
+ write_reused_pack_one(): convert to new revindex API
+ write_reuse_object(): convert to new revindex API
+ pack-revindex: introduce a new API
(this branch is used by tb/pack-revindex-on-disk.)
Abstract accesses to in-core revindex that allows enumerating
objects stored in a packfile in the order they appear in the pack,
in preparation for introducing an on-disk precomputed revindex.
Will merge to 'master'.
* cc/write-promisor-file (2021-01-14) 3 commits
(merged to 'next' on 2021-01-14 at 9d773d4734)
+ pack-write: die on error in write_promisor_file()
+ fetch-pack: refactor writing promisor file
+ fetch-pack: rename helper to create_promisor_file()
A bit of code refactoring.
Will merge to 'master'.
* js/rebase-i-commit-cleanup-fix (2021-01-12) 1 commit
- rebase -i: do leave commit message intact in fixup! chains
When "git rebase -i" processes "fixup" insn, there is no reason to
clean up the commit log message, but we did the usual stripspace
processing. This has been corrected.
A bit more tests to document what is still broken have been offered.
cf. <20210112204939.1095-1-martin.agren@gmail.com>
* ab/mailmap-fixup (2021-01-14) 4 commits
(merged to 'next' on 2021-01-15 at ef14e2263d)
+ t4203: make blame output massaging more robust
+ mailmap doc: use correct environment variable 'GIT_WORK_TREE'
+ t4203: stop losing return codes of git commands
+ test-lib-functions.sh: fix usage for test_commit()
(this branch uses ab/mailmap.)
Follow-up fixes and improvements to ab/mailmap topic.
Will merge to 'master'.
* tb/pack-revindex-on-disk (2021-01-14) 8 commits
- pack-revindex: ensure that on-disk reverse indexes are given precedence
- t: support GIT_TEST_WRITE_REV_INDEX
- t: prepare for GIT_TEST_WRITE_REV_INDEX
- Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'
- builtin/pack-objects.c: respect 'pack.writeReverseIndex'
- builtin/index-pack.c: write reverse indexes
- pack-write.c: prepare to write 'pack-*.rev' files
- packfile: prepare for the existence of '*.rev' files
(this branch uses tb/pack-revindex-api.)
Introduce an on-disk file to record revindex for packdata, which
traditionally was always created on the fly and only in-core.
* en/merge-ort-perf (2021-01-15) 4 commits
- merge-ort: begin performance work; instrument with trace2_region_* calls
- Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
- Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
- Merge branch 'en/diffcore-rename' into en/merge-ort-perf
(this branch uses en/diffcore-rename, en/merge-ort-3, en/ort-conflict-handling and en/ort-directory-rename.)
* ab/branch-sort (2021-01-07) 7 commits
(merged to 'next' on 2021-01-12 at 1231feea7c)
+ branch: show "HEAD detached" first under reverse sort
+ branch: sort detached HEAD based on a flag
+ ref-filter: move ref_sorting flags to a bitfield
+ ref-filter: move "cmp_fn" assignment into "else if" arm
+ ref-filter: add braces to if/else if/else chain
+ branch tests: add to --sort tests
+ branch: change "--local" to "--list" in comment
The implementation of "git branch --sort" wrt the detached HEAD
display has always been hacky, which has been cleaned up.
Will merge to 'master'.
* ab/coc-update-to-2.0 (2021-01-13) 3 commits
(merged to 'next' on 2021-01-15 at 4859c12625)
+ CoC: update to version 2.0 + local changes
+ CoC: explicitly take any whitespace breakage
+ CoC: Update word-wrapping to match upstream
Update the Code-of-conduct to version 2.0 from the upstream (we've
been using version 1.4).
Will merge to 'master'.
* dl/reflog-with-single-entry (2021-01-11) 2 commits
(merged to 'next' on 2021-01-13 at 09b33209c4)
+ refs: allow @{n} to work with n-sized reflog
+ refs: factor out set_read_ref_cutoffs()
After expiring a reflog and making a single commit, the reflog for
the branch would record a single entry that knows both @{0} and
@{1}, but we failed to answer "what commit were we on?", i.e. @{1}
Will merge to 'master'.
* ds/cache-tree-basics (2021-01-15) 10 commits
- cache-tree: speed up consecutive path comparisons
- cache-tree: use ce_namelen() instead of strlen()
- index-format: discuss recursion of cache-tree better
- index-format: update preamble to cache tree extension
- index-format: use 'cache tree' over 'cached tree'
- cache-tree: trace regions for prime_cache_tree
- cache-tree: trace regions for I/O
- cache-tree: use trace2 in cache_tree_update()
- unpack-trees: add trace2 regions
- tree-walk: report recursion counts
Document, clean-up and optimize the code around the cache-tree
extension in the index.
Will merge to 'next'.
* en/ort-conflict-handling (2021-01-04) 10 commits
- merge-ort: add handling for different types of files at same path
- merge-ort: copy find_first_merges() implementation from merge-recursive.c
- merge-ort: implement format_commit()
- merge-ort: copy and adapt merge_submodule() from merge-recursive.c
- merge-ort: copy and adapt merge_3way() from merge-recursive.c
- merge-ort: flesh out implementation of handle_content_merge()
- merge-ort: handle book-keeping around two- and three-way content merge
- merge-ort: implement unique_path() helper
- merge-ort: handle directory/file conflicts that remain
- merge-ort: handle D/F conflict where directory disappears due to merge
(this branch is used by en/merge-ort-perf.)
ORT merge strategy learns more support for merge conflicts.
Will merge to 'next'.
* ma/more-opaque-lock-file (2021-01-06) 5 commits
(merged to 'next' on 2021-01-12 at f246e38b50)
+ read-cache: try not to peek into `struct {lock_,temp}file`
+ refs/files-backend: don't peek into `struct lock_file`
+ midx: don't peek into `struct lock_file`
+ commit-graph: don't peek into `struct lock_file`
+ builtin/gc: don't peek into `struct lock_file`
Code clean-up.
Will merge to 'master'.
* sg/t7800-difftool-robustify (2021-01-09) 1 commit
- t7800-difftool: don't accidentally match tmp dirs
Test fix.
Not working on Windows.
cf. https://github.com/git/git/runs/1660588243?check_suite_focus=true#step:7:4186
* ak/corrected-commit-date (2021-01-16) 11 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: return 64-bit generation number
- commit-graph: add a slab to store topological levels
- t6600-test-reach: generalize *_three_modes
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
* fc/mergetool-automerge (2021-01-09) 8 commits
. fixup! mergetool: break setup_tool out into separate initialization function
. fixup! fixup! mergetool: add automerge configuration
. fixup! mergetool: add automerge configuration
. mergetool: add automerge_enabled tool-specific override function
. mergetool: break setup_tool out into separate initialization function
. mergetool: add per-tool support for the autoMerge flag
. mergetool: alphabetize the mergetool config docs
. mergetool: add automerge configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Breaks tests on Windows
cf. https://github.com/git/git/runs/1675932107?check_suite_focus=true#step:7:10373
* mr/bisect-in-c-4 (2020-12-21) 7 commits
- bisect--helper: retire `--check-and-set-terms` subcommand
- bisect--helper: reimplement `bisect_skip` shell function in C
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: use `res` instead of return in BISECT_RESET case option
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: reimplement `bisect_replay` shell function in C
- bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
What's the status of this thing?
* jt/clone-unborn-head (2020-12-22) 3 commits
- clone: respect remote unborn HEAD
- connect, transport: add no-op arg for future patch
- ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
What's the status of this thing?
* fc/bash-completion-post-2.29 (2020-12-23) 4 commits
. 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.*
Seems to break tests on Windows
* jc/deprecate-pack-redundant (2020-12-15) 1 commit
(merged to 'next' on 2021-01-12 at 14034c7892)
+ pack-redundant: gauge the usage before proposing its removal
Warn loudly when the "pack-redundant" command, which has been left
stale with almost unusable performance issues, gets used, as we no
longer want to recommend its use (instead just "repack -d" instead).
Will merge to 'master'.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* en/merge-ort-3 (2020-12-15) 11 commits
(merged to 'next' on 2021-01-08 at fe481b9627)
+ merge-ort: add implementation of type-changed rename handling
+ merge-ort: add implementation of normal rename handling
+ merge-ort: add implementation of rename collisions
+ merge-ort: add implementation of rename/delete conflicts
+ merge-ort: add implementation of both sides renaming differently
+ merge-ort: add implementation of both sides renaming identically
+ merge-ort: add basic outline for process_renames()
+ merge-ort: implement compare_pairs() and collect_renames()
+ merge-ort: implement detect_regular_renames()
+ merge-ort: add initial outline for basic rename detection
+ merge-ort: add basic data structures for handling renames
(this branch is used by en/merge-ort-perf and en/ort-directory-rename.)
Rename detection is added to the "ORT" merge strategy.
Will merge to 'master'.
* ps/config-env-pairs (2021-01-15) 8 commits
(merged to 'next' on 2021-01-15 at 4ed0341270)
+ config: allow specifying config entries via envvar pairs
+ environment: make `getenv_safe()` a public function
+ config: store "git -c" variables using more robust format
+ config: parse more robust format in GIT_CONFIG_PARAMETERS
+ config: extract function to parse config pairs
+ quote: make sq_dequote_step() a public function
+ config: add new way to pass config via `--config-env`
+ git: add `--super-prefix` to usage string
Introduce two new ways to feed configuration variable-value pairs
via environment variables, and tweak the way GIT_CONFIG_PARAMETERS
encodes variable/value pairs to make it more robust.
Will merge to 'master'.
* so/log-diff-merge (2020-12-21) 32 commits
- t4013: add tests for --diff-merges=first-parent
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent changes merges format
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
- diff-merges: add old mnemonic counterparts to --diff-merges
- diff-merges: let new options enable diff without -p
- diff-merges: do not imply -p for new options
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: handle imply -p on -c/--cc logic for log.c
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Will merge to 'next'.
* es/config-hooks (2020-12-21) 34 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
* ab/mktag (2021-01-06) 23 commits
(merged to 'next' on 2021-01-08 at 6f9e11ad97)
+ mktag: add a --[no-]strict option
+ mktag: mark strings for translation
+ mktag: convert to parse-options
+ mktag: allow omitting the header/body \n separator
+ mktag: allow turning off fsck.extraHeaderEntry
+ fsck: make fsck_config() re-usable
+ mktag: use fsck instead of custom verify_tag()
+ mktag: use puts(str) instead of printf("%s\n", str)
+ mktag: remove redundant braces in one-line body "if"
+ mktag: use default strbuf_read() hint
+ mktag tests: test verify_object() with replaced objects
+ mktag tests: improve verify_object() test coverage
+ mktag tests: test "hash-object" compatibility
+ mktag tests: stress test whitespace handling
+ mktag tests: run "fsck" after creating "mytag"
+ mktag tests: don't create "mytag" twice
+ mktag tests: don't redirect stderr to a file needlessly
+ mktag tests: remove needless SHA-1 hardcoding
+ mktag tests: use "test_commit" helper
+ mktag tests: don't needlessly use a subshell
+ mktag doc: update to explain why to use this
+ mktag doc: grammar fix, when exists -> when it exists
+ mktag doc: say <hash> not <sha1>
"git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
Will merge to 'master'.
* en/diffcore-rename (2021-01-04) 9 commits
(merged to 'next' on 2021-01-12 at fa769ebc35)
+ diffcore-rename: remove unnecessary duplicate entry checks
+ diffcore-rename: accelerate rename_dst setup
+ diffcore-rename: simplify and accelerate register_rename_src()
+ t4058: explore duplicate tree entry handling in a bit more detail
+ t4058: add more tests and documentation for duplicate tree entry handling
+ diffcore-rename: reduce jumpiness in progress counters
+ diffcore-rename: simplify limit check
+ diffcore-rename: avoid usage of global in too_many_rename_candidates()
+ diffcore-rename: rename num_create to num_destinations
(this branch is used by en/merge-ort-perf.)
File-level rename detection updates.
Will merge to 'master'.
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
(merged to 'next' on 2021-01-13 at 0e93f0d529)
+ tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
+ t99*: adjust the references to the default branch name "main"
+ tests(git-p4): transition to the default branch name `main`
+ t9[5-7]*: adjust the references to the default branch name "main"
+ t9[0-4]*: adjust the references to the default branch name "main"
+ t8*: adjust the references to the default branch name "main"
+ t7[5-9]*: adjust the references to the default branch name "main"
+ t7[0-4]*: adjust the references to the default branch name "main"
+ t6[4-9]*: adjust the references to the default branch name "main"
+ t64*: preemptively adjust alignment to prepare for `master` -> `main`
+ t6[0-3]*: adjust the references to the default branch name "main"
+ t5[6-9]*: adjust the references to the default branch name "main"
+ t55[4-9]*: adjust the references to the default branch name "main"
+ t55[23]*: adjust the references to the default branch name "main"
+ t551*: adjust the references to the default branch name "main"
+ t550*: adjust the references to the default branch name "main"
+ t5503: prepare aligned comment for replacing `master` with `main`
+ t5[0-4]*: adjust the references to the default branch name "main"
+ t5323: prepare centered comment for `master` -> `main`
+ t4*: adjust the references to the default branch name "main"
+ t3[5-9]*: adjust the references to the default branch name "main"
+ t34*: adjust the references to the default branch name "main"
+ t3416: preemptively adjust alignment in a comment
+ t3[0-3]*: adjust the references to the default branch name "main"
+ t2*: adjust the references to the default branch name "main"
+ t[01]*: adjust the references to the default branch name "main"
+ t0060: preemptively adjust alignment
+ tests: mark tests relying on the current default for `init.defaultBranch`
+ Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
Will merge to 'master'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-12-08) 1 commit
(merged to 'next' on 2021-01-12 at 2aca21c42e)
+ diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
Will merge to 'master'.
--------------------------------------------------
[Discarded]
* jc/config-pretend-gitdir (2020-12-15) 1 commit
. config: --pretend-git-dir for includeIf:gitdir
It turns out that the original "problem" that inspired the feature
was working as designed.
cf. <CAPQE4+rhWT9kgusNXOw5cnJ-oFq++4G1FMaXvQ3wppQ0GE0hSA@mail.gmail.com>
* bc/hashed-mailmap (2020-12-12) 1 commit
. mailmap: support hashed entries in mailmaps
The mailmap database learned to take hashed value as the original
side of mapping.
Retracted for now.
cf. <X/uvhc5Hpu792qA/@camp.crustytoothpaste.net>
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Jan 2021, #03; Fri, 15)
@ 2021-01-16 1:00 4% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-01-16 1:00 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The second batch of topics are now in 'master'. The "homebrew" fix
is still in 'next' (but I'll fast-track it down soonish), so we may
see CI failures on macOS jobs.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[New Topics]
* en/ort-directory-rename (2021-01-07) 18 commits
- merge-ort: fix a directory rename detection bug
- merge-ort: process_renames() now needs more defensiveness
- merge-ort: implement apply_directory_rename_modifications()
- merge-ort: add a new toplevel_dir field
- merge-ort: implement handle_path_level_conflicts()
- merge-ort: implement check_for_directory_rename()
- merge-ort: implement apply_dir_rename() and check_dir_renamed()
- merge-ort: implement compute_collisions()
- merge-ort: modify collect_renames() for directory rename handling
- merge-ort: implement handle_directory_level_conflicts()
- merge-ort: implement compute_rename_counts()
- merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
- merge-ort: add outline of get_provisional_directory_renames()
- merge-ort: add outline for computing directory renames
- merge-ort: collect which directories are removed in dirs_removed
- merge-ort: initialize and free new directory rename data structures
- merge-ort: add new data structures for directory rename detection
- Merge branch 'en/merge-ort-3' into en/ort-directory-rename
(this branch is used by en/merge-ort-perf; uses en/merge-ort-3.)
ORT merge strategy learns to infer "renamed directory" while
merging.
* jk/forbid-lf-in-git-url (2021-01-07) 2 commits
(merged to 'next' on 2021-01-12 at 88a1d937ae)
+ fsck: reject .gitmodules git:// urls with newlines
+ git_connect_git(): forbid newlines in host and path
Newline characters in the host and path part of git:// URL are
now forbidden.
Will merge to 'master'.
* ps/fetch-atomic (2021-01-12) 5 commits
(merged to 'next' on 2021-01-13 at a8896d0873)
+ fetch: implement support for atomic reference updates
+ fetch: allow passing a transaction to `s_update_ref()`
+ fetch: refactor `s_update_ref` to use common exit path
+ fetch: use strbuf to format FETCH_HEAD updates
+ fetch: extract writing to FETCH_HEAD
"git fetch" learns to treat ref updates atomically in all-or-none
fashion, just like "git push" does, with the new "--atomic" option.
Will merge to 'master'.
* jc/sign-off (2021-01-07) 1 commit
(merged to 'next' on 2021-01-12 at 0d9a2a9a41)
+ SubmittingPatches: tighten wording on "sign-off" procedure
Doc update.
Will merge to 'master'.
* ab/detox-gettext-tests (2021-01-11) 6 commits
- tests: remove uses of GIT_TEST_GETTEXT_POISON=false
- tests: (almost) remove C_LOCALE_OUTPUT prerequisites
- tests: (almost) remove use of "test_i18ngrep !"
- tests: remove misc use of test_i18n{cmp,grep}
- tests: remove support for GIT_TEST_GETTEXT_POISON
- ci: remove GETTEXT_POISON jobs
Get rid of "GETTEXT_POISON" support altogether, which may or may
not be controversial.
* ab/gettext-charset-comment-fix (2021-01-11) 2 commits
(merged to 'next' on 2021-01-12 at bc7f60e246)
+ gettext.c: remove/reword a mostly-useless comment
+ Makefile: remove a warning about old GETTEXT_POISON flag
Comments update.
Will merge to 'master'.
* ad/t4129-setfacl-target-fix (2021-01-09) 1 commit
(merged to 'next' on 2021-01-12 at e09694772a)
+ t4129: fix setfacl-related permissions failure
Test fix.
Will merge to 'master'.
* bc/doc-status-short (2021-01-11) 1 commit
(merged to 'next' on 2021-01-13 at 6093625f0c)
+ docs: rephrase and clarify the git status --short format
Doc update.
Will merge to 'master'.
* bc/signed-objects-with-both-hashes (2021-01-11) 6 commits
- SQUASH??? ulong vs size_t
- gpg-interface: remove other signature headers before verifying
- ref-filter: hoist signature parsing
- commit: allow parsing arbitrary buffers with headers
- gpg-interface: improve interface for parsing tags
- commit: ignore additional signatures when parsing signed commits
Signed commits and tags now allow verification of objects, whose
two object names (one in SHA-1, the other in SHA-256) are both
signed.
* ds/update-index (2021-01-09) 14 commits
- update-index: remove static globals from callbacks
- update-index: reduce static globals, part 2
- update-index: reduce static globals, part 1
- update-index: remove ce_match_stat(), all macros
- update-index: replace several compatibility macros
- update-index: use add_index_entry()
- update-index: use remove_file_from_index()
- update-index: use index_name_pos() over cache_name_pos()
- update-index: use istate->cache_changed
- update-index: use istate->cache_nr over active_nr
- update-index: use istate->cache over active_cache
- update-index: drop the_index, the_repository
- rm: remove compatilibity macros
- mv: remove index compatibility macros
(this branch uses ag/merge-strategies-in-c.)
The implementation of a few commands lost reliance of "the_index"
compatibility macros by explicitly passing the index_state through
the callchain.
Unfortunately the base topic still needs to solidify.
* jk/t5516-deflake (2021-01-09) 1 commit
(merged to 'next' on 2021-01-12 at ed5317a798)
+ t5516: loosen "not our ref" error check
Test fix.
Will merge to 'master'.
* jx/bundle (2021-01-11) 3 commits
(merged to 'next' on 2021-01-14 at 749a907dd2)
+ bundle: arguments can be read from stdin
+ bundle: lost objects when removing duplicate pendings
+ test: add helper functions for git-bundle
"git bundle" learns "--stdin" option to read its refs from the
standard input. Also, it now does not lose refs whey thy point at
the same object.
Will merge to 'master'.
* ug/doc-lose-dircache (2021-01-09) 1 commit
(merged to 'next' on 2021-01-12 at 28310380a5)
+ doc: remove "directory cache" from man pages
Doc update.
Will merge to 'master'.
* ab/mailmap (2021-01-12) 22 commits
(merged to 'next' on 2021-01-13 at a3ce27912f)
+ shortlog: remove unused(?) "repo-abbrev" feature
+ mailmap doc + tests: document and test for case-insensitivity
+ mailmap tests: add tests for empty "<>" syntax
+ mailmap tests: add tests for whitespace syntax
+ mailmap tests: add a test for comment syntax
+ mailmap doc + tests: add better examples & test them
+ tests: refactor a few tests to use "test_commit --append"
+ test-lib functions: add an --append option to test_commit
+ test-lib functions: add --author support to test_commit
+ test-lib functions: document arguments to test_commit
+ test-lib functions: expand "test_commit" comment template
+ mailmap: test for silent exiting on missing file/blob
+ mailmap tests: get rid of overly complex blame fuzzing
+ mailmap tests: add a test for "not a blob" error
+ mailmap tests: remove redundant entry in test
+ mailmap tests: improve --stdin tests
+ mailmap tests: modernize syntax & test idioms
+ mailmap tests: use our preferred whitespace syntax
+ mailmap doc: start by mentioning the comment syntax
+ check-mailmap doc: note config options
+ mailmap doc: quote config variables `like.this`
+ mailmap doc: create a new "gitmailmap(5)" man page
(this branch is used by ab/mailmap-fixup.)
Clean-up docs, codepaths and tests around mailmap.
Will merge to 'master'.
* jk/log-cherry-pick-duplicate-patches (2021-01-12) 1 commit
(merged to 'next' on 2021-01-13 at abcfbf8603)
+ patch-ids: handle duplicate hashmap entries
When more than one commit with the same patch ID appears on one
side, "git log --cherry-pick A...B" did not exclude them all when a
commit with the same patch ID appears on the other side. Now it
does.
* tb/local-clone-race-doc (2021-01-11) 1 commit
(merged to 'next' on 2021-01-14 at b86c0426de)
+ Documentation/git-clone.txt: document race with --local
Doc update.
Will merge to 'master'.
* tb/pack-revindex-api (2021-01-14) 21 commits
- for_each_object_in_pack(): clarify pack vs index ordering
- pack-revindex.c: avoid direct revindex access in 'offset_to_pack_pos()'
- pack-revindex: hide the definition of 'revindex_entry'
- pack-revindex: remove unused 'find_revindex_position()'
- pack-revindex: remove unused 'find_pack_revindex()'
- builtin/gc.c: guess the size of the revindex
- for_each_object_in_pack(): convert to new revindex API
- unpack_entry(): convert to new revindex API
- packed_object_info(): convert to new revindex API
- retry_bad_packed_offset(): convert to new revindex API
- get_delta_base_oid(): convert to new revindex API
- rebuild_existing_bitmaps(): convert to new revindex API
- try_partial_reuse(): convert to new revindex API
- get_size_by_pos(): convert to new revindex API
- show_objects_for_type(): convert to new revindex API
- bitmap_position_packfile(): convert to new revindex API
- check_object(): convert to new revindex API
- write_reused_pack_verbatim(): convert to new revindex API
- write_reused_pack_one(): convert to new revindex API
- write_reuse_object(): convert to new revindex API
- pack-revindex: introduce a new API
(this branch is used by tb/pack-revindex-on-disk.)
Abstract accesses to in-core revindex that allows enumerating
objects stored in a packfile in the order they appear in the pack,
in preparation for introducing an on-disk precomputed revindex.
Will merge to 'next'.
* cc/write-promisor-file (2021-01-14) 3 commits
(merged to 'next' on 2021-01-14 at 9d773d4734)
+ pack-write: die on error in write_promisor_file()
+ fetch-pack: refactor writing promisor file
+ fetch-pack: rename helper to create_promisor_file()
A bit of code refactoring.
Will merge to 'master'.
* js/rebase-i-commit-cleanup-fix (2021-01-12) 1 commit
- rebase -i: do leave commit message intact in fixup! chains
When "git rebase -i" processes "fixup" insn, there is no reason to
clean up the commit log message, but we did the usual stripspace
processing. This has been corrected.
A bit more tests to document what is still broken have been offered.
cf. <20210112204939.1095-1-martin.agren@gmail.com>
* ab/mailmap-fixup (2021-01-14) 4 commits
- t4203: make blame output massaging more robust
- mailmap doc: use correct environment variable 'GIT_WORK_TREE'
- t4203: stop losing return codes of git commands
- test-lib-functions.sh: fix usage for test_commit()
(this branch uses ab/mailmap.)
Follow-up fixes and improvements to ab/mailmap topic.
Will merge to 'next'.
* jc/macos-install-dependencies-fix (2021-01-14) 1 commit
(merged to 'next' on 2021-01-14 at 5a11de010b)
+ ci/install-depends: attempt to fix "brew cask" stuff
Fix for procedure to building CI test environment for mac.
Will merge to 'master'.
* tb/pack-revindex-on-disk (2021-01-14) 8 commits
- pack-revindex: ensure that on-disk reverse indexes are given precedence
- t: support GIT_TEST_WRITE_REV_INDEX
- t: prepare for GIT_TEST_WRITE_REV_INDEX
- Documentation/config/pack.txt: advertise 'pack.writeReverseIndex'
- builtin/pack-objects.c: respect 'pack.writeReverseIndex'
- builtin/index-pack.c: write reverse indexes
- pack-write.c: prepare to write 'pack-*.rev' files
- packfile: prepare for the existence of '*.rev' files
(this branch uses tb/pack-revindex-api.)
Introduce an on-disk file to record revindex for packdata, which
traditionally was always created on the fly and only in-core.
* en/merge-ort-perf (2021-01-15) 4 commits
- merge-ort: begin performance work; instrument with trace2_region_* calls
- Merge branch 'en/ort-directory-rename' into en/merge-ort-perf
- Merge branch 'en/ort-conflict-handling' into en/merge-ort-perf
- Merge branch 'en/diffcore-rename' into en/merge-ort-perf
(this branch uses en/diffcore-rename, en/merge-ort-3, en/ort-conflict-handling and en/ort-directory-rename.)
--------------------------------------------------
[Graduated to 'master']
* ab/trailers-extra-format (2020-12-09) 5 commits
(merged to 'next' on 2020-12-14 at 9fc731944e)
+ pretty format %(trailers): add a "key_value_separator"
+ pretty format %(trailers): add a "keyonly"
+ pretty-format %(trailers): fix broken standalone "valueonly"
+ pretty format %(trailers) doc: avoid repetition
+ pretty format %(trailers) test: split a long line
The "--format=%(trailers)" mechanism gets enhanced to make it
easier to design output for machine consumption.
* ar/t6016-modernise (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at 45f1b43e88)
+ t6016: move to lib-log-graph.sh framework
Test update.
* bc/rev-parse-path-format (2020-12-12) 2 commits
(merged to 'next' on 2021-01-08 at 7d51587b7f)
+ rev-parse: add option for absolute or relative path formatting
+ abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path with the `--path-format=(absolute|relative)` option.
* ds/trace2-topo-walk (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at 794c8f37ee)
+ revision: trace topo-walk statistics
The topological walk codepath is covered by new trace2 stats.
* en/merge-ort-2 (2020-12-13) 7 commits
(merged to 'next' on 2020-12-21 at ef5b184349)
+ merge-ort: add modify/delete handling and delayed output processing
+ merge-ort: add die-not-implemented stub handle_content_merge() function
+ merge-ort: add function grouping comments
+ merge-ort: add a paths_to_free field to merge_options_internal
+ merge-ort: add a path_conflict field to merge_options_internal
+ merge-ort: add a clear_internal_opts helper
+ merge-ort: add a few includes
(this branch is used by en/merge-ort-3, en/merge-ort-recursive and en/ort-conflict-handling; uses en/merge-ort-impl.)
More "ORT" merge strategy.
* en/merge-ort-impl (2020-12-13) 21 commits
(merged to 'next' on 2020-12-21 at c551d7bda9)
+ merge-ort: free data structures in merge_finalize()
+ merge-ort: add implementation of record_conflicted_index_entries()
+ tree: enable cmp_cache_name_compare() to be used elsewhere
+ merge-ort: add implementation of checkout()
+ merge-ort: basic outline for merge_switch_to_result()
+ merge-ort: step 3 of tree writing -- handling subdirectories as we go
+ merge-ort: step 2 of tree writing -- function to create tree object
+ merge-ort: step 1 of tree writing -- record basenames, modes, and oids
+ merge-ort: have process_entries operate in a defined order
+ merge-ort: add a preliminary simple process_entries() implementation
+ merge-ort: avoid recursing into identical trees
+ merge-ort: record stage and auxiliary info for every path
+ merge-ort: compute a few more useful fields for collect_merge_info
+ merge-ort: avoid repeating fill_tree_descriptor() on the same tree
+ merge-ort: implement a very basic collect_merge_info()
+ merge-ort: add an err() function similar to one from merge-recursive
+ merge-ort: use histogram diff
+ merge-ort: port merge_start() from merge-recursive
+ merge-ort: add some high-level algorithm structure
+ merge-ort: setup basic internal data structures
+ Merge branch 'en/strmap' into en/merge-ort-impl
(this branch is used by en/merge-ort-2, en/merge-ort-3, en/merge-ort-recursive and en/ort-conflict-handling.)
The merge backend "done right" starts to emerge.
* en/merge-ort-recursive (2020-12-16) 4 commits
(merged to 'next' on 2020-12-22 at 0dbf60011f)
+ merge-ort: implement merge_incore_recursive()
+ merge-ort: make clear_internal_opts() aware of partial clearing
+ merge-ort: copy a few small helper functions from merge-recursive.c
+ commit: move reverse_commit_list() from merge-recursive
(this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3 and en/ort-conflict-handling.)
The ORT merge strategy learned to synthesize virtual ancestor tree
by recursively merging multiple merge bases together, just like the
recursive backend has done for years.
* en/stash-apply-sparse-checkout (2020-12-01) 3 commits
(merged to 'next' on 2021-01-08 at cae5b73d99)
+ stash: fix stash application in sparse-checkouts
+ stash: remove unnecessary process forking
+ t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
"git stash" did not work well in a sparsely checked out working
tree.
* es/perf-export-fix (2020-12-22) 1 commit
(merged to 'next' on 2020-12-22 at d06b0379d9)
+ t/perf: avoid unnecessary test_export() recursion
Tweak unneeded recursion from a test framework helper function.
* es/worktree-repair-both-moved (2020-12-21) 1 commit
(merged to 'next' on 2020-12-22 at 9eaae4f5c0)
+ worktree: teach `repair` to fix multi-directional breakage
"git worktree repair" learned to deal with the case where both the
repository and the worktree moved.
* ew/decline-core-abbrev (2020-12-23) 1 commit
(merged to 'next' on 2021-01-08 at 630dd186a4)
+ core.abbrev=no disables abbreviations
The configuration variable 'core.abbrev' can be set to 'no' to
force no abbreviation regardless of the hash algorithm.
* fc/completion-aliases-support (2021-01-04) 4 commits
(merged to 'next' on 2021-01-08 at b2714ff1a4)
+ completion: add proper public __git_complete
+ test: completion: add tests for __git_complete
+ completion: bash: improve function detection
+ completion: bash: add __git_have_func helper
Bash completion (in contrib/) update to make it easier for
end-users to add completion for their custom "git" subcommands.
* fc/pull-merge-rebase (2020-12-15) 5 commits
(merged to 'next' on 2020-12-21 at acce13e5c4)
+ pull: display default warning only when non-ff
+ pull: correct condition to trigger non-ff advice
+ pull: get rid of unnecessary global variable
+ pull: give the advice for choosing rebase/merge much later
+ pull: refactor fast-forward check
When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.
* fc/t6030-bisect-reset-removes-auxiliary-files (2020-12-21) 1 commit
(merged to 'next' on 2020-12-22 at 2ab78ef1e1)
+ test: bisect-porcelain: fix location of files
A 3-year old test that was not testing anything useful has been
corrected.
* ma/doc-pack-format-varint-for-sizes (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at 8a448c50dd)
+ pack-format.txt: document sizes at start of delta data
Doc update.
* ma/sha1-is-a-hash (2021-01-04) 4 commits
(merged to 'next' on 2021-01-08 at a25537f7c3)
+ hash-lookup: rename from sha1-lookup
+ sha1-lookup: rename `sha1_pos()` as `hash_pos()`
+ object-file.c: rename from sha1-file.c
+ object-name.c: rename from sha1-name.c
Retire more names with "sha1" in it.
* ma/t1300-cleanup (2021-01-04) 3 commits
(merged to 'next' on 2021-01-08 at 51aaae39a1)
+ t1300: don't needlessly work with `core.foo` configs
+ t1300: remove duplicate test for `--file no-such-file`
+ t1300: remove duplicate test for `--file ../foo`
Code clean-up.
* nk/perf-fsmonitor-cleanup (2021-01-06) 1 commit
(merged to 'next' on 2021-01-08 at 1837d6c30b)
+ p7519: allow running without watchman prereq
Test fix.
* pb/doc-modules-git-work-tree-typofix (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at a67ab3e96a)
+ gitmodules.txt: fix 'GIT_WORK_TREE' variable name
Doc fix.
* pk/subsub-fetch-fix-take-2 (2020-12-09) 1 commit
(merged to 'next' on 2020-12-14 at ccc01a5f66)
+ submodules: fix of regression on fetching of non-init subsub-repo
"git fetch --recurse-submodules" fix (second attempt).
* rs/rebase-commit-validation (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at 2c63eb1cc8)
+ rebase: verify commit parameter
Diagnose command line error of "git rebase" early.
* ta/doc-typofix (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at 1e579ef94f)
+ doc: fix some typos
Doc fix.
* tb/pack-bitmap (2020-12-08) 24 commits
(merged to 'next' on 2020-12-15 at 773268c2fb)
+ pack-bitmap-write: better reuse bitmaps
+ pack-bitmap-write: relax unique revwalk condition
+ pack-bitmap-write: use existing bitmaps
+ pack-bitmap: factor out 'add_commit_to_bitmap()'
+ pack-bitmap: factor out 'bitmap_for_commit()'
+ pack-bitmap-write: ignore BITMAP_FLAG_REUSE
+ pack-bitmap-write: build fewer intermediate bitmaps
+ pack-bitmap.c: check reads more aggressively when loading
+ pack-bitmap-write: rename children to reverse_edges
+ t5310: add branch-based checks
+ commit: implement commit_list_contains()
+ bitmap: implement bitmap_is_subset()
+ pack-bitmap-write: fill bitmap with commit history
+ pack-bitmap-write: pass ownership of intermediate bitmaps
+ pack-bitmap-write: reimplement bitmap writing
+ ewah: add bitmap_dup() function
+ ewah: implement bitmap_or()
+ ewah: make bitmap growth less aggressive
+ ewah: factor out bitmap growth
+ rev-list: die when --test-bitmap detects a mismatch
+ t5310: drop size of truncated ewah bitmap
+ pack-bitmap: bounds-check size of cache extension
+ pack-bitmap: fix header size check
+ ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
Various improvements to the codepath that writes out pack bitmaps.
* zh/arg-help-format (2021-01-06) 2 commits
(merged to 'next' on 2021-01-08 at 208c98620c)
+ builtin/*: update usage format
+ parse-options: format argh like error messages
Clean up option descriptions in "git cmd --help".
--------------------------------------------------
[Stalled]
* ss/submodule-add-in-c (2020-12-15) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Expecting a reroll.
The patches are split incorrectly; part of 1/3 belongs to 2/3
cf. <nycvar.QRO.7.76.6.2012190104140.56@tvgsbejvaqbjf.bet>
It seems to introduce a segfault on 'seen'.
cf. <xmqqft3xflw7.fsf@gitster.c.googlers.com>
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
Break out and fast-track bugfix from the remainder of the topic.
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
- docs: document symlink restrictions for .git* files
- fsck: complain when .gitattributes or .gitignore is a symlink
- verify_path(): disallow symlinks in .gitattributes and .gitignore
- t0060: test obscured .gitattributes and .gitignore matching
- t7450: test .gitmodules symlink matching against obscured names
- t7450: test verify_path() handling of gitmodules
- t7415: rename to expand scope
- fsck_tree(): wrap some long lines
- fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
has potential consequences that is more/less grave, so that these
projects can opt out of the new checks?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* jc/war-on-dashed-git (2020-12-21) 2 commits
- fixup??? git: catch an attempt to run "git-foo"
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
(this branch is used by ds/update-index.)
The resolve and octopus merge strategy backends have been rewritten
in C.
Got enough review comments to get updated.
--------------------------------------------------
[Cooking]
* vv/send-email-with-less-secure-apps-access (2021-01-07) 1 commit
(merged to 'next' on 2021-01-12 at 53243ca7e7)
+ git-send-email.txt: mention less secure app access with Gmail
Doc update.
Will merge to 'master'.
* ab/branch-sort (2021-01-07) 7 commits
(merged to 'next' on 2021-01-12 at 1231feea7c)
+ branch: show "HEAD detached" first under reverse sort
+ branch: sort detached HEAD based on a flag
+ ref-filter: move ref_sorting flags to a bitfield
+ ref-filter: move "cmp_fn" assignment into "else if" arm
+ ref-filter: add braces to if/else if/else chain
+ branch tests: add to --sort tests
+ branch: change "--local" to "--list" in comment
The implementation of "git branch --sort" wrt the detached HEAD
display has always been hacky, which has been cleaned up.
Will merge to 'master'.
* ab/coc-update-to-2.0 (2021-01-13) 3 commits
- CoC: update to version 2.0 + local changes
- CoC: explicitly take any whitespace breakage
- CoC: Update word-wrapping to match upstream
Update the Code-of-conduct to version 2.0 from the upstream (we've
been using version 1.4).
Will merge to 'next'.
* dl/reflog-with-single-entry (2021-01-11) 2 commits
(merged to 'next' on 2021-01-13 at 09b33209c4)
+ refs: allow @{n} to work with n-sized reflog
+ refs: factor out set_read_ref_cutoffs()
After expiring a reflog and making a single commit, the reflog for
the branch would record a single entry that knows both @{0} and
@{1}, but we failed to answer "what commit were we on?", i.e. @{1}
Will merge to 'master'.
* ds/cache-tree-basics (2021-01-07) 10 commits
- cache-tree: speed up consecutive path comparisons
- cache-tree: use ce_namelen() instead of strlen()
- index-format: discuss recursion of cached-tree better
- index-format: update preamble to cache tree extension
- index-format: use 'cache tree' over 'cached tree'
- cache-tree: trace regions for prime_cache_tree
- cache-tree: trace regions for I/O
- cache-tree: use trace2 in cache_tree_update()
- unpack-trees: add trace2 regions
- tree-walk: report recursion counts
Document, clean-up and optimize the code around the cache-tree
extension in the index.
* ds/for-each-repo-noopfix (2021-01-07) 1 commit
(merged to 'next' on 2021-01-12 at 92f83b5db1)
+ for-each-repo: do nothing on empty config
"git for-each-repo --config=<var> <cmd>" should not run <cmd> for
any repository when the configuration variable <var> is not defined
even once.
Will merge to 'master'.
* en/ort-conflict-handling (2021-01-04) 10 commits
- merge-ort: add handling for different types of files at same path
- merge-ort: copy find_first_merges() implementation from merge-recursive.c
- merge-ort: implement format_commit()
- merge-ort: copy and adapt merge_submodule() from merge-recursive.c
- merge-ort: copy and adapt merge_3way() from merge-recursive.c
- merge-ort: flesh out implementation of handle_content_merge()
- merge-ort: handle book-keeping around two- and three-way content merge
- merge-ort: implement unique_path() helper
- merge-ort: handle directory/file conflicts that remain
- merge-ort: handle D/F conflict where directory disappears due to merge
(this branch is used by en/merge-ort-perf.)
ORT merge strategy learns more support for merge conflicts.
* ma/more-opaque-lock-file (2021-01-06) 5 commits
(merged to 'next' on 2021-01-12 at f246e38b50)
+ read-cache: try not to peek into `struct {lock_,temp}file`
+ refs/files-backend: don't peek into `struct lock_file`
+ midx: don't peek into `struct lock_file`
+ commit-graph: don't peek into `struct lock_file`
+ builtin/gc: don't peek into `struct lock_file`
Code clean-up.
Will merge to 'master'.
* mt/t4129-with-setgid-dir (2021-01-06) 1 commit
(merged to 'next' on 2021-01-12 at 7a54dd92d8)
+ t4129: don't fail if setgid is set in the test directory
Some tests expect that "ls -l" output has either '-' or 'x' for
group executable bit, but setgid bit can be inherited from parent
directory and make these fields 'S' or 's' instead, causing test
failures.
Will merge to 'master'.
* pb/mergetool-tool-help-fix (2021-01-06) 1 commit
(merged to 'next' on 2021-01-12 at ba0f76b413)
+ mergetool--lib: fix '--tool-help' to correctly show available tools
Fix 2.29 regression where "git mergetool --tool-help" fails to list
all the available tools.
Will merge to 'master'.
* sg/t7800-difftool-robustify (2021-01-09) 1 commit
- t7800-difftool: don't accidentally match tmp dirs
Test fix.
Not working on Windows.
cf. https://github.com/git/git/runs/1660588243?check_suite_focus=true#step:7:4186
* ak/corrected-commit-date (2021-01-04) 11 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: return 64-bit generation number
- commit-graph: add a slab to store topological levels
- t6600-test-reach: generalize *_three_modes
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there, but not needs more help to find and resolve segv.
cf. <1adabda6-b80b-d543-f6c0-570dadbe589b@gmail.com>
* dl/p4-encode-after-kw-expansion (2020-12-23) 1 commit
(merged to 'next' on 2021-01-13 at 8fce17d998)
+ git-p4: fix syncing file types with pattern
Text encoding fix for "git p4".
Will merge to 'master'.
* fc/mergetool-automerge (2021-01-09) 8 commits
. fixup! mergetool: break setup_tool out into separate initialization function
. fixup! fixup! mergetool: add automerge configuration
. fixup! mergetool: add automerge configuration
. mergetool: add automerge_enabled tool-specific override function
. mergetool: break setup_tool out into separate initialization function
. mergetool: add per-tool support for the autoMerge flag
. mergetool: alphabetize the mergetool config docs
. mergetool: add automerge configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Breaks tests on Windows
cf. https://github.com/git/git/runs/1675932107?check_suite_focus=true#step:7:10373
* mr/bisect-in-c-4 (2020-12-21) 7 commits
- bisect--helper: retire `--check-and-set-terms` subcommand
- bisect--helper: reimplement `bisect_skip` shell function in C
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: use `res` instead of return in BISECT_RESET case option
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: reimplement `bisect_replay` shell function in C
- bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
What's the status of this thing?
* jt/clone-unborn-head (2020-12-22) 3 commits
- clone: respect remote unborn HEAD
- connect, transport: add no-op arg for future patch
- ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
What's the status of this thing?
* fc/bash-completion-post-2.29 (2020-12-23) 4 commits
. 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.*
Seems to break tests on Windows
* jc/deprecate-pack-redundant (2020-12-15) 1 commit
(merged to 'next' on 2021-01-12 at 14034c7892)
+ pack-redundant: gauge the usage before proposing its removal
Warn loudly when the "pack-redundant" command, which has been left
stale with almost unusable performance issues, gets used, as we no
longer want to recommend its use (instead just "repack -d" instead).
Will merge to 'master'.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* en/merge-ort-3 (2020-12-15) 11 commits
(merged to 'next' on 2021-01-08 at fe481b9627)
+ merge-ort: add implementation of type-changed rename handling
+ merge-ort: add implementation of normal rename handling
+ merge-ort: add implementation of rename collisions
+ merge-ort: add implementation of rename/delete conflicts
+ merge-ort: add implementation of both sides renaming differently
+ merge-ort: add implementation of both sides renaming identically
+ merge-ort: add basic outline for process_renames()
+ merge-ort: implement compare_pairs() and collect_renames()
+ merge-ort: implement detect_regular_renames()
+ merge-ort: add initial outline for basic rename detection
+ merge-ort: add basic data structures for handling renames
(this branch is used by en/merge-ort-perf and en/ort-directory-rename.)
Rename detection is added to the "ORT" merge strategy.
Will merge to 'master'.
* ps/config-env-pairs (2021-01-15) 8 commits
(merged to 'next' on 2021-01-15 at 4ed0341270)
+ config: allow specifying config entries via envvar pairs
+ environment: make `getenv_safe()` a public function
+ config: store "git -c" variables using more robust format
+ config: parse more robust format in GIT_CONFIG_PARAMETERS
+ config: extract function to parse config pairs
+ quote: make sq_dequote_step() a public function
+ config: add new way to pass config via `--config-env`
+ git: add `--super-prefix` to usage string
Introduce two new ways to feed configuration variable-value pairs
via environment variables, and tweak the way GIT_CONFIG_PARAMETERS
encodes variable/value pairs to make it more robust.
Will merge to 'master'.
* so/log-diff-merge (2020-12-21) 32 commits
- t4013: add tests for --diff-merges=first-parent
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent changes merges format
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
- diff-merges: add old mnemonic counterparts to --diff-merges
- diff-merges: let new options enable diff without -p
- diff-merges: do not imply -p for new options
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: handle imply -p on -c/--cc logic for log.c
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Ready for 'next'?
* es/config-hooks (2020-12-21) 34 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
* ab/mktag (2021-01-06) 23 commits
(merged to 'next' on 2021-01-08 at 6f9e11ad97)
+ mktag: add a --[no-]strict option
+ mktag: mark strings for translation
+ mktag: convert to parse-options
+ mktag: allow omitting the header/body \n separator
+ mktag: allow turning off fsck.extraHeaderEntry
+ fsck: make fsck_config() re-usable
+ mktag: use fsck instead of custom verify_tag()
+ mktag: use puts(str) instead of printf("%s\n", str)
+ mktag: remove redundant braces in one-line body "if"
+ mktag: use default strbuf_read() hint
+ mktag tests: test verify_object() with replaced objects
+ mktag tests: improve verify_object() test coverage
+ mktag tests: test "hash-object" compatibility
+ mktag tests: stress test whitespace handling
+ mktag tests: run "fsck" after creating "mytag"
+ mktag tests: don't create "mytag" twice
+ mktag tests: don't redirect stderr to a file needlessly
+ mktag tests: remove needless SHA-1 hardcoding
+ mktag tests: use "test_commit" helper
+ mktag tests: don't needlessly use a subshell
+ mktag doc: update to explain why to use this
+ mktag doc: grammar fix, when exists -> when it exists
+ mktag doc: say <hash> not <sha1>
"git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
Will merge to 'master'.
* en/diffcore-rename (2021-01-04) 9 commits
(merged to 'next' on 2021-01-12 at fa769ebc35)
+ diffcore-rename: remove unnecessary duplicate entry checks
+ diffcore-rename: accelerate rename_dst setup
+ diffcore-rename: simplify and accelerate register_rename_src()
+ t4058: explore duplicate tree entry handling in a bit more detail
+ t4058: add more tests and documentation for duplicate tree entry handling
+ diffcore-rename: reduce jumpiness in progress counters
+ diffcore-rename: simplify limit check
+ diffcore-rename: avoid usage of global in too_many_rename_candidates()
+ diffcore-rename: rename num_create to num_destinations
(this branch is used by en/merge-ort-perf.)
File-level rename detection updates.
Will merge to 'master'.
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
(merged to 'next' on 2021-01-13 at 0e93f0d529)
+ tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
+ t99*: adjust the references to the default branch name "main"
+ tests(git-p4): transition to the default branch name `main`
+ t9[5-7]*: adjust the references to the default branch name "main"
+ t9[0-4]*: adjust the references to the default branch name "main"
+ t8*: adjust the references to the default branch name "main"
+ t7[5-9]*: adjust the references to the default branch name "main"
+ t7[0-4]*: adjust the references to the default branch name "main"
+ t6[4-9]*: adjust the references to the default branch name "main"
+ t64*: preemptively adjust alignment to prepare for `master` -> `main`
+ t6[0-3]*: adjust the references to the default branch name "main"
+ t5[6-9]*: adjust the references to the default branch name "main"
+ t55[4-9]*: adjust the references to the default branch name "main"
+ t55[23]*: adjust the references to the default branch name "main"
+ t551*: adjust the references to the default branch name "main"
+ t550*: adjust the references to the default branch name "main"
+ t5503: prepare aligned comment for replacing `master` with `main`
+ t5[0-4]*: adjust the references to the default branch name "main"
+ t5323: prepare centered comment for `master` -> `main`
+ t4*: adjust the references to the default branch name "main"
+ t3[5-9]*: adjust the references to the default branch name "main"
+ t34*: adjust the references to the default branch name "main"
+ t3416: preemptively adjust alignment in a comment
+ t3[0-3]*: adjust the references to the default branch name "main"
+ t2*: adjust the references to the default branch name "main"
+ t[01]*: adjust the references to the default branch name "main"
+ t0060: preemptively adjust alignment
+ tests: mark tests relying on the current default for `init.defaultBranch`
+ Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
Will merge to 'master'.
* ds/maintenance-part-4 (2021-01-05) 4 commits
(merged to 'next' on 2021-01-08 at 1f98c859ea)
+ maintenance: use Windows scheduled tasks
+ maintenance: use launchctl on macOS
+ maintenance: include 'cron' details in docs
+ maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
Will merge to 'master'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-12-08) 1 commit
(merged to 'next' on 2021-01-12 at 2aca21c42e)
+ diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
Will merge to 'master'.
--------------------------------------------------
[Discarded]
* jc/config-pretend-gitdir (2020-12-15) 1 commit
. config: --pretend-git-dir for includeIf:gitdir
It turns out that the original "problem" that inspired the feature
was working as designed.
cf. <CAPQE4+rhWT9kgusNXOw5cnJ-oFq++4G1FMaXvQ3wppQ0GE0hSA@mail.gmail.com>
* bc/hashed-mailmap (2020-12-12) 1 commit
. mailmap: support hashed entries in mailmaps
The mailmap database learned to take hashed value as the original
side of mapping.
Retracted for now.
cf. <X/uvhc5Hpu792qA/@camp.crustytoothpaste.net>
^ permalink raw reply [relevance 4%]
* What's cooking in git.git (Jan 2021, #02; Fri, 8)
@ 2021-01-08 19:22 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-01-08 19:22 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Many topics that have been cooking in the 'next' branch during the
pre-release freeze at the year end have now been merged to the
'master' branch, and the tip of the 'next' branch has been rewound.
The ".gitignore or .gitattributes cannot be a symlink" topic has
been ejected out of 'next' for now. We do want to resurrect it
possibly with some opt-in loosening of the rule.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[New Topics]
* en/ort-directory-rename (2021-01-07) 18 commits
- merge-ort: fix a directory rename detection bug
- merge-ort: process_renames() now needs more defensiveness
- merge-ort: implement apply_directory_rename_modifications()
- merge-ort: add a new toplevel_dir field
- merge-ort: implement handle_path_level_conflicts()
- merge-ort: implement check_for_directory_rename()
- merge-ort: implement apply_dir_rename() and check_dir_renamed()
- merge-ort: implement compute_collisions()
- merge-ort: modify collect_renames() for directory rename handling
- merge-ort: implement handle_directory_level_conflicts()
- merge-ort: implement compute_rename_counts()
- merge-ort: copy get_renamed_dir_portion() from merge-recursive.c
- merge-ort: add outline of get_provisional_directory_renames()
- merge-ort: add outline for computing directory renames
- merge-ort: collect which directories are removed in dirs_removed
- merge-ort: initialize and free new directory rename data structures
- merge-ort: add new data structures for directory rename detection
- Merge branch 'en/merge-ort-3' into en/ort-directory-rename
(this branch uses en/merge-ort-3.)
ORT merge strategy learns to infer "renamed directory" while
merging.
* jk/forbid-lf-in-git-url (2021-01-07) 2 commits
- fsck: reject .gitmodules git:// urls with newlines
- git_connect_git(): forbid newlines in host and path
Newline characters in the host and path part of git:// URL are
now forbidden.
Will merge to 'next'.
* ps/fetch-atomic (2021-01-07) 2 commits
- fetch: implement support for atomic reference updates
- fetch: allow passing a transaction to `s_update_ref()`
"git fetch" learns to treat ref updates atomically in all-or-none
fashion, just like "git push" does, with the new "--atomic" option.
* jc/sign-off (2021-01-07) 1 commit
- SubmittingPatches: tighten wording on "sign-off" procedure
Doc update.
Will merge to 'next'.
--------------------------------------------------
[Graduated to 'master']
* ab/trailers-extra-format (2020-12-09) 5 commits
(merged to 'next' on 2020-12-14 at 9fc731944e)
+ pretty format %(trailers): add a "key_value_separator"
+ pretty format %(trailers): add a "keyonly"
+ pretty-format %(trailers): fix broken standalone "valueonly"
+ pretty format %(trailers) doc: avoid repetition
+ pretty format %(trailers) test: split a long line
The "--format=%(trailers)" mechanism gets enhanced to make it
easier to design output for machine consumption.
* en/merge-ort-2 (2020-12-13) 7 commits
(merged to 'next' on 2020-12-21 at ef5b184349)
+ merge-ort: add modify/delete handling and delayed output processing
+ merge-ort: add die-not-implemented stub handle_content_merge() function
+ merge-ort: add function grouping comments
+ merge-ort: add a paths_to_free field to merge_options_internal
+ merge-ort: add a path_conflict field to merge_options_internal
+ merge-ort: add a clear_internal_opts helper
+ merge-ort: add a few includes
(this branch is used by en/merge-ort-3, en/merge-ort-recursive and en/ort-conflict-handling; uses en/merge-ort-impl.)
More "ORT" merge strategy.
* en/merge-ort-impl (2020-12-13) 21 commits
(merged to 'next' on 2020-12-21 at c551d7bda9)
+ merge-ort: free data structures in merge_finalize()
+ merge-ort: add implementation of record_conflicted_index_entries()
+ tree: enable cmp_cache_name_compare() to be used elsewhere
+ merge-ort: add implementation of checkout()
+ merge-ort: basic outline for merge_switch_to_result()
+ merge-ort: step 3 of tree writing -- handling subdirectories as we go
+ merge-ort: step 2 of tree writing -- function to create tree object
+ merge-ort: step 1 of tree writing -- record basenames, modes, and oids
+ merge-ort: have process_entries operate in a defined order
+ merge-ort: add a preliminary simple process_entries() implementation
+ merge-ort: avoid recursing into identical trees
+ merge-ort: record stage and auxiliary info for every path
+ merge-ort: compute a few more useful fields for collect_merge_info
+ merge-ort: avoid repeating fill_tree_descriptor() on the same tree
+ merge-ort: implement a very basic collect_merge_info()
+ merge-ort: add an err() function similar to one from merge-recursive
+ merge-ort: use histogram diff
+ merge-ort: port merge_start() from merge-recursive
+ merge-ort: add some high-level algorithm structure
+ merge-ort: setup basic internal data structures
+ Merge branch 'en/strmap' into en/merge-ort-impl
(this branch is used by en/merge-ort-2, en/merge-ort-3, en/merge-ort-recursive and en/ort-conflict-handling.)
The merge backend "done right" starts to emerge.
* en/merge-ort-recursive (2020-12-16) 4 commits
(merged to 'next' on 2020-12-22 at 0dbf60011f)
+ merge-ort: implement merge_incore_recursive()
+ merge-ort: make clear_internal_opts() aware of partial clearing
+ merge-ort: copy a few small helper functions from merge-recursive.c
+ commit: move reverse_commit_list() from merge-recursive
(this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3 and en/ort-conflict-handling.)
The ORT merge strategy learned to synthesize virtual ancestor tree
by recursively merging multiple merge bases together, just like the
recursive backend has done for years.
* es/perf-export-fix (2020-12-22) 1 commit
(merged to 'next' on 2020-12-22 at d06b0379d9)
+ t/perf: avoid unnecessary test_export() recursion
Tweak unneeded recursion from a test framework helper function.
* es/worktree-repair-both-moved (2020-12-21) 1 commit
(merged to 'next' on 2020-12-22 at 9eaae4f5c0)
+ worktree: teach `repair` to fix multi-directional breakage
"git worktree repair" learned to deal with the case where both the
repository and the worktree moved.
* fc/pull-merge-rebase (2020-12-15) 5 commits
(merged to 'next' on 2020-12-21 at acce13e5c4)
+ pull: display default warning only when non-ff
+ pull: correct condition to trigger non-ff advice
+ pull: get rid of unnecessary global variable
+ pull: give the advice for choosing rebase/merge much later
+ pull: refactor fast-forward check
When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.
* fc/t6030-bisect-reset-removes-auxiliary-files (2020-12-21) 1 commit
(merged to 'next' on 2020-12-22 at 2ab78ef1e1)
+ test: bisect-porcelain: fix location of files
A 3-year old test that was not testing anything useful has been
corrected.
* pk/subsub-fetch-fix-take-2 (2020-12-09) 1 commit
(merged to 'next' on 2020-12-14 at ccc01a5f66)
+ submodules: fix of regression on fetching of non-init subsub-repo
"git fetch --recurse-submodules" fix (second attempt).
* tb/pack-bitmap (2020-12-08) 24 commits
(merged to 'next' on 2020-12-15 at 773268c2fb)
+ pack-bitmap-write: better reuse bitmaps
+ pack-bitmap-write: relax unique revwalk condition
+ pack-bitmap-write: use existing bitmaps
+ pack-bitmap: factor out 'add_commit_to_bitmap()'
+ pack-bitmap: factor out 'bitmap_for_commit()'
+ pack-bitmap-write: ignore BITMAP_FLAG_REUSE
+ pack-bitmap-write: build fewer intermediate bitmaps
+ pack-bitmap.c: check reads more aggressively when loading
+ pack-bitmap-write: rename children to reverse_edges
+ t5310: add branch-based checks
+ commit: implement commit_list_contains()
+ bitmap: implement bitmap_is_subset()
+ pack-bitmap-write: fill bitmap with commit history
+ pack-bitmap-write: pass ownership of intermediate bitmaps
+ pack-bitmap-write: reimplement bitmap writing
+ ewah: add bitmap_dup() function
+ ewah: implement bitmap_or()
+ ewah: make bitmap growth less aggressive
+ ewah: factor out bitmap growth
+ rev-list: die when --test-bitmap detects a mismatch
+ t5310: drop size of truncated ewah bitmap
+ pack-bitmap: bounds-check size of cache extension
+ pack-bitmap: fix header size check
+ ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
Various improvements to the codepath that writes out pack bitmaps.
--------------------------------------------------
[Stalled]
* ss/submodule-add-in-c (2020-12-15) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Expecting a reroll.
The patches are split incorrectly; part of 1/3 belongs to 2/3
cf. <nycvar.QRO.7.76.6.2012190104140.56@tvgsbejvaqbjf.bet>
It seems to introduce a segfault on 'seen'.
cf. <xmqqft3xflw7.fsf@gitster.c.googlers.com>
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
Break out and fast-track bugfix from the remainder of the topic.
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
cf. <CABPp-BFkACtF6LHkFJNt9dTOmwfQbf8ZO=BTrPYwPSmbqc9+hg@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
- docs: document symlink restrictions for .git* files
- fsck: complain when .gitattributes or .gitignore is a symlink
- verify_path(): disallow symlinks in .gitattributes and .gitignore
- t0060: test obscured .gitattributes and .gitignore matching
- t7450: test .gitmodules symlink matching against obscured names
- t7450: test verify_path() handling of gitmodules
- t7415: rename to expand scope
- fsck_tree(): wrap some long lines
- fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
has potential consequences that is more/less grave, so that these
projects can opt out of the new checks?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* jc/war-on-dashed-git (2020-12-21) 2 commits
- fixup??? git: catch an attempt to run "git-foo"
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Got enough review comments to get updated.
--------------------------------------------------
[Cooking]
* vv/send-email-with-less-secure-apps-access (2021-01-07) 1 commit
- git-send-email.txt: mention less secure app access with Gmail
Doc update.
Will merge to 'next'.
* ab/branch-sort (2021-01-07) 7 commits
- branch: show "HEAD detached" first under reverse sort
- branch: sort detached HEAD based on a flag
- ref-filter: move ref_sorting flags to a bitfield
- ref-filter: move "cmp_fn" assignment into "else if" arm
- ref-filter: add braces to if/else if/else chain
- branch tests: add to --sort tests
- branch: change "--local" to "--list" in comment
The implementation of "git branch --sort" wrt the detached HEAD
display has always been hacky, which has been cleaned up.
Will merge to 'next'.
* ab/coc-update-to-2.0 (2021-01-07) 3 commits
- CoC: update to version 2.0 + local changes
- CoC: explicitly take any whitespace breakage
- CoC: Update word-wrapping to match upstream
Update the Code-of-conduct to version 2.0 from the upstream (we've
been using version 1.4).
The first step needs to be signed off by the author, and like the
original discussion thread back in Sep 2019, it also needs to
collect acks from list regulars to show support.
* ar/t6016-modernise (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at 45f1b43e88)
+ t6016: move to lib-log-graph.sh framework
Test update.
Will merge to 'master'.
* dl/reflog-with-single-entry (2021-01-07) 2 commits
- refs: allow @{n} to work with n-sized reflog
- refs: factor out set_read_ref_cutoffs()
After expiring a reflog and making a single commit, the reflog for
the branch would record a single entry that knows both @{0} and
@{1}, but we failed to answer "what commit were we on?", i.e. @{1}
* ds/cache-tree-basics (2021-01-07) 10 commits
- cache-tree: speed up consecutive path comparisons
- cache-tree: use ce_namelen() instead of strlen()
- index-format: discuss recursion of cached-tree better
- index-format: update preamble to cache tree extension
- index-format: use 'cache tree' over 'cached tree'
- cache-tree: trace regions for prime_cache_tree
- cache-tree: trace regions for I/O
- cache-tree: use trace2 in cache_tree_update()
- unpack-trees: add trace2 regions
- tree-walk: report recursion counts
Document, clean-up and optimize the code around the cache-tree
extension in the index.
* ds/for-each-repo-noopfix (2021-01-07) 1 commit
- for-each-repo: do nothing on empty config
"git for-each-repo --config=<var> <cmd>" should not run <cmd> for
any repository when the configuration variable <var> is not defined
even once.
Will merge to 'next'.
* ds/trace2-topo-walk (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at 794c8f37ee)
+ revision: trace topo-walk statistics
The topological walk codepath is covered by new trace2 stats.
Will merge to 'master'.
* en/ort-conflict-handling (2021-01-04) 10 commits
- merge-ort: add handling for different types of files at same path
- merge-ort: copy find_first_merges() implementation from merge-recursive.c
- merge-ort: implement format_commit()
- merge-ort: copy and adapt merge_submodule() from merge-recursive.c
- merge-ort: copy and adapt merge_3way() from merge-recursive.c
- merge-ort: flesh out implementation of handle_content_merge()
- merge-ort: handle book-keeping around two- and three-way content merge
- merge-ort: implement unique_path() helper
- merge-ort: handle directory/file conflicts that remain
- merge-ort: handle D/F conflict where directory disappears due to merge
ORT merge strategy learns more support for merge conflicts.
* fc/completion-aliases-support (2021-01-04) 4 commits
(merged to 'next' on 2021-01-08 at b2714ff1a4)
+ completion: add proper public __git_complete
+ test: completion: add tests for __git_complete
+ completion: bash: improve function detection
+ completion: bash: add __git_have_func helper
Bash completion (in contrib/) update to make it easier for
end-users to add completion for their custom "git" subcommands.
Will merge to 'master'.
* ma/doc-pack-format-varint-for-sizes (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at 8a448c50dd)
+ pack-format.txt: document sizes at start of delta data
Doc update.
Will merge to 'master'.
* ma/more-opaque-lock-file (2021-01-06) 5 commits
- read-cache: try not to peek into `struct {lock_,temp}file`
- refs/files-backend: don't peek into `struct lock_file`
- midx: don't peek into `struct lock_file`
- commit-graph: don't peek into `struct lock_file`
- builtin/gc: don't peek into `struct lock_file`
Code clean-up.
Will merge to 'next'.
* ma/sha1-is-a-hash (2021-01-04) 4 commits
(merged to 'next' on 2021-01-08 at a25537f7c3)
+ hash-lookup: rename from sha1-lookup
+ sha1-lookup: rename `sha1_pos()` as `hash_pos()`
+ object-file.c: rename from sha1-file.c
+ object-name.c: rename from sha1-name.c
Retire more names with "sha1" in it.
Will merge to 'master'.
* ma/t1300-cleanup (2021-01-04) 3 commits
(merged to 'next' on 2021-01-08 at 51aaae39a1)
+ t1300: don't needlessly work with `core.foo` configs
+ t1300: remove duplicate test for `--file no-such-file`
+ t1300: remove duplicate test for `--file ../foo`
Code clean-up.
Will merge to 'master'.
* mt/t4129-with-setgid-dir (2021-01-06) 1 commit
- t4129: don't fail if setgid is set in the test directory
Some tests expect that "ls -l" output has either '-' or 'x' for
group executable bit, but setgid bit can be inherited from parent
directory and make these fields 'S' or 's' instead, causing test
failures.
Will merge to 'next'.
* nk/perf-fsmonitor-cleanup (2021-01-06) 1 commit
(merged to 'next' on 2021-01-08 at 1837d6c30b)
+ p7519: allow running without watchman prereq
Test fix.
Will merge to 'master'.
* pb/doc-modules-git-work-tree-typofix (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at a67ab3e96a)
+ gitmodules.txt: fix 'GIT_WORK_TREE' variable name
Doc fix.
Will merge to 'master'.
* pb/mergetool-tool-help-fix (2021-01-06) 1 commit
- mergetool--lib: fix '--tool-help' to correctly show available tools
Fix 2.29 regression where "git mergetool --tool-help" fails to list
all the available tools.
Will merge to 'next'.
* rs/rebase-commit-validation (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at 2c63eb1cc8)
+ rebase: verify commit parameter
Diagnose command line error early.
Will merge to 'master'.
* sg/t7800-difftool-robustify (2021-01-04) 1 commit
. t7800-difftool: don't accidentally match tmp dirs
Test fix.
Not working on Windows.
cf. https://github.com/git/git/runs/1660588243?check_suite_focus=true#step:7:4186
* ta/doc-typofix (2021-01-04) 1 commit
(merged to 'next' on 2021-01-08 at 1e579ef94f)
+ doc: fix some typos
Doc fix.
Will merge to 'master'.
* zh/arg-help-format (2021-01-06) 2 commits
(merged to 'next' on 2021-01-08 at 208c98620c)
+ builtin/*: update usage format
+ parse-options: format argh like error messages
Clean up option descriptions in "git cmd --help".
Will merge to 'master'.
* ak/corrected-commit-date (2021-01-04) 11 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: return 64-bit generation number
- commit-graph: add a slab to store topological levels
- t6600-test-reach: generalize *_three_modes
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there, but not needs more help to find and resolve segv.
cf. <1adabda6-b80b-d543-f6c0-570dadbe589b@gmail.com>
* dl/p4-encode-after-kw-expansion (2020-12-23) 1 commit
- git-p4: fix syncing file types with pattern
Text encoding fix for "git p4".
* fc/mergetool-automerge (2021-01-06) 5 commits
. mergetool: add automerge_enabled tool-specific override function
. mergetool: break setup_tool out into separate initialization function
. mergetool: add per-tool support for the autoMerge flag
. mergetool: alphabetize the mergetool config docs
. mergetool: add automerge configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Breaks tests on macOS.
cf. https://github.com/git/git/runs/1659807735?check_suite_focus=true#step:4:1641
* ew/decline-core-abbrev (2020-12-23) 1 commit
(merged to 'next' on 2021-01-08 at 630dd186a4)
+ core.abbrev=no disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Will merge to 'master'.
* mr/bisect-in-c-4 (2020-12-21) 7 commits
- bisect--helper: retire `--check-and-set-terms` subcommand
- bisect--helper: reimplement `bisect_skip` shell function in C
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: use `res` instead of return in BISECT_RESET case option
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: reimplement `bisect_replay` shell function in C
- bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
What's the status of this thing?
* jt/clone-unborn-head (2020-12-22) 3 commits
- clone: respect remote unborn HEAD
- connect, transport: add no-op arg for future patch
- ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
What's the status of this thing?
* fc/bash-completion-post-2.29 (2020-12-23) 4 commits
- 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.*
Seems to break tests on Windows
* jc/deprecate-pack-redundant (2020-12-15) 1 commit
- pack-redundant: gauge the usage before proposing its removal
Warn loudly when the "pack-redundant" command, which has been left
stale with almost unusable performance issues, gets used, as we no
longer want to recommend its use (instead just "repack -d" instead).
Will merge to 'next'.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* en/merge-ort-3 (2020-12-15) 11 commits
(merged to 'next' on 2021-01-08 at fe481b9627)
+ merge-ort: add implementation of type-changed rename handling
+ merge-ort: add implementation of normal rename handling
+ merge-ort: add implementation of rename collisions
+ merge-ort: add implementation of rename/delete conflicts
+ merge-ort: add implementation of both sides renaming differently
+ merge-ort: add implementation of both sides renaming identically
+ merge-ort: add basic outline for process_renames()
+ merge-ort: implement compare_pairs() and collect_renames()
+ merge-ort: implement detect_regular_renames()
+ merge-ort: add initial outline for basic rename detection
+ merge-ort: add basic data structures for handling renames
(this branch is used by en/ort-directory-rename.)
Rename detection is added to the "ORT" merge strategy.
Will merge to 'master'.
* ps/config-env-pairs (2021-01-06) 8 commits
- config: allow specifying config entries via envvar pairs
- environment: make `getenv_safe()` a public function
- config: parse more robust format in GIT_CONFIG_PARAMETERS
- config: store "git -c" variables using more robust format
- config: extract function to parse config pairs
- quote: make sq_dequote_step() a public function
- config: add new way to pass config via `--config-env`
- git: add `--super-prefix` to usage string
Introduce two new ways to feed configuration variable-value pairs
via environment variables, and tweak the way GIT_CONFIG_PARAMETERS
encodes variable/value pairs to make it more robust.
Ready for 'next'?
* bc/hashed-mailmap (2020-12-12) 1 commit
- mailmap: support hashed entries in mailmaps
The mailmap database learned to take hashed value as the original
side of mapping.
Expecting a reroll.
* so/log-diff-merge (2020-12-21) 32 commits
- t4013: add tests for --diff-merges=first-parent
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent changes merges format
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
- diff-merges: add old mnemonic counterparts to --diff-merges
- diff-merges: let new options enable diff without -p
- diff-merges: do not imply -p for new options
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: handle imply -p on -c/--cc logic for log.c
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Rerolled.
* bc/rev-parse-path-format (2020-12-12) 2 commits
(merged to 'next' on 2021-01-08 at 7d51587b7f)
+ rev-parse: add option for absolute or relative path formatting
+ abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
Will merge to 'master'.
* es/config-hooks (2020-12-21) 34 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
* ab/mktag (2021-01-06) 23 commits
(merged to 'next' on 2021-01-08 at 6f9e11ad97)
+ mktag: add a --[no-]strict option
+ mktag: mark strings for translation
+ mktag: convert to parse-options
+ mktag: allow omitting the header/body \n separator
+ mktag: allow turning off fsck.extraHeaderEntry
+ fsck: make fsck_config() re-usable
+ mktag: use fsck instead of custom verify_tag()
+ mktag: use puts(str) instead of printf("%s\n", str)
+ mktag: remove redundant braces in one-line body "if"
+ mktag: use default strbuf_read() hint
+ mktag tests: test verify_object() with replaced objects
+ mktag tests: improve verify_object() test coverage
+ mktag tests: test "hash-object" compatibility
+ mktag tests: stress test whitespace handling
+ mktag tests: run "fsck" after creating "mytag"
+ mktag tests: don't create "mytag" twice
+ mktag tests: don't redirect stderr to a file needlessly
+ mktag tests: remove needless SHA-1 hardcoding
+ mktag tests: use "test_commit" helper
+ mktag tests: don't needlessly use a subshell
+ mktag doc: update to explain why to use this
+ mktag doc: grammar fix, when exists -> when it exists
+ mktag doc: say <hash> not <sha1>
"git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
Will merge to 'master'.
* en/diffcore-rename (2021-01-04) 9 commits
- diffcore-rename: remove unnecessary duplicate entry checks
- diffcore-rename: accelerate rename_dst setup
- diffcore-rename: simplify and accelerate register_rename_src()
- t4058: explore duplicate tree entry handling in a bit more detail
- t4058: add more tests and documentation for duplicate tree entry handling
- diffcore-rename: reduce jumpiness in progress counters
- diffcore-rename: simplify limit check
- diffcore-rename: avoid usage of global in too_many_rename_candidates()
- diffcore-rename: rename num_create to num_destinations
File-level rename detection updates.
Will merge to 'next'.
* en/stash-apply-sparse-checkout (2020-12-01) 3 commits
(merged to 'next' on 2021-01-08 at cae5b73d99)
+ stash: fix stash application in sparse-checkouts
+ stash: remove unnecessary process forking
+ t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
"git stash" did not work well in a sparsely checked out working
tree.
Will merge to 'master'.
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
- tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
- t99*: adjust the references to the default branch name "main"
- tests(git-p4): transition to the default branch name `main`
- t9[5-7]*: adjust the references to the default branch name "main"
- t9[0-4]*: adjust the references to the default branch name "main"
- t8*: adjust the references to the default branch name "main"
- t7[5-9]*: adjust the references to the default branch name "main"
- t7[0-4]*: adjust the references to the default branch name "main"
- t6[4-9]*: adjust the references to the default branch name "main"
- t64*: preemptively adjust alignment to prepare for `master` -> `main`
- t6[0-3]*: adjust the references to the default branch name "main"
- t5[6-9]*: adjust the references to the default branch name "main"
- t55[4-9]*: adjust the references to the default branch name "main"
- t55[23]*: adjust the references to the default branch name "main"
- t551*: adjust the references to the default branch name "main"
- t550*: adjust the references to the default branch name "main"
- t5503: prepare aligned comment for replacing `master` with `main`
- t5[0-4]*: adjust the references to the default branch name "main"
- t5323: prepare centered comment for `master` -> `main`
- t4*: adjust the references to the default branch name "main"
- t3[5-9]*: adjust the references to the default branch name "main"
- t34*: adjust the references to the default branch name "main"
- t3416: preemptively adjust alignment in a comment
- t3[0-3]*: adjust the references to the default branch name "main"
- t2*: adjust the references to the default branch name "main"
- t[01]*: adjust the references to the default branch name "main"
- t0060: preemptively adjust alignment
- tests: mark tests relying on the current default for `init.defaultBranch`
- Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
Will merge to 'next'.
* ds/maintenance-part-4 (2021-01-05) 4 commits
(merged to 'next' on 2021-01-08 at 1f98c859ea)
+ maintenance: use Windows scheduled tasks
+ maintenance: use launchctl on macOS
+ maintenance: include 'cron' details in docs
+ maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
Will merge to 'master'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-12-08) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
Will merge to 'next'.
--------------------------------------------------
[Discarded]
* jc/config-pretend-gitdir (2020-12-15) 1 commit
. config: --pretend-git-dir for includeIf:gitdir
It turns out that the original "problem" that inspired the feature
was working as designed.
cf. <CAPQE4+rhWT9kgusNXOw5cnJ-oFq++4G1FMaXvQ3wppQ0GE0hSA@mail.gmail.com>
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Jan 2021, #01; Wed, 6)
@ 2021-01-07 13:38 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2021-01-07 13:38 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
https://github.com/git/git/runs/1660876025 shows that with a few
topics excluded the tip of 'seen' passes the CI. Yay.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[New Topics]
* ab/branch-sort (2021-01-06) 5 commits
- branch: show "HEAD detached" first under reverse sort
- branch: use the "detached_head_first" sorting option
- ref-filter: add a "detached_head_first" sorting option
- branch tests: add to --sort tests
- branch: change "--local" to "--list" in comment
The implementation of "git branch --sort" wrt the detached HEAD
display has always been hacky, which has been cleaned up.
Will merge to 'next'.
* ab/coc-update-to-2.0 (2021-01-04) 3 commits
- CoC: update to version 2.0 + local changes
- CoC: explicitly take any whitespace breakage
- CoC: Update word-wrapping to match upstream
Update the Code-of-conduct to version 2.0 from the upstream (we've
been using version 1.4).
The first step needs to be signed off by the author, and like the
original discussion thread back in Sep 2019, it also needs to
collect acks from list regulars to show support.
* ar/t6016-modernise (2021-01-04) 1 commit
- t6016: move to lib-log-graph.sh framework
Test update.
Will merge to 'next'.
* dl/reflog-with-single-entry (2021-01-06) 2 commits
- refs: allow @{n} to work with n-sized reflog
- refs: factor out set_read_ref_cutoffs()
After expiring a reflog and making a single commit, the reflog for
the branch would record a single entry that knows both @{0} and
@{1}, but we failed to answer "what commit we was on?", i.e. @{1}
* ds/cache-tree-basics (2021-01-04) 9 commits
- cache-tree: speed up consecutive path comparisons
- cache-tree: use ce_namelen() instead of strlen()
- index-format: discuss recursion of cached-tree better
- index-format: update preamble to cached tree extension
- cache-tree: trace regions for prime_cache_tree
- cache-tree: trace regions for I/O
- cache-tree: use trace2 in cache_tree_update()
- unpack-trees: add trace2 regions
- tree-walk: report recursion counts
Document, clean-up and optimize the code around the cache-tree
extension in the index.
* ds/for-each-repo-noopfix (2021-01-06) 1 commit
- for-each-repo: do nothing on empty config
"git for-each-repo --config=<var> <cmd>" should not run <cmd> for
any repository when the configuration variable <var> is not defined
even once.
* ds/trace2-topo-walk (2021-01-04) 1 commit
- revision: trace topo-walk statistics
The topological walk codepath is covered by new trace2 stats.
Will merge to 'next'.
* en/ort-conflict-handling (2021-01-04) 10 commits
- merge-ort: add handling for different types of files at same path
- merge-ort: copy find_first_merges() implementation from merge-recursive.c
- merge-ort: implement format_commit()
- merge-ort: copy and adapt merge_submodule() from merge-recursive.c
- merge-ort: copy and adapt merge_3way() from merge-recursive.c
- merge-ort: flesh out implementation of handle_content_merge()
- merge-ort: handle book-keeping around two- and three-way content merge
- merge-ort: implement unique_path() helper
- merge-ort: handle directory/file conflicts that remain
- merge-ort: handle D/F conflict where directory disappears due to merge
(this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3 and en/merge-ort-recursive.)
* fc/completion-aliases-support (2021-01-04) 4 commits
- completion: add proper public __git_complete
- test: completion: add tests for __git_complete
- completion: bash: improve function detection
- completion: bash: add __git_have_func helper
* ma/doc-pack-format-varint-for-sizes (2021-01-04) 1 commit
- pack-format.txt: document sizes at start of delta data
Doc update.
Will merge to 'next'.
* ma/more-opaque-lock-file (2021-01-06) 5 commits
- read-cache: try not to peek into `struct {lock_,temp}file`
- refs/files-backend: don't peek into `struct lock_file`
- midx: don't peek into `struct lock_file`
- commit-graph: don't peek into `struct lock_file`
- builtin/gc: don't peek into `struct lock_file`
Code clean-up.
Will merge to 'next'.
* ma/sha1-is-a-hash (2021-01-04) 4 commits
- hash-lookup: rename from sha1-lookup
- sha1-lookup: rename `sha1_pos()` as `hash_pos()`
- object-file.c: rename from sha1-file.c
- object-name.c: rename from sha1-name.c
Retire more names with "sha1" in it.
Will merge to 'next'.
* ma/t1300-cleanup (2021-01-04) 3 commits
- t1300: don't needlessly work with `core.foo` configs
- t1300: remove duplicate test for `--file no-such-file`
- t1300: remove duplicate test for `--file ../foo`
Code clean-up.
Will merge to 'next'.
* mt/t4129-with-setgid-dir (2021-01-06) 1 commit
- t4129: don't fail if setgid is set in the test directory
Some tests expect that "ls -l" output has either '-' or 'x' for
group executable bit, but setgid bit can be inherited from parent
directory and make these fields 'S' or 's' instead, causing test
failures.
Will merge to 'next'.
* nk/perf-fsmonitor-cleanup (2021-01-06) 1 commit
- p7519: allow running without watchman prereq
Test fix.
Will merge to 'next'.
* pb/doc-modules-git-work-tree-typofix (2021-01-04) 1 commit
- gitmodules.txt: fix 'GIT_WORK_TREE' variable name
Doc fix.
Will merge to 'next'.
* pb/mergetool-tool-help-fix (2021-01-06) 1 commit
- mergetool--lib: fix '--tool-help' to correctly show available tools
Fix 2.29 regression where "git mergetool --tool-help" fails to list
all the available tools.
Will merge to 'next'.
* rs/rebase-commit-validation (2021-01-04) 1 commit
- rebase: verify commit parameter
Diagnose command line error early.
Will merge to 'next'.
* sg/t7800-difftool-robustify (2021-01-04) 1 commit
. t7800-difftool: don't accidentally match tmp dirs
Test fix.
Not working on Windows.
cf. https://github.com/git/git/runs/1660588243?check_suite_focus=true#step:7:4186
* ta/doc-typofix (2021-01-04) 1 commit
- doc: fix some typos
Doc fix.
Will merge to 'next'.
* zh/arg-help-format (2021-01-06) 2 commits
- builtin/*: update usage format
- parse-options: format argh like error messages
Clean up option descriptions in "git cmd --help".
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* ss/submodule-add-in-c (2020-12-15) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Expecting a reroll.
The patches are split incorrectly; part of 1/3 belongs to 2/3
cf. <nycvar.QRO.7.76.6.2012190104140.56@tvgsbejvaqbjf.bet>
It seems to introduce a segfault on 'seen'.
cf. <xmqqft3xflw7.fsf@gitster.c.googlers.com>
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
probably is with potential consequences that is more/less grave?
Will eject out of 'next' when rewinding the branch.
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-12-21) 2 commits
- fixup??? git: catch an attempt to run "git-foo"
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Needs review.
--------------------------------------------------
[Cooking]
* ak/corrected-commit-date (2021-01-04) 11 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: return 64-bit generation number
- commit-graph: add a slab to store topological levels
- t6600-test-reach: generalize *_three_modes
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there.
* es/perf-export-fix (2020-12-22) 1 commit
(merged to 'next' on 2020-12-22 at d06b0379d9)
+ t/perf: avoid unnecessary test_export() recursion
Tweak unneeded recursion from a test framework helper function.
Will merge to 'master'.
* dl/p4-encode-after-kw-expansion (2020-12-23) 1 commit
- git-p4: fix syncing file types with pattern
Text encoding fix for "git p4".
* fc/mergetool-automerge (2021-01-06) 5 commits
. mergetool: add automerge_enabled tool-specific override function
. mergetool: break setup_tool out into separate initialization function
. mergetool: add per-tool support for the autoMerge flag
. mergetool: alphabetize the mergetool config docs
. mergetool: add automerge configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
Breaks tests on macOS.
cf. https://github.com/git/git/runs/1659807735?check_suite_focus=true#step:4:1641
* ew/decline-core-abbrev (2020-12-23) 1 commit
- core.abbrev=no disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Will merge to 'next'.
* es/worktree-repair-both-moved (2020-12-21) 1 commit
(merged to 'next' on 2020-12-22 at 9eaae4f5c0)
+ worktree: teach `repair` to fix multi-directional breakage
"git worktree repair" learned to deal with the case where both the
repository and the worktree moved.
Will merge to 'master'.
* fc/t6030-bisect-reset-removes-auxiliary-files (2020-12-21) 1 commit
(merged to 'next' on 2020-12-22 at 2ab78ef1e1)
+ test: bisect-porcelain: fix location of files
A 3-year old test that was not testing anything useful has been
corrected.
Will merge to 'master'.
* mr/bisect-in-c-4 (2020-12-21) 7 commits
- bisect--helper: retire `--check-and-set-terms` subcommand
- bisect--helper: reimplement `bisect_skip` shell function in C
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: use `res` instead of return in BISECT_RESET case option
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: reimplement `bisect_replay` shell function in C
- bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
* jt/clone-unborn-head (2020-12-22) 3 commits
- clone: respect remote unborn HEAD
- connect, transport: add no-op arg for future patch
- ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
* fc/bash-completion-post-2.29 (2020-12-23) 4 commits
- 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.*
Seems to break tests on Windows
* jc/config-pretend-gitdir (2020-12-15) 1 commit
- config: --pretend-git-dir for includeIf:gitdir
WIP
* jc/deprecate-pack-redundant (2020-12-15) 1 commit
- pack-redundant: gauge the usage before proposing its removal
Warn loudly when the "pack-redundant" command, which has been left
stale with almost unusable performance issues, gets used, as we no
longer want to recommend its use (instead just "repack -d" instead).
* en/merge-ort-recursive (2020-12-16) 4 commits
(merged to 'next' on 2020-12-22 at 0dbf60011f)
+ merge-ort: implement merge_incore_recursive()
+ merge-ort: make clear_internal_opts() aware of partial clearing
+ merge-ort: copy a few small helper functions from merge-recursive.c
+ commit: move reverse_commit_list() from merge-recursive
(this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3 and en/ort-conflict-handling.)
The ORT merge strategy learned to synthesize virtual ancestor tree
by recursively merging multiple merge bases together, just like the
recursive backend has done for years.
Will merge to 'master'.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* en/merge-ort-3 (2020-12-15) 11 commits
- merge-ort: add implementation of type-changed rename handling
- merge-ort: add implementation of normal rename handling
- merge-ort: add implementation of rename collisions
- merge-ort: add implementation of rename/delete conflicts
- merge-ort: add implementation of both sides renaming differently
- merge-ort: add implementation of both sides renaming identically
- merge-ort: add basic outline for process_renames()
- merge-ort: implement compare_pairs() and collect_renames()
- merge-ort: implement detect_regular_renames()
- merge-ort: add initial outline for basic rename detection
- merge-ort: add basic data structures for handling renames
(this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-recursive and en/ort-conflict-handling.)
Rename detection is added to the "ORT" merge strategy.
* ps/config-env-pairs (2021-01-06) 8 commits
- config: allow specifying config entries via envvar pairs
- environment: make `getenv_safe()` a public function
- config: parse more robust format in GIT_CONFIG_PARAMETERS
- config: store "git -c" variables using more robust format
- config: extract function to parse config pairs
- quote: make sq_dequote_step() a public function
- config: add new way to pass config via `--config-env`
- git: add `--super-prefix` to usage string
Introduce two new ways to feed configuration variable-value pairs
via environment variables, and tweak the way GIT_CONFIG_PARAMETERS
encodes variable/value pairs to make it more robust.
Ready for 'next'?
* bc/hashed-mailmap (2020-12-12) 1 commit
- mailmap: support hashed entries in mailmaps
The mailmap database learned to take hashed value as the original
side of mapping.
Expecting a reroll.
* so/log-diff-merge (2020-12-21) 32 commits
- t4013: add tests for --diff-merges=first-parent
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent changes merges format
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
- diff-merges: add old mnemonic counterparts to --diff-merges
- diff-merges: let new options enable diff without -p
- diff-merges: do not imply -p for new options
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: handle imply -p on -c/--cc logic for log.c
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Rerolled.
* bc/rev-parse-path-format (2020-12-12) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
Will merge to 'next'.
* en/merge-ort-impl (2020-12-13) 21 commits
(merged to 'next' on 2020-12-21 at c551d7bda9)
+ merge-ort: free data structures in merge_finalize()
+ merge-ort: add implementation of record_conflicted_index_entries()
+ tree: enable cmp_cache_name_compare() to be used elsewhere
+ merge-ort: add implementation of checkout()
+ merge-ort: basic outline for merge_switch_to_result()
+ merge-ort: step 3 of tree writing -- handling subdirectories as we go
+ merge-ort: step 2 of tree writing -- function to create tree object
+ merge-ort: step 1 of tree writing -- record basenames, modes, and oids
+ merge-ort: have process_entries operate in a defined order
+ merge-ort: add a preliminary simple process_entries() implementation
+ merge-ort: avoid recursing into identical trees
+ merge-ort: record stage and auxiliary info for every path
+ merge-ort: compute a few more useful fields for collect_merge_info
+ merge-ort: avoid repeating fill_tree_descriptor() on the same tree
+ merge-ort: implement a very basic collect_merge_info()
+ merge-ort: add an err() function similar to one from merge-recursive
+ merge-ort: use histogram diff
+ merge-ort: port merge_start() from merge-recursive
+ merge-ort: add some high-level algorithm structure
+ merge-ort: setup basic internal data structures
+ Merge branch 'en/strmap' into en/merge-ort-impl
(this branch is used by en/merge-ort-2, en/merge-ort-3, en/merge-ort-recursive and en/ort-conflict-handling.)
The merge backend "done right" starts to emerge.
Will merge to 'master'.
* es/config-hooks (2020-12-21) 34 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
* ab/mktag (2021-01-06) 23 commits
- mktag: add a --[no-]strict option
- mktag: mark strings for translation
- mktag: convert to parse-options
- mktag: allow omitting the header/body \n separator
- mktag: allow turning off fsck.extraHeaderEntry
- fsck: make fsck_config() re-usable
- mktag: use fsck instead of custom verify_tag()
- mktag: use puts(str) instead of printf("%s\n", str)
- mktag: remove redundant braces in one-line body "if"
- mktag: use default strbuf_read() hint
- mktag tests: test verify_object() with replaced objects
- mktag tests: improve verify_object() test coverage
- mktag tests: test "hash-object" compatibility
- mktag tests: stress test whitespace handling
- mktag tests: run "fsck" after creating "mytag"
- mktag tests: don't create "mytag" twice
- mktag tests: don't redirect stderr to a file needlessly
- mktag tests: remove needless SHA-1 hardcoding
- mktag tests: use "test_commit" helper
- mktag tests: don't needlessly use a subshell
- mktag doc: update to explain why to use this
- mktag doc: grammar fix, when exists -> when it exists
- mktag doc: say <hash> not <sha1>
"git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
Will merge to 'next'.
* ab/trailers-extra-format (2020-12-09) 5 commits
(merged to 'next' on 2020-12-14 at 9fc731944e)
+ pretty format %(trailers): add a "key_value_separator"
+ pretty format %(trailers): add a "keyonly"
+ pretty-format %(trailers): fix broken standalone "valueonly"
+ pretty format %(trailers) doc: avoid repetition
+ pretty format %(trailers) test: split a long line
The "--format=%(trailers)" mechanism gets enhanced to make it
easier to design output for machine consumption.
Will merge to 'master'.
* en/diffcore-rename (2021-01-04) 9 commits
- diffcore-rename: remove unnecessary duplicate entry checks
- diffcore-rename: accelerate rename_dst setup
- diffcore-rename: simplify and accelerate register_rename_src()
- t4058: explore duplicate tree entry handling in a bit more detail
- t4058: add more tests and documentation for duplicate tree entry handling
- diffcore-rename: reduce jumpiness in progress counters
- diffcore-rename: simplify limit check
- diffcore-rename: avoid usage of global in too_many_rename_candidates()
- diffcore-rename: rename num_create to num_destinations
File-level rename detection updates.
* en/merge-ort-2 (2020-12-13) 7 commits
(merged to 'next' on 2020-12-21 at ef5b184349)
+ merge-ort: add modify/delete handling and delayed output processing
+ merge-ort: add die-not-implemented stub handle_content_merge() function
+ merge-ort: add function grouping comments
+ merge-ort: add a paths_to_free field to merge_options_internal
+ merge-ort: add a path_conflict field to merge_options_internal
+ merge-ort: add a clear_internal_opts helper
+ merge-ort: add a few includes
(this branch is used by en/merge-ort-3, en/merge-ort-recursive and en/ort-conflict-handling; uses en/merge-ort-impl.)
More "ORT" merge strategy.
Will merge to 'master'.
* fc/pull-merge-rebase (2020-12-15) 5 commits
(merged to 'next' on 2020-12-21 at acce13e5c4)
+ pull: display default warning only when non-ff
+ pull: correct condition to trigger non-ff advice
+ pull: get rid of unnecessary global variable
+ pull: give the advice for choosing rebase/merge much later
+ pull: refactor fast-forward check
When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.
Will merge to 'master'.
* pk/subsub-fetch-fix-take-2 (2020-12-09) 1 commit
(merged to 'next' on 2020-12-14 at ccc01a5f66)
+ submodules: fix of regression on fetching of non-init subsub-repo
"git fetch --recurse-submodules" fix (second attempt).
Will merge to 'master'.
* en/stash-apply-sparse-checkout (2020-12-01) 3 commits
- stash: fix stash application in sparse-checkouts
- stash: remove unnecessary process forking
- t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
"git stash" did not work well in a sparsely checked out working
tree.
Will merge to 'next'.
* tb/pack-bitmap (2020-12-08) 24 commits
(merged to 'next' on 2020-12-15 at 773268c2fb)
+ pack-bitmap-write: better reuse bitmaps
+ pack-bitmap-write: relax unique revwalk condition
+ pack-bitmap-write: use existing bitmaps
+ pack-bitmap: factor out 'add_commit_to_bitmap()'
+ pack-bitmap: factor out 'bitmap_for_commit()'
+ pack-bitmap-write: ignore BITMAP_FLAG_REUSE
+ pack-bitmap-write: build fewer intermediate bitmaps
+ pack-bitmap.c: check reads more aggressively when loading
+ pack-bitmap-write: rename children to reverse_edges
+ t5310: add branch-based checks
+ commit: implement commit_list_contains()
+ bitmap: implement bitmap_is_subset()
+ pack-bitmap-write: fill bitmap with commit history
+ pack-bitmap-write: pass ownership of intermediate bitmaps
+ pack-bitmap-write: reimplement bitmap writing
+ ewah: add bitmap_dup() function
+ ewah: implement bitmap_or()
+ ewah: make bitmap growth less aggressive
+ ewah: factor out bitmap growth
+ rev-list: die when --test-bitmap detects a mismatch
+ t5310: drop size of truncated ewah bitmap
+ pack-bitmap: bounds-check size of cache extension
+ pack-bitmap: fix header size check
+ ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
Various improvements to the codepath that writes out pack bitmaps.
Will merge to 'master'.
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
- tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
- t99*: adjust the references to the default branch name "main"
- tests(git-p4): transition to the default branch name `main`
- t9[5-7]*: adjust the references to the default branch name "main"
- t9[0-4]*: adjust the references to the default branch name "main"
- t8*: adjust the references to the default branch name "main"
- t7[5-9]*: adjust the references to the default branch name "main"
- t7[0-4]*: adjust the references to the default branch name "main"
- t6[4-9]*: adjust the references to the default branch name "main"
- t64*: preemptively adjust alignment to prepare for `master` -> `main`
- t6[0-3]*: adjust the references to the default branch name "main"
- t5[6-9]*: adjust the references to the default branch name "main"
- t55[4-9]*: adjust the references to the default branch name "main"
- t55[23]*: adjust the references to the default branch name "main"
- t551*: adjust the references to the default branch name "main"
- t550*: adjust the references to the default branch name "main"
- t5503: prepare aligned comment for replacing `master` with `main`
- t5[0-4]*: adjust the references to the default branch name "main"
- t5323: prepare centered comment for `master` -> `main`
- t4*: adjust the references to the default branch name "main"
- t3[5-9]*: adjust the references to the default branch name "main"
- t34*: adjust the references to the default branch name "main"
- t3416: preemptively adjust alignment in a comment
- t3[0-3]*: adjust the references to the default branch name "main"
- t2*: adjust the references to the default branch name "main"
- t[01]*: adjust the references to the default branch name "main"
- t0060: preemptively adjust alignment
- tests: mark tests relying on the current default for `init.defaultBranch`
- Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
Will merge to 'next'.
* ds/maintenance-part-4 (2021-01-05) 4 commits
- maintenance: use Windows scheduled tasks
- maintenance: use launchctl on macOS
- maintenance: include 'cron' details in docs
- maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
Will merge to 'next'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-12-08) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
^ permalink raw reply [relevance 5%]
* Re: [PATCH] git-mv: fix git mv bug with case insensitive fs
2020-12-29 2:06 14% ` [PATCH] git-mv: fix git mv bug with case insensitive fs Dan Moseley
@ 2020-12-31 7:13 0% ` Torsten Bögershausen
0 siblings, 0 replies; 200+ results
From: Torsten Bögershausen @ 2020-12-31 7:13 UTC (permalink / raw)
To: Dan Moseley; +Cc: git@vger.kernel.org
On Tue, Dec 29, 2020 at 02:06:37AM +0000, Dan Moseley wrote:
First of all, thanks for submitting this to git.git.
I take the freedom to add some comments here.
> Fix git mv to not assert when src is already in the index under a
> different casing, core.caseInsensitive=true, and the file system
> is case insensitive.
The config variable is named core.ignorecase
Does it make sense to illustrate the use case here, like this:
git init
echo foo >foo
git add foo
git mv foo FOO
git mv foo bar
>
> Since 9b906af657 the check that git mv does to ensure the src is in the
> cache respects caseInsensitive. As a result git mv allows a move from a
> file that has a different case in the index than it does on disk.
> After the rename on disk, git mv fails to find the file in the cache
> in order to rename it in the index, and asserts.
> Assertion failed: pos >= 0, file builtin/mv.c, line 295
>
> This is the simplest possible fix, suggested by @tboegi. It does leave
> the file renamed on disk, but that is easy to reverse after the error.
We can expand the short-ish "@tboegi" into a "Helped-by" line, please see below.
And refrase the paragraf like this:
This is the simplest possible fix, it avoids to leaving a .git/index.lock
behind. It does leave the file renamed on disk,
but that is easy to reverse after the error.
>
> Another option would be to change the aforementioned check to always
> be case sensitive, but I am not sure whether there is a scenario where
> it is useful to be insensitive.
The intention of 9b906af657
Author: Chris Torek <chris.torek@gmail.com>
Date: Mon Jul 20 06:17:52 2020 +0000
git-mv: improve error message for conflicted file
was to give the user better and more helpful error messages.
Some background:
A case-insensitive file system does the same for
lstat("foo") or lstat("FOO"), but Git records only one case,
which is "FOO" after the `git mv foo FOO`
In that sense, replacing
cache_file_exists(src, length, ignore_case)
with
cache_file_exists(src, length, 0)
would be the correct solution (and an even simpler patch).
Doing so would give the error message
"not under version control"
when doing `git mv foo bar` after `git mv foo FOO`
I think, that this is technically correct, the user has just asked
to track "FOO", and "foo" is not in the repo any more.
A (may be) more helpful message could be achieved by something like this
(white space dmaged) diff. Any thoughts, if this is really helpful ?
diff --git a/builtin/mv.c b/builtin/mv.c
index 7dac714af9..8572a5dae0 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -221,8 +221,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
}
argc += last - first;
}
- } else if (!(ce = cache_file_exists(src, length, ignore_case))) {
- bad = _("not under version control");
+ } else if (!(ce = cache_file_exists(src, length, 0))) {
+ if (cache_file_exists(src, length, ignore_case))
+ bad = _("not under version control (upper/lower mixup)");
+ else
+ bad = _("not under version control");
} else if (ce_stage(ce)) {
bad = _("conflicted");
} else if (lstat(dst, &st) == 0 &&
>
> Signed-off-by: Dan Moseley <danmose@microsoft.com>
If you want, add a
Helped-by Torsten Bögershausen <tboegi@web.de>
> ---
> Originally reported in https://github.com/git-for-windows/git/issues/2920
> but this is not specific to Windows.
>
> builtin/mv.c | 6 ++++--
> t/t7001-mv.sh | 8 ++++++++
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/mv.c b/builtin/mv.c index 7dac714af9..e1fd8a5e00 100644
> --- a/builtin/mv.c
> +++ b/builtin/mv.c
> @@ -292,8 +292,10 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
> continue;
>
> pos = cache_name_pos(src, strlen(src));
> - assert(pos >= 0);
> - rename_cache_entry_at(pos, dst);
> + if (pos >= 0)
> + rename_cache_entry_at(pos, dst);
> + else if (!ignore_errors)
> + die(_("bad source: source=%s, destination=%s"),
> + src, dst);
> }
>
> if (gitmodules_modified)
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 63d5f41a12..5c7fee9bd8 100755
> --- a/t/t7001-mv.sh
> +++ b/t/t7001-mv.sh
> @@ -152,6 +152,14 @@ test_expect_success \
> 'move into "."' \
> 'git mv path1/path2/ .'
>
> +test_expect_success \
> + 'fail to move file already in index under different cased name' \
> + 'echo 1 > foo &&
> + git add foo &&
> + git commit -m add_file -- foo &&
> + git mv foo FOO &&
> + test_expect_code 128 git mv foo BAR'
As discussed on Github: Is this the right code to test that the
code does not assert(). I dont know.
> +
> test_expect_success "Michael Cassar's test case" '
> rm -fr .git papers partA &&
> git init &&
> --
> 2.25.1
>
^ permalink raw reply [relevance 0%]
* [PATCH] git-mv: fix git mv bug with case insensitive fs
[not found] ` <BYAPR21MB11585FFD46DEE7AD4EEEFEABE0D89@BYAPR21MB1158.namprd21.prod.outlook.com>
@ 2020-12-29 2:06 14% ` Dan Moseley
2020-12-31 7:13 0% ` Torsten Bögershausen
0 siblings, 1 reply; 200+ results
From: Dan Moseley @ 2020-12-29 2:06 UTC (permalink / raw)
To: git@vger.kernel.org
Fix git mv to not assert when src is already in the index under a
different casing, core.caseInsensitive=true, and the file system
is case insensitive.
Since 9b906af657 the check that git mv does to ensure the src is in the
cache respects caseInsensitive. As a result git mv allows a move from a
file that has a different case in the index than it does on disk.
After the rename on disk, git mv fails to find the file in the cache
in order to rename it in the index, and asserts.
Assertion failed: pos >= 0, file builtin/mv.c, line 295
This is the simplest possible fix, suggested by @tboegi. It does leave
the file renamed on disk, but that is easy to reverse after the error.
Another option would be to change the aforementioned check to always
be case sensitive, but I am not sure whether there is a scenario where
it is useful to be insensitive.
Signed-off-by: Dan Moseley <danmose@microsoft.com>
---
Originally reported in https://github.com/git-for-windows/git/issues/2920
but this is not specific to Windows.
builtin/mv.c | 6 ++++--
t/t7001-mv.sh | 8 ++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c index 7dac714af9..e1fd8a5e00 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -292,8 +292,10 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
continue;
pos = cache_name_pos(src, strlen(src));
- assert(pos >= 0);
- rename_cache_entry_at(pos, dst);
+ if (pos >= 0)
+ rename_cache_entry_at(pos, dst);
+ else if (!ignore_errors)
+ die(_("bad source: source=%s, destination=%s"),
+ src, dst);
}
if (gitmodules_modified)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 63d5f41a12..5c7fee9bd8 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -152,6 +152,14 @@ test_expect_success \
'move into "."' \
'git mv path1/path2/ .'
+test_expect_success \
+ 'fail to move file already in index under different cased name' \
+ 'echo 1 > foo &&
+ git add foo &&
+ git commit -m add_file -- foo &&
+ git mv foo FOO &&
+ test_expect_code 128 git mv foo BAR'
+
test_expect_success "Michael Cassar's test case" '
rm -fr .git papers partA &&
git init &&
--
2.25.1
^ permalink raw reply [relevance 14%]
* What's cooking in git.git (Dec 2020, #05; Mon, 28)
@ 2020-12-28 19:09 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-12-28 19:09 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Git 2.30 final is out. I expect things will quiet down while people
celebrate year-end and new year, unless a bad regression is found
post release.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* dl/checkout-p-merge-base (2020-12-21) 1 commit
(merged to 'next' on 2020-12-21 at 595dd32b56)
+ checkout -p: handle tree arguments correctly again
Fix to a regression introduced during this cycle.
* js/no-more-prepare-for-main-in-test (2020-12-16) 11 commits
(merged to 'next' on 2020-12-18 at d15a382d4d)
+ tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq
+ t9902: use `main` as initial branch name
+ t6302: use `main` as initial branch name
+ t5703: use `main` as initial branch name
+ t5510: use `main` as initial branch name
+ t5505: finalize transitioning to using the branch name `main`
+ t3205: finalize transitioning to using the branch name `main`
+ t3203: complete the transition to using the branch name `main`
+ t3201: finalize transitioning to using the branch name `main`
+ t3200: finish transitioning to the initial branch name `main`
+ t1400: use `main` as initial branch name
Test coverage fix.
* jx/pack-redundant-on-single-pack (2020-12-16) 1 commit
(merged to 'next' on 2020-12-18 at b819311529)
+ pack-redundant: fix crash when one packfile in repo
"git pack-redandant" when there is only one packfile used to crash,
which has been corrected.
* ma/maintenance-crontab-fix (2020-12-21) 3 commits
(merged to 'next' on 2020-12-21 at 8cd8cc04f9)
+ t7900-maintenance: test for magic markers
+ gc: fix handling of crontab magic markers
+ git-maintenance.txt: add missing word
Hotfix for a topic of this cycle.
* nk/refspecs-negative-fix (2020-12-21) 2 commits
(merged to 'next' on 2020-12-21 at 7d88169236)
+ negative-refspec: improve comment on query_matches_negative_refspec
+ negative-refspec: fix segfault on : refspec
Hotfix for recent regression.
* pb/doc-git-linkit-fix (2020-12-22) 1 commit
(merged to 'next' on 2020-12-22 at 240a7a227c)
+ git.txt: fix typos in 'linkgit' macro invocation
Docfix.
--------------------------------------------------
[New Topics]
* es/perf-export-fix (2020-12-22) 1 commit
(merged to 'next' on 2020-12-22 at d06b0379d9)
+ t/perf: avoid unnecessary test_export() recursion
Tweak unneeded recursion from a test framework helper function.
Will cook in 'next'.
* dl/p4-encode-after-kw-expansion (2020-12-23) 1 commit
- git-p4: fix syncing file types with pattern
Text encoding fix for "git p4".
* fc/mergetool-automerge (2020-12-22) 1 commit
- mergetool: add automerge configuration
"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified. The command learned to optionally
prepare these files with unconflicted parts already resolved.
--------------------------------------------------
[Stalled]
* ss/submodule-add-in-c (2020-12-15) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Expecting a reroll.
The patches are split incorrectly; part of 1/3 belongs to 2/3
cf. <nycvar.QRO.7.76.6.2012190104140.56@tvgsbejvaqbjf.bet>
It seems to introduce a segfault on 'seen'.
cf. <xmqqft3xflw7.fsf@gitster.c.googlers.com>
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there.
cf. <85y2jiqq3c.fsf@gmail.com>
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
cf. <20201103053629.GA13228@Abhishek-Arch>
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
probably is with potential consequences that is more/less grave?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-12-21) 2 commits
- fixup??? git: catch an attempt to run "git-foo"
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Needs review.
--------------------------------------------------
[Cooking]
* ew/decline-core-abbrev (2020-12-23) 1 commit
- core.abbrev=no disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Will merge to 'next'.
* es/worktree-repair-both-moved (2020-12-21) 1 commit
(merged to 'next' on 2020-12-22 at 9eaae4f5c0)
+ worktree: teach `repair` to fix multi-directional breakage
"git worktree repair" learned to deal with the case where both the
repository and the worktree moved.
Will cook in 'next'.
* fc/t6030-bisect-reset-removes-auxiliary-files (2020-12-21) 1 commit
(merged to 'next' on 2020-12-22 at 2ab78ef1e1)
+ test: bisect-porcelain: fix location of files
A 3-year old test that was not testing anything useful has been
corrected.
Will cook in 'next'.
* mr/bisect-in-c-4 (2020-12-21) 7 commits
- bisect--helper: retire `--check-and-set-terms` subcommand
- bisect--helper: reimplement `bisect_skip` shell function in C
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: use `res` instead of return in BISECT_RESET case option
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: reimplement `bisect_replay` shell function in C
- bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
* jt/clone-unborn-head (2020-12-22) 3 commits
- clone: respect remote unborn HEAD
- connect, transport: add no-op arg for future patch
- ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
* fc/bash-completion-post-2.29 (2020-12-23) 4 commits
. 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.*
Seems to break tests on Windows
cf. https://github.com/git/git/runs/1597682180#step:5:35614
* jc/config-pretend-gitdir (2020-12-15) 1 commit
- config: --pretend-git-dir for includeIf:gitdir
WIP
* jc/deprecate-pack-redundant (2020-12-15) 1 commit
- pack-redundant: gauge the usage before proposing its removal
Warn loudly when the "pack-redundant" command, which has been left
stale with almost unusable performance issues, gets used, as we no
longer want to recommend its use (instead just "repack -d" instead).
* en/merge-ort-recursive (2020-12-16) 4 commits
(merged to 'next' on 2020-12-22 at 0dbf60011f)
+ merge-ort: implement merge_incore_recursive()
+ merge-ort: make clear_internal_opts() aware of partial clearing
+ merge-ort: copy a few small helper functions from merge-recursive.c
+ commit: move reverse_commit_list() from merge-recursive
(this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3.)
The ORT merge strategy learned to synthesize virtual ancestor tree
by recursively merging multiple merge bases together, just like the
recursive backend has done for years.
Will cook in 'next'.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* en/merge-ort-3 (2020-12-15) 11 commits
- merge-ort: add implementation of type-changed rename handling
- merge-ort: add implementation of normal rename handling
- merge-ort: add implementation of rename collisions
- merge-ort: add implementation of rename/delete conflicts
- merge-ort: add implementation of both sides renaming differently
- merge-ort: add implementation of both sides renaming identically
- merge-ort: add basic outline for process_renames()
- merge-ort: implement compare_pairs() and collect_renames()
- merge-ort: implement detect_regular_renames()
- merge-ort: add initial outline for basic rename detection
- merge-ort: add basic data structures for handling renames
(this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-recursive.)
Rename detection is added to the "ORT" merge strategy.
* ps/config-env-pairs (2020-12-23) 9 commits
- SQUASH???
- config: allow specifying config entries via envvar pairs
- environment: make `getenv_safe()` a public function
- config: parse more robust format in GIT_CONFIG_PARAMETERS
- config: store "git -c" variables using more robust format
- config: extract function to parse config pairs
- quote: make sq_dequote_step() a public function
- config: add new way to pass config via `--config-env`
- git: add `--super-prefix` to usage string
Introduce two new ways to feed configuration variable-value pairs
via environment variables, and tweak the way GIT_CONFIG_PARAMETERS
encodes variable/value pairs to make it more robust.
* bc/hashed-mailmap (2020-12-12) 1 commit
- mailmap: support hashed entries in mailmaps
The mailmap database learned to take hashed value as the original
side of mapping.
Expecting a reroll.
* so/log-diff-merge (2020-12-21) 32 commits
- t4013: add tests for --diff-merges=first-parent
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent changes merges format
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
- diff-merges: add old mnemonic counterparts to --diff-merges
- diff-merges: let new options enable diff without -p
- diff-merges: do not imply -p for new options
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: handle imply -p on -c/--cc logic for log.c
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Rerolled.
* bc/rev-parse-path-format (2020-12-12) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
Will merge to 'next'.
* en/merge-ort-impl (2020-12-13) 21 commits
(merged to 'next' on 2020-12-21 at c551d7bda9)
+ merge-ort: free data structures in merge_finalize()
+ merge-ort: add implementation of record_conflicted_index_entries()
+ tree: enable cmp_cache_name_compare() to be used elsewhere
+ merge-ort: add implementation of checkout()
+ merge-ort: basic outline for merge_switch_to_result()
+ merge-ort: step 3 of tree writing -- handling subdirectories as we go
+ merge-ort: step 2 of tree writing -- function to create tree object
+ merge-ort: step 1 of tree writing -- record basenames, modes, and oids
+ merge-ort: have process_entries operate in a defined order
+ merge-ort: add a preliminary simple process_entries() implementation
+ merge-ort: avoid recursing into identical trees
+ merge-ort: record stage and auxiliary info for every path
+ merge-ort: compute a few more useful fields for collect_merge_info
+ merge-ort: avoid repeating fill_tree_descriptor() on the same tree
+ merge-ort: implement a very basic collect_merge_info()
+ merge-ort: add an err() function similar to one from merge-recursive
+ merge-ort: use histogram diff
+ merge-ort: port merge_start() from merge-recursive
+ merge-ort: add some high-level algorithm structure
+ merge-ort: setup basic internal data structures
+ Merge branch 'en/strmap' into en/merge-ort-impl
(this branch is used by en/merge-ort-2, en/merge-ort-3 and en/merge-ort-recursive.)
The merge backend "done right" starts to emerge.
Will cook in 'next'.
* es/config-hooks (2020-12-21) 34 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
* ab/mktag (2020-12-22) 20 commits
- mktag: add a --no-strict option
- mktag: mark strings for translation
- mktag: convert to parse-options
- mktag: allow omitting the header/body \n separator
- mktag: allow turning off fsck.extraHeaderEntry
- fsck: make fsck_config() re-usable
- mktag: use fsck instead of custom verify_tag()
- mktag: use puts(str) instead of printf("%s\n", str)
- mktag: remove redundant braces in one-line body "if"
- mktag: use default strbuf_read() hint
- mktag tests: test "hash-object" compatibility
- mktag tests: stress test whitespace handling
- mktag tests: don't create "mytag" twice
- mktag tests: don't pipe to stderr needlessly
- mktag tests: improve verify_object() test coverage
- mktag tests: remove needless SHA-1 hardcoding
- mktag tests: don't needlessly use a subshell
- mktag doc: update to explain why to use this
- mktag doc: grammar fix, when exists -> when it exists
- mktag doc: say <hash> not <sha1>
"git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
cf. <20201223013606.7972-1-avarab@gmail.com>
* ab/trailers-extra-format (2020-12-09) 5 commits
(merged to 'next' on 2020-12-14 at 9fc731944e)
+ pretty format %(trailers): add a "key_value_separator"
+ pretty format %(trailers): add a "keyonly"
+ pretty-format %(trailers): fix broken standalone "valueonly"
+ pretty format %(trailers) doc: avoid repetition
+ pretty format %(trailers) test: split a long line
The "--format=%(trailers)" mechanism gets enhanced to make it
easier to design output for machine consumption.
Will cook in 'next'.
* en/diffcore-rename (2020-12-14) 9 commits
- diffcore-rename: remove unneccessary duplicate entry checks
- diffcore-rename: accelerate rename_dst setup
- diffcore-rename: simplify and accelerate register_rename_src()
- t4058: explore duplicate tree entry handling in a bit more detail
- t4058: add more tests and documentation for duplicate tree entry handling
- diffcore-rename: reduce jumpiness in progress counters
- diffcore-rename: simplify limit check
- diffcore-rename: avoid usage of global in too_many_rename_candidates()
- diffcore-rename: rename num_create to num_destinations
File-level rename detection updates.
* en/merge-ort-2 (2020-12-13) 7 commits
(merged to 'next' on 2020-12-21 at ef5b184349)
+ merge-ort: add modify/delete handling and delayed output processing
+ merge-ort: add die-not-implemented stub handle_content_merge() function
+ merge-ort: add function grouping comments
+ merge-ort: add a paths_to_free field to merge_options_internal
+ merge-ort: add a path_conflict field to merge_options_internal
+ merge-ort: add a clear_internal_opts helper
+ merge-ort: add a few includes
(this branch is used by en/merge-ort-3 and en/merge-ort-recursive; uses en/merge-ort-impl.)
More "ORT" merge strategy.
Will cook in 'next'.
* fc/pull-merge-rebase (2020-12-15) 5 commits
(merged to 'next' on 2020-12-21 at acce13e5c4)
+ pull: display default warning only when non-ff
+ pull: correct condition to trigger non-ff advice
+ pull: get rid of unnecessary global variable
+ pull: give the advice for choosing rebase/merge much later
+ pull: refactor fast-forward check
When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.
Will cook in 'next'.
* pk/subsub-fetch-fix-take-2 (2020-12-09) 1 commit
(merged to 'next' on 2020-12-14 at ccc01a5f66)
+ submodules: fix of regression on fetching of non-init subsub-repo
"git fetch --recurse-submodules" fix (second attempt).
Will cook in 'next'.
* en/stash-apply-sparse-checkout (2020-12-01) 3 commits
- stash: fix stash application in sparse-checkouts
- stash: remove unnecessary process forking
- t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
"git stash" did not work well in a sparsely checked out working
tree.
Will merge to 'next'.
* tb/pack-bitmap (2020-12-08) 24 commits
(merged to 'next' on 2020-12-15 at 773268c2fb)
+ pack-bitmap-write: better reuse bitmaps
+ pack-bitmap-write: relax unique revwalk condition
+ pack-bitmap-write: use existing bitmaps
+ pack-bitmap: factor out 'add_commit_to_bitmap()'
+ pack-bitmap: factor out 'bitmap_for_commit()'
+ pack-bitmap-write: ignore BITMAP_FLAG_REUSE
+ pack-bitmap-write: build fewer intermediate bitmaps
+ pack-bitmap.c: check reads more aggressively when loading
+ pack-bitmap-write: rename children to reverse_edges
+ t5310: add branch-based checks
+ commit: implement commit_list_contains()
+ bitmap: implement bitmap_is_subset()
+ pack-bitmap-write: fill bitmap with commit history
+ pack-bitmap-write: pass ownership of intermediate bitmaps
+ pack-bitmap-write: reimplement bitmap writing
+ ewah: add bitmap_dup() function
+ ewah: implement bitmap_or()
+ ewah: make bitmap growth less aggressive
+ ewah: factor out bitmap growth
+ rev-list: die when --test-bitmap detects a mismatch
+ t5310: drop size of truncated ewah bitmap
+ pack-bitmap: bounds-check size of cache extension
+ pack-bitmap: fix header size check
+ ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
Various improvements to the codepath that writes out pack bitmaps.
Will cook in 'next'.
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
- tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
- t99*: adjust the references to the default branch name "main"
- tests(git-p4): transition to the default branch name `main`
- t9[5-7]*: adjust the references to the default branch name "main"
- t9[0-4]*: adjust the references to the default branch name "main"
- t8*: adjust the references to the default branch name "main"
- t7[5-9]*: adjust the references to the default branch name "main"
- t7[0-4]*: adjust the references to the default branch name "main"
- t6[4-9]*: adjust the references to the default branch name "main"
- t64*: preemptively adjust alignment to prepare for `master` -> `main`
- t6[0-3]*: adjust the references to the default branch name "main"
- t5[6-9]*: adjust the references to the default branch name "main"
- t55[4-9]*: adjust the references to the default branch name "main"
- t55[23]*: adjust the references to the default branch name "main"
- t551*: adjust the references to the default branch name "main"
- t550*: adjust the references to the default branch name "main"
- t5503: prepare aligned comment for replacing `master` with `main`
- t5[0-4]*: adjust the references to the default branch name "main"
- t5323: prepare centered comment for `master` -> `main`
- t4*: adjust the references to the default branch name "main"
- t3[5-9]*: adjust the references to the default branch name "main"
- t34*: adjust the references to the default branch name "main"
- t3416: preemptively adjust alignment in a comment
- t3[0-3]*: adjust the references to the default branch name "main"
- t2*: adjust the references to the default branch name "main"
- t[01]*: adjust the references to the default branch name "main"
- t0060: preemptively adjust alignment
- tests: mark tests relying on the current default for `init.defaultBranch`
- Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
* ds/maintenance-part-4 (2020-12-09) 6 commits
- t7900: make macOS-specific test work on Windows
- t7900: fix test failures when invoked individually via --run
- maintenance: use Windows scheduled tasks
- maintenance: use launchctl on macOS
- maintenance: include 'cron' details in docs
- maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-12-08) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
--------------------------------------------------
[Discarded]
* dr/push-remoteref-fix (2020-04-23) 1 commit
. remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* jk/disambiguate-equal-in-config-param (2020-12-09) 3 commits
. config: store "git -c" variables using more robust format
. config: parse more robust format in GIT_CONFIG_PARAMETERS
. quote: make sq_dequote_step() a public function
Absorbed by the ps/config-env-pairs topic.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Dec 2020, #04; Tue, 22)
@ 2020-12-22 20:07 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-12-22 20:07 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Hopefully, the second release candidate -rc2 can be tagged tomorrow.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[New Topics]
* dl/checkout-p-merge-base (2020-12-21) 1 commit
(merged to 'next' on 2020-12-21 at 595dd32b56)
+ checkout -p: handle tree arguments correctly again
Fix to a regression introduced during this cycle.
Will merge to 'master'.
* es/worktree-repair-both-moved (2020-12-21) 1 commit
- worktree: teach `repair` to fix multi-directional breakage
"git worktree repair" learned to take advantage of the fact that it
knows both ends (i.e. the main repository is found in the location
the command runs, the worktrees are given as arguments) to deal
with the case where both the repository and the worktree moved.
Will merge to 'next'.
* fc/t6030-bisect-reset-removes-auxiliary-files (2020-12-21) 1 commit
- test: bisect-porcelain: fix location of files
A 3-year old test that was not testing anything useful has been
corrected.
Will merge to 'next'.
* ma/maintenance-crontab-fix (2020-12-21) 3 commits
(merged to 'next' on 2020-12-21 at 8cd8cc04f9)
+ t7900-maintenance: test for magic markers
+ gc: fix handling of crontab magic markers
+ git-maintenance.txt: add missing word
Hotfix for a topic of this cycle.
Will merge to 'master'.
* mr/bisect-in-c-4 (2020-12-21) 7 commits
- bisect--helper: retire `--check-and-set-terms` subcommand
- bisect--helper: reimplement `bisect_skip` shell function in C
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: use `res` instead of return in BISECT_RESET case option
- bisect--helper: retire `--bisect-write` subcommand
- bisect--helper: reimplement `bisect_replay` shell function in C
- bisect--helper: reimplement `bisect_log` shell function in C
Piecemeal of rewrite of "git bisect" in C continues.
* jt/clone-unborn-head (2020-12-21) 3 commits
. clone: respect remote unborn HEAD
. connect, transport: add no-op arg for future patch
. ls-refs: report unborn targets of symrefs
"git clone" tries to locally check out the branch pointed at by
HEAD of the remote repository after it is done, but the protocol
did not convey the information necessary to do so when copying an
empty repository. The protocol v2 learned how to do so.
Seems to break tests when merged to 'seen'.
* nk/refspecs-negative-fix (2020-12-21) 2 commits
(merged to 'next' on 2020-12-21 at 7d88169236)
+ negative-refspec: improve comment on query_matches_negative_refspec
+ negative-refspec: fix segfault on : refspec
Hotfix for recent regression.
Will merge to 'master'.
--------------------------------------------------
[Stalled]
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there.
cf. <85y2jiqq3c.fsf@gmail.com>
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
cf. <20201103053629.GA13228@Abhishek-Arch>
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
probably is with potential consequences that is more/less grave?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
cf. <20200901144323.GA14554@dcvr>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-12-21) 2 commits
- fixup??? git: catch an attempt to run "git-foo"
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ss/submodule-add-in-c (2020-12-15) 3 commits
- t7400: add test to check 'submodule add' for tracked paths
- submodule: port submodule subcommand 'add' from shell to C
- dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Needs review.
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Needs review.
--------------------------------------------------
[Cooking]
* fc/bash-completion-post-2.29 (2020-12-19) 4 commits
- completion: bash: fix for multiple dash commands
- completion: bash: fix for suboptions with value
- completion: bash: add correct suffix in variables
- completion: bash: fix prefix detection in branch.*
Needs review.
* jc/config-pretend-gitdir (2020-12-15) 1 commit
- config: --pretend-git-dir for includeIf:gitdir
WIP
* jc/deprecate-pack-redundant (2020-12-15) 1 commit
- pack-redundant: gauge the usage before proposing its removal
Warn loudly when the "pack-redundant" command, which has been left
stale with almost unusable performance issues, gets used, as we no
longer want to recommend its use (instead just "repack -d" instead).
* en/merge-ort-recursive (2020-12-16) 4 commits
- merge-ort: implement merge_incore_recursive()
- merge-ort: make clear_internal_opts() aware of partial clearing
- merge-ort: copy a few small helper functions from merge-recursive.c
- commit: move reverse_commit_list() from merge-recursive
(this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3.)
The ORT merge strategy learned to synthesize virtual ancestor tree
by recursively merging multiple merge bases together, just like the
recursive backend has done for years.
Will merge to 'next'.
* js/no-more-prepare-for-main-in-test (2020-12-16) 11 commits
(merged to 'next' on 2020-12-18 at d15a382d4d)
+ tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq
+ t9902: use `main` as initial branch name
+ t6302: use `main` as initial branch name
+ t5703: use `main` as initial branch name
+ t5510: use `main` as initial branch name
+ t5505: finalize transitioning to using the branch name `main`
+ t3205: finalize transitioning to using the branch name `main`
+ t3203: complete the transition to using the branch name `main`
+ t3201: finalize transitioning to using the branch name `main`
+ t3200: finish transitioning to the initial branch name `main`
+ t1400: use `main` as initial branch name
Test coverage fix.
Will merge to 'master'.
* jx/pack-redundant-on-single-pack (2020-12-16) 1 commit
(merged to 'next' on 2020-12-18 at b819311529)
+ pack-redundant: fix crash when one packfile in repo
"git pack-redandant" when there is only one packfile used to crash,
which has been corrected.
Will merge to 'master'.
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* en/merge-ort-3 (2020-12-15) 11 commits
- merge-ort: add implementation of type-changed rename handling
- merge-ort: add implementation of normal rename handling
- merge-ort: add implementation of rename collisions
- merge-ort: add implementation of rename/delete conflicts
- merge-ort: add implementation of both sides renaming differently
- merge-ort: add implementation of both sides renaming identically
- merge-ort: add basic outline for process_renames()
- merge-ort: implement compare_pairs() and collect_renames()
- merge-ort: implement detect_regular_renames()
- merge-ort: add initial outline for basic rename detection
- merge-ort: add basic data structures for handling renames
(this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-recursive.)
Rename detection is added to the "ORT" merge strategy.
* jk/disambiguate-equal-in-config-param (2020-12-09) 3 commits
- config: store "git -c" variables using more robust format
- config: parse more robust format in GIT_CONFIG_PARAMETERS
- quote: make sq_dequote_step() a public function
(this branch uses ps/config-env-pairs.)
The quoting rules used to pass "git -c var=val" configuration
across processes have been updated in a backward compatible way, so
that the value read from an environment variable can contain an
equal sign when using the "git --config-env var=env" feature.
We may want to make this just a middle part of the
ps/config-env-pairs topic with a bit of patch shuffling.
* ps/config-env-pairs (2020-12-09) 6 commits
- config: allow specifying config entries via envvar pairs
- config: refactor parsing of GIT_CONFIG_PARAMETERS
- config: extract function to parse config pairs
- environment: make `getenv_safe()` non-static
- config: add new way to pass config via `--config-env`
- git: add `--super-prefix` to usage string
(this branch is used by jk/disambiguate-equal-in-config-param.)
Introduce two new ways to feed configuration variable-value pairs
via environment variables.
* bc/hashed-mailmap (2020-12-12) 1 commit
- mailmap: support hashed entries in mailmaps
The mailmap database learned to take hashed value as the original
side of mapping.
Expecting a reroll.
* so/log-diff-merge (2020-12-21) 32 commits
- t4013: add tests for --diff-merges=first-parent
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent changes merges format
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
- diff-merges: add old mnemonic counterparts to --diff-merges
- diff-merges: let new options enable diff without -p
- diff-merges: do not imply -p for new options
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: handle imply -p on -c/--cc logic for log.c
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Rerolled.
* bc/rev-parse-path-format (2020-12-12) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* en/merge-ort-impl (2020-12-13) 21 commits
(merged to 'next' on 2020-12-21 at c551d7bda9)
+ merge-ort: free data structures in merge_finalize()
+ merge-ort: add implementation of record_conflicted_index_entries()
+ tree: enable cmp_cache_name_compare() to be used elsewhere
+ merge-ort: add implementation of checkout()
+ merge-ort: basic outline for merge_switch_to_result()
+ merge-ort: step 3 of tree writing -- handling subdirectories as we go
+ merge-ort: step 2 of tree writing -- function to create tree object
+ merge-ort: step 1 of tree writing -- record basenames, modes, and oids
+ merge-ort: have process_entries operate in a defined order
+ merge-ort: add a preliminary simple process_entries() implementation
+ merge-ort: avoid recursing into identical trees
+ merge-ort: record stage and auxiliary info for every path
+ merge-ort: compute a few more useful fields for collect_merge_info
+ merge-ort: avoid repeating fill_tree_descriptor() on the same tree
+ merge-ort: implement a very basic collect_merge_info()
+ merge-ort: add an err() function similar to one from merge-recursive
+ merge-ort: use histogram diff
+ merge-ort: port merge_start() from merge-recursive
+ merge-ort: add some high-level algorithm structure
+ merge-ort: setup basic internal data structures
+ Merge branch 'en/strmap' into en/merge-ort-impl
(this branch is used by en/merge-ort-2, en/merge-ort-3 and en/merge-ort-recursive.)
The merge backend "done right" starts to emerge.
Will cook in 'next'.
* es/config-hooks (2020-12-21) 34 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting doc updates, but otherwise seems to be progressing nicely.
* hn/reftable (2020-12-21) 16 commits
- SQUASH??? allow t0031 to run with any default branch name
- Add "test-tool dump-reftable" command.
- git-prompt: prepare for reftable refs backend
- Reftable support for git-core
- reftable: rest of library
- reftable: reftable file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: add blocksource, an abstraction for random access reads
- reftable: utility functions
- reftable: add error related functionality
- reftable: add LICENSE
- init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
* ab/mktag (2020-12-09) 11 commits
- SQUASH???
- mktag: allow turning off fsck.extraHeaderEntry
- fsck: make fsck_config() re-usable
- mktag doc: update to explain why to use this
- mktag: use fsck instead of custom verify_tag()
- mktag tests: improve verify_object() test coverage
- mktag tests: remove needless SHA-1 hardcoding
- mktag tests: don't needlessly use a subshell
- mktag: remove redundant braces in one-line body "if"
- mktag: use default strbuf_read() hint
- mktag doc: say <hash> not <sha1>
"git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
Expecting a reroll, but it seems getting closer.
* ab/trailers-extra-format (2020-12-09) 5 commits
(merged to 'next' on 2020-12-14 at 9fc731944e)
+ pretty format %(trailers): add a "key_value_separator"
+ pretty format %(trailers): add a "keyonly"
+ pretty-format %(trailers): fix broken standalone "valueonly"
+ pretty format %(trailers) doc: avoid repetition
+ pretty format %(trailers) test: split a long line
The "--format=%(trailers)" mechanism gets enhanced to make it
easier to design output for machine consumption.
Will cook in 'next'.
* en/diffcore-rename (2020-12-14) 9 commits
- diffcore-rename: remove unneccessary duplicate entry checks
- diffcore-rename: accelerate rename_dst setup
- diffcore-rename: simplify and accelerate register_rename_src()
- t4058: explore duplicate tree entry handling in a bit more detail
- t4058: add more tests and documentation for duplicate tree entry handling
- diffcore-rename: reduce jumpiness in progress counters
- diffcore-rename: simplify limit check
- diffcore-rename: avoid usage of global in too_many_rename_candidates()
- diffcore-rename: rename num_create to num_destinations
File-level rename detection updates.
* en/merge-ort-2 (2020-12-13) 7 commits
(merged to 'next' on 2020-12-21 at ef5b184349)
+ merge-ort: add modify/delete handling and delayed output processing
+ merge-ort: add die-not-implemented stub handle_content_merge() function
+ merge-ort: add function grouping comments
+ merge-ort: add a paths_to_free field to merge_options_internal
+ merge-ort: add a path_conflict field to merge_options_internal
+ merge-ort: add a clear_internal_opts helper
+ merge-ort: add a few includes
(this branch is used by en/merge-ort-3 and en/merge-ort-recursive; uses en/merge-ort-impl.)
More "ORT" merge strategy.
Will cook in 'next'.
* fc/pull-merge-rebase (2020-12-15) 5 commits
(merged to 'next' on 2020-12-21 at acce13e5c4)
+ pull: display default warning only when non-ff
+ pull: correct condition to trigger non-ff advice
+ pull: get rid of unnecessary global variable
+ pull: give the advice for choosing rebase/merge much later
+ pull: refactor fast-forward check
When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.
Will cook in 'next'.
* pk/subsub-fetch-fix-take-2 (2020-12-09) 1 commit
(merged to 'next' on 2020-12-14 at ccc01a5f66)
+ submodules: fix of regression on fetching of non-init subsub-repo
"git fetch --recurse-submodules" fix (second attempt).
Will cook in 'next'.
* en/stash-apply-sparse-checkout (2020-12-01) 3 commits
- stash: fix stash application in sparse-checkouts
- stash: remove unnecessary process forking
- t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
"git stash" did not work well in a sparsely checked out working
tree.
* tb/pack-bitmap (2020-12-08) 24 commits
(merged to 'next' on 2020-12-15 at 773268c2fb)
+ pack-bitmap-write: better reuse bitmaps
+ pack-bitmap-write: relax unique revwalk condition
+ pack-bitmap-write: use existing bitmaps
+ pack-bitmap: factor out 'add_commit_to_bitmap()'
+ pack-bitmap: factor out 'bitmap_for_commit()'
+ pack-bitmap-write: ignore BITMAP_FLAG_REUSE
+ pack-bitmap-write: build fewer intermediate bitmaps
+ pack-bitmap.c: check reads more aggressively when loading
+ pack-bitmap-write: rename children to reverse_edges
+ t5310: add branch-based checks
+ commit: implement commit_list_contains()
+ bitmap: implement bitmap_is_subset()
+ pack-bitmap-write: fill bitmap with commit history
+ pack-bitmap-write: pass ownership of intermediate bitmaps
+ pack-bitmap-write: reimplement bitmap writing
+ ewah: add bitmap_dup() function
+ ewah: implement bitmap_or()
+ ewah: make bitmap growth less aggressive
+ ewah: factor out bitmap growth
+ rev-list: die when --test-bitmap detects a mismatch
+ t5310: drop size of truncated ewah bitmap
+ pack-bitmap: bounds-check size of cache extension
+ pack-bitmap: fix header size check
+ ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
Various improvements to the codepath that writes out pack bitmaps.
Will cook in 'next'.
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
- tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
- t99*: adjust the references to the default branch name "main"
- tests(git-p4): transition to the default branch name `main`
- t9[5-7]*: adjust the references to the default branch name "main"
- t9[0-4]*: adjust the references to the default branch name "main"
- t8*: adjust the references to the default branch name "main"
- t7[5-9]*: adjust the references to the default branch name "main"
- t7[0-4]*: adjust the references to the default branch name "main"
- t6[4-9]*: adjust the references to the default branch name "main"
- t64*: preemptively adjust alignment to prepare for `master` -> `main`
- t6[0-3]*: adjust the references to the default branch name "main"
- t5[6-9]*: adjust the references to the default branch name "main"
- t55[4-9]*: adjust the references to the default branch name "main"
- t55[23]*: adjust the references to the default branch name "main"
- t551*: adjust the references to the default branch name "main"
- t550*: adjust the references to the default branch name "main"
- t5503: prepare aligned comment for replacing `master` with `main`
- t5[0-4]*: adjust the references to the default branch name "main"
- t5323: prepare centered comment for `master` -> `main`
- t4*: adjust the references to the default branch name "main"
- t3[5-9]*: adjust the references to the default branch name "main"
- t34*: adjust the references to the default branch name "main"
- t3416: preemptively adjust alignment in a comment
- t3[0-3]*: adjust the references to the default branch name "main"
- t2*: adjust the references to the default branch name "main"
- t[01]*: adjust the references to the default branch name "main"
- t0060: preemptively adjust alignment
- tests: mark tests relying on the current default for `init.defaultBranch`
- Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
* ds/maintenance-part-4 (2020-12-09) 6 commits
- t7900: make macOS-specific test work on Windows
- t7900: fix test failures when invoked individually via --run
- maintenance: use Windows scheduled tasks
- maintenance: use launchctl on macOS
- maintenance: include 'cron' details in docs
- maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-12-08) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
--------------------------------------------------
[Discarded]
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
^ permalink raw reply [relevance 5%]
* Re: [PATCH 00/11] Modernizing the t7001 test script
2020-10-01 5:42 6% ` Shubham Verma
@ 2020-12-22 19:22 6% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-12-22 19:22 UTC (permalink / raw)
To: Shubham Verma; +Cc: Eric Sunshine, Git List
Shubham Verma <shubhunic@gmail.com> writes:
> On Fri, Sep 25, 2020 at 11:03 PM Eric Sunshine <sunshine@sunshineco.com> wrote:
>>
>> On Fri, Sep 25, 2020 at 1:03 PM shubham verma <shubhunic@gmail.com> wrote:
>> > In this patch series modernize the t7001 test script by changing the
>> > style of its tests from an old one to the modern one and by cleaning
>> > up the test script.
>>
>> Thanks for tackling this task. I presume it was prompted by [1] or
>> [2], as this series covers many of the items mentioned in [1].
>> Overall, the series looks good. I'll leave comments in a few of the
>> individual patches.
>>
>> [1]: https://lore.kernel.org/git/CAPig+cQpUu2UO-+jWn1nTaDykWnxwuEitzVB7PnW2SS_b7V8Hg@mail.gmail.com/
>> [2]: https://git.github.io/rev_news/2020/08/27/edition-66/
>
> Eric, Actually I follow the Instruction that you pointed out in [1].
> Okay, I improve the commits and make changes according to your comments.
>
> Thank You!
This series has seen quite a many review comments, and as far as I
remember, none of them was a suggestion that was hard to decipher.
It has been almost 3 months---has an update been posted that I
missed?
Thanks.
^ permalink raw reply [relevance 6%]
* What's cooking in git.git (Dec 2020, #03; Fri, 18)
@ 2020-12-19 5:34 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-12-19 5:34 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
A release candidate 2.30-rc1 has been tagged; there are too many
topics in flight, sadly many of which haven't been adequately
reviewed. I think there are a couple of topics left in 'next' that
are obvious candidates for the final, but it would be lovely if we
can figure out how to get topics in 'seen' that haven't got enough
love unstuck.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/unreachable-break (2020-12-15) 1 commit
(merged to 'next' on 2020-12-17 at 3eab6be401)
+ style: do not "break" in switch() after "return"
Code clean-up.
* dd/doc-p4-requirements-update (2020-12-14) 1 commit
(merged to 'next' on 2020-12-17 at 59649dd9a8)
+ doc: mention Python 3.x supports
Doc update.
* es/perf-export-fix (2020-12-16) 1 commit
(merged to 'next' on 2020-12-17 at 57489420ed)
+ t/perf: fix test_export() failure with BSD `sed`
Dev-support fix for BSD.
* jb/midx-doc-update (2020-12-14) 1 commit
(merged to 'next' on 2020-12-14 at 880b50e89d)
+ docs: multi-pack-index: remove note about future 'verify' work
Doc update.
* jc/compat-util-setitimer-fix (2020-12-15) 1 commit
(merged to 'next' on 2020-12-17 at 99a9af5066)
+ compat-util: pretend that stub setitimer() always succeeds
Fix a recent bug in a rarely used replacement code.
* jc/diff-I-status-fix (2020-12-16) 1 commit
(merged to 'next' on 2020-12-17 at d7cd43984a)
+ diff: correct interaction between --exit-code and -I<pattern>
"git diff -I<pattern> -exit-code" should exit with 0 status when
all the changes match the ignored pattern, but it didn't.
* jc/strmap-remove-typefix (2020-12-15) 1 commit
(merged to 'next' on 2020-12-17 at e94fef7216)
+ strmap: make callers of strmap_remove() to call it in void context
C-std compliance fix.
* jh/index-v2-doc-on-fsmn (2020-12-14) 1 commit
(merged to 'next' on 2020-12-14 at bd3507ccc8)
+ index-format.txt: document v2 format of file system monitor extension
Doc update.
* jk/oid-array-cleanup (2020-12-07) 9 commits
(merged to 'next' on 2020-12-14 at 362f6f2618)
+ commit-graph: use size_t for array allocation and indexing
+ commit-graph: replace packed_oid_list with oid_array
+ commit-graph: drop count_distinct_commits() function
+ oid-array: provide a for-loop iterator
+ oid-array: make sort function public
+ cache.h: move hash/oid functions to hash.h
+ t0064: make duplicate tests more robust
+ t0064: drop sha1 mention from filename
+ oid-array.h: drop sha1 mention from header guard
Code clean-up.
* js/init-defaultbranch-advice (2020-12-13) 4 commits
(merged to 'next' on 2020-12-15 at bcca948854)
+ init: provide useful advice about init.defaultBranch
+ get_default_branch_name(): prepare for showing some advice
+ branch -m: allow renaming a yet-unborn branch
+ init: document `init.defaultBranch` better
Our users are going to be trained to prepare for future change of
init.defaultBranch configuration variable.
* js/t6300-hardcode-main (2020-12-07) 1 commit
(merged to 'next' on 2020-12-14 at 4eed7c6a8b)
+ t6300: avoid using the default name of the initial branch
Test update.
* js/t7064-master-to-initial (2020-12-08) 1 commit
(merged to 'next' on 2020-12-14 at b75529f792)
+ t7064: avoid relying on a specific default branch name
Test update.
* js/t7900-protect-pwd-in-config-get (2020-12-09) 1 commit
(merged to 'next' on 2020-12-14 at 61ff5e9b5b)
+ t7900: use --fixed-value in git-maintenance tests
Hotfix for test breakage.
* rb/nonstop-config-mak-uname-update (2020-12-16) 1 commit
(merged to 'next' on 2020-12-17 at 456a1bc21e)
+ config.mak.uname: remove old NonStop compatibility settings
Build update.
* rj/make-clean (2020-12-08) 5 commits
(merged to 'next' on 2020-12-14 at 767b1398d7)
+ Makefile: don't use a versioned temp distribution directory
+ Makefile: don't try to clean old debian build product
+ gitweb/Makefile: conditionally include ../GIT-VERSION-FILE
+ Documentation/Makefile: conditionally include ../GIT-VERSION-FILE
+ Documentation/Makefile: conditionally include doc.dep
Build optimization.
* tb/partial-clone-filters-fix (2020-12-03) 2 commits
(merged to 'next' on 2020-12-14 at d44e5942da)
+ upload-pack.c: don't free allowed_filters util pointers
+ builtin/clone.c: don't ignore transport_fetch_refs() errors
Fix potential server side resource deallocation issues when
responding to a partial clone request.
--------------------------------------------------
[New Topics]
* jc/config-pretend-gitdir (2020-12-15) 1 commit
- config: --pretend-git-dir for includeIf:gitdir
WIP
* jc/deprecate-pack-redundant (2020-12-15) 1 commit
- pack-redundant: gauge the usage before proposing its removal
Warn loudly when the "pack-redundant" command, which has been left
stale with almost unusable performance issues, gets used, as we no
longer want to recommend its use (instead just "repack -d" instead).
* en/merge-ort-recursive (2020-12-16) 4 commits
- merge-ort: implement merge_incore_recursive()
- merge-ort: make clear_internal_opts() aware of partial clearing
- merge-ort: copy a few small helper functions from merge-recursive.c
- commit: move reverse_commit_list() from merge-recursive
(this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-3.)
The ORT merge strategy learned to synthesize virtual ancestor tree
by recursively merging multiple merge bases together, just like the
recursive backend has done for years.
Will merge to 'next'.
* js/no-more-prepare-for-main-in-test (2020-12-16) 11 commits
(merged to 'next' on 2020-12-18 at d15a382d4d)
+ tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq
+ t9902: use `main` as initial branch name
+ t6302: use `main` as initial branch name
+ t5703: use `main` as initial branch name
+ t5510: use `main` as initial branch name
+ t5505: finalize transitioning to using the branch name `main`
+ t3205: finalize transitioning to using the branch name `main`
+ t3203: complete the transition to using the branch name `main`
+ t3201: finalize transitioning to using the branch name `main`
+ t3200: finish transitioning to the initial branch name `main`
+ t1400: use `main` as initial branch name
Test coverage fix.
Will merge to 'master'.
* jx/pack-redundant-on-single-pack (2020-12-16) 1 commit
(merged to 'next' on 2020-12-18 at b819311529)
+ pack-redundant: fix crash when one packfile in repo
"git pack-redandant" when there is only one packfile used to crash,
which has been corrected.
Will merge to 'master'.
--------------------------------------------------
[Stalled]
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there.
cf. <85y2jiqq3c.fsf@gmail.com>
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
cf. <20201103053629.GA13228@Abhishek-Arch>
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
probably is with potential consequences that is more/less grave?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ss/submodule-add-in-c (2020-12-15) 3 commits
- t7400: add test to check 'submodule add' for tracked paths
- submodule: port submodule subcommand 'add' from shell to C
- dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Needs review.
* fc/bash-completion-post-2.29 (2020-11-10) 26 commits
- completion: bash: shuffle __gitcomp functions
- completion: bash: cleanup __gitcomp* invocations
- completion: bash: add __gitcomp_opts
- completion: bash: improve __gitcomp description
- completion: bash: rename _get_comp_words_by_ref()
- completion: bash: trivial cleanup
- completion: bash: cleanup _get_comp_words_by_ref()
- completion: bash: refactor _get_comp_words_by_ref()
- completion: bash: simplify _get_comp_words_by_ref()
- test: completion: switch __gitcomp_nl prefix test
- completion: bash: simplify config_variable_name
- completion: bash: improve __gitcomp suffix code
- completion: bash: change suffix check in __gitcomp
- completion: bash: simplify __gitcomp
- completion: bash: refactor __gitcomp
- completion: bash: simplify equal suffix check
- completion: bash: factor out check in __gitcomp
- completion: bash: get rid of any non-append code
- completion: bash: get rid of _append() functions
- completion: bash: remove non-append functionality
- test: completion: add run_func() helper
- test: completion: fix currently typed words
- completion: bash: do not modify COMP_WORDBREAKS
- completion: bash: fix for suboptions with value
- completion: bash: add correct suffix in variables
- completion: bash: fix prefix detection in branch.*
Needs review.
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Needs review.
--------------------------------------------------
[Cooking]
* mt/parallel-checkout-part-1 (2020-12-16) 9 commits
- entry: add checkout_entry_ca() taking preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract update_ce_after_write() from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add classification for conv_attrs struct
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Looking good.
* en/merge-ort-3 (2020-12-15) 11 commits
- merge-ort: add implementation of type-changed rename handling
- merge-ort: add implementation of normal rename handling
- merge-ort: add implementation of rename collisions
- merge-ort: add implementation of rename/delete conflicts
- merge-ort: add implementation of both sides renaming differently
- merge-ort: add implementation of both sides renaming identically
- merge-ort: add basic outline for process_renames()
- merge-ort: implement compare_pairs() and collect_renames()
- merge-ort: implement detect_regular_renames()
- merge-ort: add initial outline for basic rename detection
- merge-ort: add basic data structures for handling renames
(this branch uses en/merge-ort-2 and en/merge-ort-impl; is tangled with en/merge-ort-recursive.)
Rename detection is added to the "ORT" merge strategy.
* jk/disambiguate-equal-in-config-param (2020-12-09) 3 commits
- config: store "git -c" variables using more robust format
- config: parse more robust format in GIT_CONFIG_PARAMETERS
- quote: make sq_dequote_step() a public function
(this branch uses ps/config-env-pairs.)
The quoting rules used to pass "git -c var=val" configuration
across processes have been updated in a backward compatible way, so
that the value read from an environment variable can contain an
equal sign when using the "git --config-env var=env" feature.
We may want to make this just a middle part of the
ps/config-env-pairs topic with a bit of patch shuffling.
* ps/config-env-pairs (2020-12-09) 6 commits
- config: allow specifying config entries via envvar pairs
- config: refactor parsing of GIT_CONFIG_PARAMETERS
- config: extract function to parse config pairs
- environment: make `getenv_safe()` non-static
- config: add new way to pass config via `--config-env`
- git: add `--super-prefix` to usage string
(this branch is used by jk/disambiguate-equal-in-config-param.)
Introduce two new ways to feed configuration variable-value pairs
via environment variables.
* bc/hashed-mailmap (2020-12-12) 1 commit
- mailmap: support hashed entries in mailmaps
The mailmap database learned to take hashed value as the original
side of mapping.
Expecting a reroll.
* so/log-diff-merge (2020-12-16) 33 commits
- t4013: add tests for --diff-merges=first-parent
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent changes merges format
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- diff-merges: add '--diff-merges=1' as synonym for 'first-parent'
- diff-merges: add old mnemonic counterparts to --diff-merges
- diff-merges: let new options enable diff without -p
- diff-merges: do not imply -p for new options
- diff-merges: handle imply -p on -c/--cc logic for log.c
- diff-merges: fix style of functions definitions
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Rerolled.
* bc/rev-parse-path-format (2020-12-12) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* en/merge-ort-impl (2020-12-13) 21 commits
- merge-ort: free data structures in merge_finalize()
- merge-ort: add implementation of record_conflicted_index_entries()
- tree: enable cmp_cache_name_compare() to be used elsewhere
- merge-ort: add implementation of checkout()
- merge-ort: basic outline for merge_switch_to_result()
- merge-ort: step 3 of tree writing -- handling subdirectories as we go
- merge-ort: step 2 of tree writing -- function to create tree object
- merge-ort: step 1 of tree writing -- record basenames, modes, and oids
- merge-ort: have process_entries operate in a defined order
- merge-ort: add a preliminary simple process_entries() implementation
- merge-ort: avoid recursing into identical trees
- merge-ort: record stage and auxiliary info for every path
- merge-ort: compute a few more useful fields for collect_merge_info
- merge-ort: avoid repeating fill_tree_descriptor() on the same tree
- merge-ort: implement a very basic collect_merge_info()
- merge-ort: add an err() function similar to one from merge-recursive
- merge-ort: use histogram diff
- merge-ort: port merge_start() from merge-recursive
- merge-ort: add some high-level algorithm structure
- merge-ort: setup basic internal data structures
- Merge branch 'en/strmap' into en/merge-ort-impl
(this branch is used by en/merge-ort-2, en/merge-ort-3 and en/merge-ort-recursive.)
The merge backend "done right" starts to emerge.
Will merge to 'next'.
* es/config-hooks (2020-12-07) 34 commits
. run-command: stop thinking about hooks
. receive-pack: convert receive hooks to hook.h
. post-update: use hook.h library
. proc-receive: acquire hook list from hook.h
. receive-pack: convert 'update' hook to hook.h
. reference-transaction: look for hooks in config
. transport: convert pre-push hook to use config
. hook: convert 'post-rewrite' hook to config
. hooks: convert 'post-checkout' hook to hook library
. git-p4: use 'git hook' to run hooks
. receive-pack: convert push-to-checkout hook to hook.h
. read-cache: convert post-index-change hook to use config
. rebase: teach pre-rebase to use hook.h
. gc: use hook library for pre-auto-gc hook
. merge: use config-based hooks for post-merge hook
. am: convert applypatch hooks to use config
. commit: use config-based hooks
. hooks: allow callers to capture output
. run-command: allow capturing of collated output
. hook: provide stdin by string_list or callback
. run-command: add stdin callback for parallelization
. hook: allow specifying working directory for hooks
. hook: allow parallel hook execution
. run-command: allow stdin for run_processes_parallel
. hook: support passing stdin to hooks
. hook: replace find_hook() with hook_exists()
. hook: add 'run' subcommand
. parse-options: parse into strvec
. hook: implement hookcmd.<name>.skip
. hook: respect hook.runHookDir
. hook: include hookdir hook in list
. hook: add list command
. hook: scaffolding for git-hook subcommand
. doc: propose hooks managed by the config
The "hooks defined in config" topic.
Ejected for now, as it has been breaking the tip of 'seen' for too
long.
* hn/reftable (2020-12-09) 15 commits
. Add "test-tool dump-reftable" command.
. git-prompt: prepare for reftable refs backend
. Reftable support for git-core
. reftable: rest of library
. reftable: reftable file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: add blocksource, an abstraction for random access reads
. reftable: utility functions
. reftable: add error related functionality
. reftable: add LICENSE
. init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
Ejected for now, as it has been breaking the tip of 'seen' for too
long.
* ab/mktag (2020-12-09) 11 commits
- SQUASH???
- mktag: allow turning off fsck.extraHeaderEntry
- fsck: make fsck_config() re-usable
- mktag doc: update to explain why to use this
- mktag: use fsck instead of custom verify_tag()
- mktag tests: improve verify_object() test coverage
- mktag tests: remove needless SHA-1 hardcoding
- mktag tests: don't needlessly use a subshell
- mktag: remove redundant braces in one-line body "if"
- mktag: use default strbuf_read() hint
- mktag doc: say <hash> not <sha1>
"git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
Expecting a reroll, but it seems getting closer.
* ab/trailers-extra-format (2020-12-09) 5 commits
(merged to 'next' on 2020-12-14 at 9fc731944e)
+ pretty format %(trailers): add a "key_value_separator"
+ pretty format %(trailers): add a "keyonly"
+ pretty-format %(trailers): fix broken standalone "valueonly"
+ pretty format %(trailers) doc: avoid repetition
+ pretty format %(trailers) test: split a long line
The "--format=%(trailers)" mechanism gets enhanced to make it
easier to design output for machine consumption.
Will cook in 'next'.
* en/diffcore-rename (2020-12-14) 9 commits
- diffcore-rename: remove unneccessary duplicate entry checks
- diffcore-rename: accelerate rename_dst setup
- diffcore-rename: simplify and accelerate register_rename_src()
- t4058: explore duplicate tree entry handling in a bit more detail
- t4058: add more tests and documentation for duplicate tree entry handling
- diffcore-rename: reduce jumpiness in progress counters
- diffcore-rename: simplify limit check
- diffcore-rename: avoid usage of global in too_many_rename_candidates()
- diffcore-rename: rename num_create to num_destinations
File-level rename detection updates.
* en/merge-ort-2 (2020-12-13) 7 commits
- merge-ort: add modify/delete handling and delayed output processing
- merge-ort: add die-not-implemented stub handle_content_merge() function
- merge-ort: add function grouping comments
- merge-ort: add a paths_to_free field to merge_options_internal
- merge-ort: add a path_conflict field to merge_options_internal
- merge-ort: add a clear_internal_opts helper
- merge-ort: add a few includes
(this branch is used by en/merge-ort-3 and en/merge-ort-recursive; uses en/merge-ort-impl.)
More "ORT" merge strategy.
Will merge to 'next'.
* fc/pull-merge-rebase (2020-12-15) 5 commits
- pull: display default warning only when non-ff
- pull: correct condition to trigger non-ff advice
- pull: get rid of unnecessary global variable
- pull: give the advice for choosing rebase/merge much later
- pull: refactor fast-forward check
When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.
* pk/subsub-fetch-fix-take-2 (2020-12-09) 1 commit
(merged to 'next' on 2020-12-14 at ccc01a5f66)
+ submodules: fix of regression on fetching of non-init subsub-repo
"git fetch --recurse-submodules" fix (second attempt).
Will cook in 'next'.
* en/stash-apply-sparse-checkout (2020-12-01) 3 commits
- stash: fix stash application in sparse-checkouts
- stash: remove unnecessary process forking
- t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
"git stash" did not work well in a sparsely checked out working
tree.
* tb/pack-bitmap (2020-12-08) 24 commits
(merged to 'next' on 2020-12-15 at 773268c2fb)
+ pack-bitmap-write: better reuse bitmaps
+ pack-bitmap-write: relax unique revwalk condition
+ pack-bitmap-write: use existing bitmaps
+ pack-bitmap: factor out 'add_commit_to_bitmap()'
+ pack-bitmap: factor out 'bitmap_for_commit()'
+ pack-bitmap-write: ignore BITMAP_FLAG_REUSE
+ pack-bitmap-write: build fewer intermediate bitmaps
+ pack-bitmap.c: check reads more aggressively when loading
+ pack-bitmap-write: rename children to reverse_edges
+ t5310: add branch-based checks
+ commit: implement commit_list_contains()
+ bitmap: implement bitmap_is_subset()
+ pack-bitmap-write: fill bitmap with commit history
+ pack-bitmap-write: pass ownership of intermediate bitmaps
+ pack-bitmap-write: reimplement bitmap writing
+ ewah: add bitmap_dup() function
+ ewah: implement bitmap_or()
+ ewah: make bitmap growth less aggressive
+ ewah: factor out bitmap growth
+ rev-list: die when --test-bitmap detects a mismatch
+ t5310: drop size of truncated ewah bitmap
+ pack-bitmap: bounds-check size of cache extension
+ pack-bitmap: fix header size check
+ ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
Various improvements to the codepath that writes out pack bitmaps.
Will cook in 'next'.
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
- tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
- t99*: adjust the references to the default branch name "main"
- tests(git-p4): transition to the default branch name `main`
- t9[5-7]*: adjust the references to the default branch name "main"
- t9[0-4]*: adjust the references to the default branch name "main"
- t8*: adjust the references to the default branch name "main"
- t7[5-9]*: adjust the references to the default branch name "main"
- t7[0-4]*: adjust the references to the default branch name "main"
- t6[4-9]*: adjust the references to the default branch name "main"
- t64*: preemptively adjust alignment to prepare for `master` -> `main`
- t6[0-3]*: adjust the references to the default branch name "main"
- t5[6-9]*: adjust the references to the default branch name "main"
- t55[4-9]*: adjust the references to the default branch name "main"
- t55[23]*: adjust the references to the default branch name "main"
- t551*: adjust the references to the default branch name "main"
- t550*: adjust the references to the default branch name "main"
- t5503: prepare aligned comment for replacing `master` with `main`
- t5[0-4]*: adjust the references to the default branch name "main"
- t5323: prepare centered comment for `master` -> `main`
- t4*: adjust the references to the default branch name "main"
- t3[5-9]*: adjust the references to the default branch name "main"
- t34*: adjust the references to the default branch name "main"
- t3416: preemptively adjust alignment in a comment
- t3[0-3]*: adjust the references to the default branch name "main"
- t2*: adjust the references to the default branch name "main"
- t[01]*: adjust the references to the default branch name "main"
- t0060: preemptively adjust alignment
- tests: mark tests relying on the current default for `init.defaultBranch`
- Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
* ds/maintenance-part-4 (2020-12-09) 6 commits
- t7900: make macOS-specific test work on Windows
- t7900: fix test failures when invoked individually via --run
- maintenance: use Windows scheduled tasks
- maintenance: use launchctl on macOS
- maintenance: include 'cron' details in docs
- maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-12-08) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Dec 2020, #02; Mon, 14)
@ 2020-12-14 20:04 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-12-14 20:04 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
A preview release 2.30-rc0 has been tagged; there are too many
topics in flight, sadly many of which haven't been adequately
reviewed. I wish we had half the number of topics that had been
reviewed twice as better, but such is life.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ae/doc-reproducible-html (2020-12-02) 1 commit
(merged to 'next' on 2020-12-08 at 263232f371)
+ doc: make HTML manual reproducible
Newer versions of xsltproc can assign IDs in HTML documents it
generates in a consistent manner. Use the feature to help format
HTML version of the user manual reproducibly.
* da/vs-build-iconv-fix (2020-12-04) 1 commit
(merged to 'next' on 2020-12-08 at 4c6c5054a3)
+ ci(vs-build): stop passing the iconv library location explicitly
Build update.
* dd/help-autocorrect-never (2020-11-25) 1 commit
(merged to 'next' on 2020-12-08 at f1531ab641)
+ help.c: help.autocorrect=never means "do not compute suggestions"
"git $cmd $args", when $cmd is not a recognised subcommand, by
default tries to see if $cmd is a typo of an existing subcommand
and optionally executes the corrected command if there is only one
possibility, depending on the setting of help.autocorrect; the
users can now disable the whole thing, including the cycles spent
to find a likely typo, by setting the configuration variable to
'never'.
* fc/atmark-in-refspec (2020-11-30) 3 commits
(merged to 'next' on 2020-12-08 at bfded23c1c)
+ refspec: make @ a synonym of HEAD
+ tests: push: trivial cleanup
+ tests: push: improve cleanup of HEAD tests
"@" sometimes worked (e.g. "git push origin @:there") as a part of
a refspec element, but "git push origin @" did not work, which has
been corrected.
* jk/check-config-parsing-error-in-upload-pack (2020-12-03) 1 commit
(merged to 'next' on 2020-12-08 at b618c7d956)
+ upload-pack: propagate return value from object filter config callback
Tighten error checking in the codepath that responds to "git fetch".
* jk/multi-line-indent-style-fix (2020-12-03) 1 commit
(merged to 'next' on 2020-12-08 at e6d1026437)
+ style: indent multiline "if" conditions to align
Style fix.
* js/cmake-extra-built-ins-fix (2020-12-04) 1 commit
(merged to 'next' on 2020-12-08 at f29945cb35)
+ cmake: determine list of extra built-ins dynamically
VSbuild fix.
* js/t5526-with-no-particular-primary-branch-name (2020-12-04) 2 commits
(merged to 'next' on 2020-12-08 at b16af9417c)
+ t5526: drop the prereq expecting the default branch name `main`
+ t5526: avoid depending on a specific default branch name
Test update.
* so/glossary-branch-is-not-necessarily-active (2020-12-02) 1 commit
(merged to 'next' on 2020-12-08 at 01805f8ab6)
+ glossary: improve "branch" definition
The glossary described a branch as an "active" line of development,
which is misleading---a stale and non-moving branch is still a
branch.
--------------------------------------------------
[New Topics]
* en/merge-ort-3 (2020-12-14) 11 commits
- merge-ort: add implementation of type-changed rename handling
- merge-ort: add implementation of normal rename handling
- merge-ort: add implementation of rename/delete conflicts
- merge-ort: add implementation of rename collisions
- merge-ort: add implementation of both sides renaming differently
- merge-ort: add implementation of both sides renaming identically
- merge-ort: add basic outline for process_renames()
- merge-ort: implement compare_pairs() and collect_renames()
- merge-ort: implement detect_regular_renames()
- merge-ort: add initial outline for basic rename detection
- merge-ort: add basic data structures for handling renames
(this branch uses en/merge-ort-2 and en/merge-ort-impl.)
Rename detection is added to the "ORT" merge strategy.
* jk/disambiguate-equal-in-config-param (2020-12-09) 3 commits
- config: store "git -c" variables using more robust format
- config: parse more robust format in GIT_CONFIG_PARAMETERS
- quote: make sq_dequote_step() a public function
(this branch uses ps/config-env-pairs.)
The quoting rules used to pass "git -c var=val" configuration
across processes have been updated in a backward compatible way, so
that the value read from an environment variable can contain an
equal sign when using the "git --config-env var=env" feature.
We may want to make this just a part of the ps/config-env-pairs
topic with a bit of patch shuffling.
* js/t7900-protect-pwd-in-config-get (2020-12-09) 1 commit
(merged to 'next' on 2020-12-14 at 61ff5e9b5b)
+ t7900: use --fixed-value in git-maintenance tests
Hotfix for test breakage.
Will merge to 'master'.
* bc/hashed-mailmap (2020-12-12) 1 commit
- mailmap: support hashed entries in mailmaps
The mailmap database learned to take hashed value as the original
side of mapping.
Expecting a reroll.
* jb/midx-doc-update (2020-12-14) 1 commit
(merged to 'next' on 2020-12-14 at 880b50e89d)
+ docs: multi-pack-index: remove note about future 'verify' work
Doc update.
Will merge to 'next' and to 'master'.
* jh/index-v2-doc-on-fsmn (2020-12-14) 1 commit
(merged to 'next' on 2020-12-14 at bd3507ccc8)
+ index-format.txt: document v2 format of file system monitor extension
Doc update.
Will merge to 'next' and to 'master'.
--------------------------------------------------
[Stalled]
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there.
cf. <85y2jiqq3c.fsf@gmail.com>
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
cf. <20201103053629.GA13228@Abhishek-Arch>
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
probably is with potential consequences that is more/less grave?
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ss/submodule-add-in-c (2020-10-07) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Needs review.
* mt/parallel-checkout-part-1 (2020-11-04) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Needs review.
* fc/bash-completion-post-2.29 (2020-11-10) 26 commits
- completion: bash: shuffle __gitcomp functions
- completion: bash: cleanup __gitcomp* invocations
- completion: bash: add __gitcomp_opts
- completion: bash: improve __gitcomp description
- completion: bash: rename _get_comp_words_by_ref()
- completion: bash: trivial cleanup
- completion: bash: cleanup _get_comp_words_by_ref()
- completion: bash: refactor _get_comp_words_by_ref()
- completion: bash: simplify _get_comp_words_by_ref()
- test: completion: switch __gitcomp_nl prefix test
- completion: bash: simplify config_variable_name
- completion: bash: improve __gitcomp suffix code
- completion: bash: change suffix check in __gitcomp
- completion: bash: simplify __gitcomp
- completion: bash: refactor __gitcomp
- completion: bash: simplify equal suffix check
- completion: bash: factor out check in __gitcomp
- completion: bash: get rid of any non-append code
- completion: bash: get rid of _append() functions
- completion: bash: remove non-append functionality
- test: completion: add run_func() helper
- test: completion: fix currently typed words
- completion: bash: do not modify COMP_WORDBREAKS
- completion: bash: fix for suboptions with value
- completion: bash: add correct suffix in variables
- completion: bash: fix prefix detection in branch.*
Needs review.
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Needs review.
--------------------------------------------------
[Cooking]
* so/log-diff-merge (2020-11-09) 27 commits
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- t4013: add test for --diff-merges=first-parent
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Expecting a reroll.
* bc/rev-parse-path-format (2020-12-12) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* en/merge-ort-impl (2020-12-13) 21 commits
- merge-ort: free data structures in merge_finalize()
- merge-ort: add implementation of record_conflicted_index_entries()
- tree: enable cmp_cache_name_compare() to be used elsewhere
- merge-ort: add implementation of checkout()
- merge-ort: basic outline for merge_switch_to_result()
- merge-ort: step 3 of tree writing -- handling subdirectories as we go
- merge-ort: step 2 of tree writing -- function to create tree object
- merge-ort: step 1 of tree writing -- record basenames, modes, and oids
- merge-ort: have process_entries operate in a defined order
- merge-ort: add a preliminary simple process_entries() implementation
- merge-ort: avoid recursing into identical trees
- merge-ort: record stage and auxiliary info for every path
- merge-ort: compute a few more useful fields for collect_merge_info
- merge-ort: avoid repeating fill_tree_descriptor() on the same tree
- merge-ort: implement a very basic collect_merge_info()
- merge-ort: add an err() function similar to one from merge-recursive
- merge-ort: use histogram diff
- merge-ort: port merge_start() from merge-recursive
- merge-ort: add some high-level algorithm structure
- merge-ort: setup basic internal data structures
- Merge branch 'en/strmap' into en/merge-ort-impl
(this branch is used by en/merge-ort-2 and en/merge-ort-3.)
The merge backend "done right" starts to emerge.
* es/config-hooks (2020-12-07) 34 commits
. run-command: stop thinking about hooks
. receive-pack: convert receive hooks to hook.h
. post-update: use hook.h library
. proc-receive: acquire hook list from hook.h
. receive-pack: convert 'update' hook to hook.h
. reference-transaction: look for hooks in config
. transport: convert pre-push hook to use config
. hook: convert 'post-rewrite' hook to config
. hooks: convert 'post-checkout' hook to hook library
. git-p4: use 'git hook' to run hooks
. receive-pack: convert push-to-checkout hook to hook.h
. read-cache: convert post-index-change hook to use config
. rebase: teach pre-rebase to use hook.h
. gc: use hook library for pre-auto-gc hook
. merge: use config-based hooks for post-merge hook
. am: convert applypatch hooks to use config
. commit: use config-based hooks
. hooks: allow callers to capture output
. run-command: allow capturing of collated output
. hook: provide stdin by string_list or callback
. run-command: add stdin callback for parallelization
. hook: allow specifying working directory for hooks
. hook: allow parallel hook execution
. run-command: allow stdin for run_processes_parallel
. hook: support passing stdin to hooks
. hook: replace find_hook() with hook_exists()
. hook: add 'run' subcommand
. parse-options: parse into strvec
. hook: implement hookcmd.<name>.skip
. hook: respect hook.runHookDir
. hook: include hookdir hook in list
. hook: add list command
. hook: scaffolding for git-hook subcommand
. doc: propose hooks managed by the config
The "hooks defined in config" topic.
Ejected for now, as it has been breaking the tip of 'seen' for too
long.
* hn/reftable (2020-12-09) 15 commits
. Add "test-tool dump-reftable" command.
. git-prompt: prepare for reftable refs backend
. Reftable support for git-core
. reftable: rest of library
. reftable: reftable file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: add blocksource, an abstraction for random access reads
. reftable: utility functions
. reftable: add error related functionality
. reftable: add LICENSE
. init-db: set the_repository->hash_algo early on
The "reftable" backend for the refs API.
* ab/mktag (2020-12-09) 11 commits
- SQUASH???
- mktag: allow turning off fsck.extraHeaderEntry
- fsck: make fsck_config() re-usable
- mktag doc: update to explain why to use this
- mktag: use fsck instead of custom verify_tag()
- mktag tests: improve verify_object() test coverage
- mktag tests: remove needless SHA-1 hardcoding
- mktag tests: don't needlessly use a subshell
- mktag: remove redundant braces in one-line body "if"
- mktag: use default strbuf_read() hint
- mktag doc: say <hash> not <sha1>
"git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
Expecting a reroll, but it seems getting closer.
* ab/trailers-extra-format (2020-12-09) 5 commits
(merged to 'next' on 2020-12-14 at 9fc731944e)
+ pretty format %(trailers): add a "key_value_separator"
+ pretty format %(trailers): add a "keyonly"
+ pretty-format %(trailers): fix broken standalone "valueonly"
+ pretty format %(trailers) doc: avoid repetition
+ pretty format %(trailers) test: split a long line
The "--format=%(trailers)" mechanism gets enhanced to make it
easier to design output for machine consumption.
Will cook in 'next'.
* en/diffcore-rename (2020-12-14) 9 commits
- diffcore-rename: remove unneccessary duplicate entry checks
- diffcore-rename: accelerate rename_dst setup
- diffcore-rename: simplify and accelerate register_rename_src()
- t4058: explore duplicate tree entry handling in a bit more detail
- t4058: add more tests and documentation for duplicate tree entry handling
- diffcore-rename: reduce jumpiness in progress counters
- diffcore-rename: simplify limit check
- diffcore-rename: avoid usage of global in too_many_rename_candidates()
- diffcore-rename: rename num_create to num_destinations
File-level rename detection updates.
* en/merge-ort-2 (2020-12-13) 7 commits
- merge-ort: add modify/delete handling and delayed output processing
- merge-ort: add die-not-implemented stub handle_content_merge() function
- merge-ort: add function grouping comments
- merge-ort: add a paths_to_free field to merge_options_internal
- merge-ort: add a path_conflict field to merge_options_internal
- merge-ort: add a clear_internal_opts helper
- merge-ort: add a few includes
(this branch is used by en/merge-ort-3; uses en/merge-ort-impl.)
More "ORT" merge strategy.
Looking good.
cf. <2ea0aab8-934f-3eaa-e3d0-9ae35a278748@gmail.com>
* fc/pull-merge-rebase (2020-12-14) 5 commits
- pull: display default warning only when non-ff
- pull: correct condition to trigger non-ff advice
- pull: get rid of unnecessary global variable
- pull: give the advice for choosing rebase/merge much later
- pull: refactor fast-forward check
When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.
* jk/oid-array-cleanup (2020-12-07) 9 commits
(merged to 'next' on 2020-12-14 at 362f6f2618)
+ commit-graph: use size_t for array allocation and indexing
+ commit-graph: replace packed_oid_list with oid_array
+ commit-graph: drop count_distinct_commits() function
+ oid-array: provide a for-loop iterator
+ oid-array: make sort function public
+ cache.h: move hash/oid functions to hash.h
+ t0064: make duplicate tests more robust
+ t0064: drop sha1 mention from filename
+ oid-array.h: drop sha1 mention from header guard
Code clean-up.
Will merge to 'master'.
* js/t6300-hardcode-main (2020-12-07) 1 commit
(merged to 'next' on 2020-12-14 at 4eed7c6a8b)
+ t6300: avoid using the default name of the initial branch
Test update.
Will merge to 'master'.
* js/t7064-master-to-initial (2020-12-08) 1 commit
(merged to 'next' on 2020-12-14 at b75529f792)
+ t7064: avoid relying on a specific default branch name
Test update.
Will merge to 'master'.
* pk/subsub-fetch-fix-take-2 (2020-12-09) 1 commit
(merged to 'next' on 2020-12-14 at ccc01a5f66)
+ submodules: fix of regression on fetching of non-init subsub-repo
"git fetch --recurse-submodules" fix (second attempt).
Will cook in 'next'.
* rj/make-clean (2020-12-08) 5 commits
(merged to 'next' on 2020-12-14 at 767b1398d7)
+ Makefile: don't use a versioned temp distribution directory
+ Makefile: don't try to clean old debian build product
+ gitweb/Makefile: conditionally include ../GIT-VERSION-FILE
+ Documentation/Makefile: conditionally include ../GIT-VERSION-FILE
+ Documentation/Makefile: conditionally include doc.dep
Build optimization.
Will merge to 'master'.
* tb/partial-clone-filters-fix (2020-12-03) 2 commits
(merged to 'next' on 2020-12-14 at d44e5942da)
+ upload-pack.c: don't free allowed_filters util pointers
+ builtin/clone.c: don't ignore transport_fetch_refs() errors
Fix potential server side resource deallocation issues when
responding to a partial clone request.
Will merge to 'master'.
* en/stash-apply-sparse-checkout (2020-12-01) 3 commits
- stash: fix stash application in sparse-checkouts
- stash: remove unnecessary process forking
- t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
"git stash" did not work well in a sparsely checked out working
tree.
* js/init-defaultbranch-advice (2020-12-13) 4 commits
- init: provide useful advice about init.defaultBranch
- get_default_branch_name(): prepare for showing some advice
- branch -m: allow renaming a yet-unborn branch
- init: document `init.defaultBranch` better
Our users are going to be trained to prepare for future change of
init.defaultBranch configuration variable.
* ps/config-env-pairs (2020-12-09) 6 commits
- config: allow specifying config entries via envvar pairs
- config: refactor parsing of GIT_CONFIG_PARAMETERS
- config: extract function to parse config pairs
- environment: make `getenv_safe()` non-static
- config: add new way to pass config via `--config-env`
- git: add `--super-prefix` to usage string
(this branch is used by jk/disambiguate-equal-in-config-param.)
Introduce two new ways to feed configuration variable-value pairs
via environment variables.
* tb/pack-bitmap (2020-12-08) 24 commits
- pack-bitmap-write: better reuse bitmaps
- pack-bitmap-write: relax unique revwalk condition
- pack-bitmap-write: use existing bitmaps
- pack-bitmap: factor out 'add_commit_to_bitmap()'
- pack-bitmap: factor out 'bitmap_for_commit()'
- pack-bitmap-write: ignore BITMAP_FLAG_REUSE
- pack-bitmap-write: build fewer intermediate bitmaps
- pack-bitmap.c: check reads more aggressively when loading
- pack-bitmap-write: rename children to reverse_edges
- t5310: add branch-based checks
- commit: implement commit_list_contains()
- bitmap: implement bitmap_is_subset()
- pack-bitmap-write: fill bitmap with commit history
- pack-bitmap-write: pass ownership of intermediate bitmaps
- pack-bitmap-write: reimplement bitmap writing
- ewah: add bitmap_dup() function
- ewah: implement bitmap_or()
- ewah: make bitmap growth less aggressive
- ewah: factor out bitmap growth
- rev-list: die when --test-bitmap detects a mismatch
- t5310: drop size of truncated ewah bitmap
- pack-bitmap: bounds-check size of cache extension
- pack-bitmap: fix header size check
- ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
Various improvement to the codepath that writes out pack bitmaps.
Will merge to 'next'.
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
- tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
- t99*: adjust the references to the default branch name "main"
- tests(git-p4): transition to the default branch name `main`
- t9[5-7]*: adjust the references to the default branch name "main"
- t9[0-4]*: adjust the references to the default branch name "main"
- t8*: adjust the references to the default branch name "main"
- t7[5-9]*: adjust the references to the default branch name "main"
- t7[0-4]*: adjust the references to the default branch name "main"
- t6[4-9]*: adjust the references to the default branch name "main"
- t64*: preemptively adjust alignment to prepare for `master` -> `main`
- t6[0-3]*: adjust the references to the default branch name "main"
- t5[6-9]*: adjust the references to the default branch name "main"
- t55[4-9]*: adjust the references to the default branch name "main"
- t55[23]*: adjust the references to the default branch name "main"
- t551*: adjust the references to the default branch name "main"
- t550*: adjust the references to the default branch name "main"
- t5503: prepare aligned comment for replacing `master` with `main`
- t5[0-4]*: adjust the references to the default branch name "main"
- t5323: prepare centered comment for `master` -> `main`
- t4*: adjust the references to the default branch name "main"
- t3[5-9]*: adjust the references to the default branch name "main"
- t34*: adjust the references to the default branch name "main"
- t3416: preemptively adjust alignment in a comment
- t3[0-3]*: adjust the references to the default branch name "main"
- t2*: adjust the references to the default branch name "main"
- t[01]*: adjust the references to the default branch name "main"
- t0060: preemptively adjust alignment
- tests: mark tests relying on the current default for `init.defaultBranch`
- Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
* ds/maintenance-part-4 (2020-12-09) 6 commits
- t7900: make macOS-specific test work on Windows
- t7900: fix test failures when invoked individually via --run
- maintenance: use Windows scheduled tasks
- maintenance: use launchctl on macOS
- maintenance: include 'cron' details in docs
- maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-12-08) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Dec 2020, #01; Tue, 8)
@ 2020-12-09 1:31 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-12-09 1:31 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
So far, the master branch accumulated 140+ merges of topic branches
containing 400+ single-parent commits. We are getting close to -rc0
and it is likely we'd have to keep some topics on 'next', rather
than rushing them to result in a broken release, during the feature
freeze. We have a bit less than 50 topics in flight, including some
stalled ones, and I expect that we can merge less than half of them
before -rc0.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors. Some
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/retire-parse-remote (2020-11-24) 4 commits
(merged to 'next' on 2020-11-25 at 644484d7df)
+ submodule: fix fetch_in_submodule logic
(merged to 'next' on 2020-11-18 at 80d4d8290c)
+ parse-remote: remove this now-unused library
+ submodule: remove sh function in favor of helper
+ submodule: use "fetch" logic instead of custom remote discovery
"git-parse-remote" shell script library outlived its usefulness.
* ds/config-literal-value (2020-11-25) 8 commits
(merged to 'next' on 2020-12-02 at 5de40589fc)
+ config doc: value-pattern is not necessarily a regexp
+ config: implement --fixed-value with --get*
+ config: plumb --fixed-value into config API
+ config: add --fixed-value option, un-implemented
+ t1300: add test for --replace-all with value-pattern
+ t1300: test "set all" mode with value-pattern
+ config: replace 'value_regex' with 'value_pattern'
+ config: convert multi_replace to flags
(this branch is used by ds/maintenance-part-3.)
Various subcommands of "git config" that takes value_regex
learn the "--literal-value" option to take the value_regex option
as a literal string.
* ds/maintenance-part-1 (2020-12-02) 1 commit
(merged to 'next' on 2020-12-02 at b06515515d)
+ Makefile: mark git-maintenance as a builtin
Build consistency fix.
* ds/maintenance-part-2 (2020-12-02) 1 commit
(merged to 'next' on 2020-12-02 at 6739aa076c)
+ t7900: speed up expensive test
Test fix.
* ds/maintenance-part-3 (2020-11-25) 2 commits
(merged to 'next' on 2020-12-02 at ee65a83d28)
+ maintenance: use 'git config --fixed-value'
+ Merge branch 'ds/config-literal-value' into ds/maintenance-part-3
(this branch uses ds/config-literal-value.)
"git maintenance" command had trouble working in a directory whose
pathname contained an ERE metacharacter like '+'.
* fc/random-cleanup (2020-12-02) 6 commits
(merged to 'next' on 2020-12-02 at 3cfe693eb8)
+ gitignore: remove entry for git serve
+ gitignore: drop duplicate entry for git-sh-i18n
+ tests: lib-functions: trivial style cleanups
+ test: completion: fix typos
+ .gitignore: remove dangling file
+ refspec: trivial cleanup
Random cleanup.
* fc/zsh-completion (2020-12-01) 1 commit
(merged to 'next' on 2020-12-02 at 78b7286a26)
+ completion: zsh: fix file completion regression
Hotfix for a recent breakage.
* jk/banned (2020-12-02) 2 commits
(merged to 'next' on 2020-12-02 at 3be67a4909)
+ banned.h: mark ctime_r() and asctime_r() as banned
+ banned.h: mark non-reentrant gmtime, etc as banned
Non-reentrant time-related library functions and ctime/asctime with
awkward calling interfaces are banned from the codebase.
* jk/stop-pack-objects-when-fetch-is-killed (2020-12-01) 1 commit
(merged to 'next' on 2020-12-02 at 9e8b8e4b81)
+ upload-pack: kill pack-objects helper on signal or exit
"git fetch" that is killed may leave a pack-objects process behind,
still computing to find a good compression, wasting cycles. This
has been corrected.
* jk/stop-pack-objects-when-push-is-killed (2020-11-21) 1 commit
(merged to 'next' on 2020-11-25 at f73fb999cd)
+ send-pack: kill pack-objects helper on signal or exit
"git push" that is killed may leave a pack-objects process behind,
still computing to find a good compression, wasting cycles. This
has been corrected.
* js/add-i-color-fix (2020-11-16) 11 commits
(merged to 'next' on 2020-11-30 at 5cb8202cd4)
+ add -i: verify in the tests that colors can be overridden
+ add -p: prefer color.diff.context over color.diff.plain
+ add -i (Perl version): color header to match the C version
+ add -i (built-in): use the same indentation as the Perl version
+ add -p (built-in): do not color the progress indicator separately
+ add -i (built-in): use correct names to load color.diff.* config
+ add -i (built-in): prevent the `reset` "color" from being configured
+ add -i: use `reset_color` consistently
+ add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers
+ add -i (built-in): send error messages to stderr
+ add -i (built-in): do show an error message for incorrect inputs
"git add -i" failed to honor custom colors configured to show
patches, which has been corrected.
cf. <20201117015149.GC19433@coredump.intra.peff.net>
* js/trace2-session-id (2020-11-11) 11 commits
(merged to 'next' on 2020-12-02 at b6229e069f)
+ receive-pack: log received client session ID
+ send-pack: advertise session ID in capabilities
+ upload-pack, serve: log received client session ID
+ fetch-pack: advertise session ID in capabilities
+ transport: log received server session ID
+ serve: advertise session ID in v2 capabilities
+ receive-pack: advertise session ID in v0 capabilities
+ upload-pack: advertise session ID in v0 capabilities
+ trace2: add a public function for getting the SID
+ docs: new transfer.advertiseSID option
+ docs: new capability to advertise session IDs
The transport layer was taught to optionally exchange the session
ID assigned by the trace2 subsystem during fetch/push transactions.
* jt/trace-error-on-warning (2020-11-24) 1 commit
(merged to 'next' on 2020-11-30 at 1ab8a970f8)
+ usage: add trace2 entry upon warning()
Like die() and error(), a call to warning() will also trigger a
trace2 event.
* ma/grep-init-default (2020-11-30) 4 commits
(merged to 'next' on 2020-12-02 at 6240fa114e)
+ MyFirstObjectWalk: drop `init_walken_defaults()`
+ grep: copy struct in one fell swoop
+ grep: use designated initializers for `grep_defaults`
+ grep: don't set up a "default" repo for grep
Code clean-up.
* mt/do-not-use-scld-in-working-tree (2020-12-02) 1 commit
(merged to 'next' on 2020-12-02 at c1c0a6c31e)
+ apply: don't use core.sharedRepository to create working tree files
"git apply" adjusted the permission bits of working-tree files and
directories according core.sharedRepository setting by mistake and
for a long time, which has been corrected.
* nk/perf-fsmonitor-cleanup (2020-11-30) 1 commit
(merged to 'next' on 2020-12-02 at 3096e954be)
+ perf/fsmonitor: use test_must_be_empty helper
Test clean-up.
* nm/imap-send-use-default-config (2020-12-01) 1 commit
(merged to 'next' on 2020-12-02 at 08f4f483b2)
+ imap-send: parse default git config
"git imap-send" used to ignore configuration variables like
core.askpass; this has been corrected.
* pb/pull-rebase-recurse-submodules (2020-11-16) 4 commits
(merged to 'next' on 2020-11-25 at 9837b50d7f)
+ pull: check for local submodule modifications with the right range
+ t5572: describe '--rebase' tests a little more
+ t5572: add notes on a peculiar test
+ pull --rebase: compute rebase arguments in separate function
"git pull --rebase --recurse-submodules" checked for local changes
in a wrong range and failed to run correctly when it should.
* pk/subsub-fetch-fix (2020-12-02) 1 commit
(merged to 'next' on 2020-12-02 at b15a3da5d8)
+ Revert "submodules: fix of regression on fetching of non-init subsub-repo"
An earlier attempt to fix "git fetch --recurse-submodules" broke
another use case; revert it until a better fix is found.
* ps/update-ref-multi-transaction (2020-11-16) 4 commits
(merged to 'next' on 2020-11-30 at c1c3e23374)
+ update-ref: disallow "start" for ongoing transactions
+ p1400: use `git-update-ref --stdin` to test multiple transactions
+ update-ref: allow creation of multiple transactions
+ t1400: avoid touching refs on filesystem
"git update-ref --stdin" learns to take multiple transactions in a
single session.
* rs/fetch-pack-invalid-lockfile (2020-11-30) 1 commit
(merged to 'next' on 2020-12-02 at 39356747b4)
+ fetch-pack: disregard invalid pack lockfiles
"fetch-pack" could pass NULL pointer to unlink(2) when it sees an
invalid filename; the error checking has been tightened to make
this impossible.
* rs/maintenance-run-outside-repo (2020-11-30) 1 commit
(merged to 'next' on 2020-12-02 at ccfbe5991d)
+ maintenance: fix SEGFAULT when no repository
"git maintenance run/start/stop" needed to be run in a repository
to hold the lockfile they use, but didn't make sure they are
actually in a repository, which has been corrected.
* sn/config-doc-typofix (2020-12-01) 1 commit
(merged to 'next' on 2020-12-02 at 2d62912243)
+ config.txt: fix a typo (backslash != backquote)
Fix for an old typo.
* tb/bugreport-no-localtime (2020-12-01) 1 commit
(merged to 'next' on 2020-12-02 at ca245d2b01)
+ builtin/bugreport.c: use thread-safe localtime_r()
Use of non-reentrant localtime() has been removed.
* tb/idx-midx-race-fix (2020-11-25) 2 commits
(merged to 'next' on 2020-11-30 at 493ded178e)
+ midx.c: protect against disappearing packs
+ packfile.c: protect against disappearing indexes
Processes that access packdata while the .idx file gets removed
(e.g. while repacking) did not fail or fall back gracefully as they
could.
* tb/repack-simplify (2020-11-17) 3 commits
(merged to 'next' on 2020-11-25 at 79a98f2403)
+ builtin/repack.c: don't move existing packs out of the way
+ builtin/repack.c: keep track of what pack-objects wrote
+ repack: make "exts" array available outside cmd_repack()
Simplify the logic to deal with a repack operation that ended up
creating the same packfile.
--------------------------------------------------
[New Topics]
* ab/mktag (2020-12-01) 10 commits
- mktag doc: update to explain why to use this
- mktag: use fsck instead of custom verify_tag()
- fsck: add new "extra" checks for "mktag"
- mktag tests: improve verify_object() test coverage
- mktag tests: remove needless SHA-1 hardcoding
- mktag tests: don't needlessly use a subshell
- mktag: remove redundant braces in one-line body "if"
- mktag: reword write_object_file() error
- mktag: use default strbuf_read() hint
- mktag doc: say <hash> not <sha1>
"git mktag" validates its input using its own rules before writing
a tag object---it has been updated to share the logic with "git
fsck".
Expecting a reroll.
* so/glossary-branch-is-not-necessarily-active (2020-12-02) 1 commit
(merged to 'next' on 2020-12-08 at 01805f8ab6)
+ glossary: improve "branch" definition
The glossary described a branch as an "active" line of development,
which is misleading---a stale and non-moving branch is still a
branch.
Will merge to 'master'.
* ae/doc-reproducible-html (2020-12-02) 1 commit
(merged to 'next' on 2020-12-08 at 263232f371)
+ doc: make HTML manual reproducible
Newer versions of xsltproc can assign IDs in HTML documents it
generates in a consistent manner. Use the feature to help format
HTML version of the user manual reproducibly.
Will merge to 'master'.
* ab/trailers-extra-format (2020-12-07) 5 commits
- pretty format %(trailers): add a "key_value_separator"
- pretty format %(trailers): add a "keyonly"
- pretty-format %(trailers): fix broken standalone "valueonly"
- pretty format %(trailers) doc: avoid repetition
- pretty format %(trailers) test: split a long line
The "--format=%(trailers)" mechanism gets enhanced to make it
easier to design output for machine consumption.
* da/vs-build-iconv-fix (2020-12-04) 1 commit
(merged to 'next' on 2020-12-08 at 4c6c5054a3)
+ ci(vs-build): stop passing the iconv library location explicitly
Build update.
Will merge to 'master'.
* en/diffcore-rename (2020-12-07) 5 commits
- diffcore-rename: simplify and accelerate register_rename_src()
- diffcore-rename: reduce jumpiness in progress counters
- diffcore-rename: rename num_create to num_targets
- diffcore-rename: remove unnecessary if-clause
- diffcore-rename: avoid usage of global in too_many_rename_candidates()
File-level rename detection updates.
Needs review.
* en/merge-ort-2 (2020-12-08) 7 commits
- merge-ort: add modify/delete handling and delayed output processing
- merge-ort: add die-not-implemented stub handle_content_merge() function
- merge-ort: add function grouping comments
- merge-ort: add a paths_to_free field to merge_options_internal
- merge-ort: add a path_conflict field to merge_options_internal
- merge-ort: add a clear_internal_opts helper
- merge-ort: add a few includes
(this branch uses en/merge-ort-impl.)
More "ORT" merge strategy.
Needs review.
* fc/pull-merge-rebase (2020-12-08) 19 commits
- future: pull: enable ff-only mode by default
- pull: advice of future changes
- pull: add pull.mode=ff-only
- pull: add pull.mode
- pull: trivial memory fix
- test: pull-options: revert unnecessary changes
- test: merge-pull-config: trivial cleanup
- pull: move configurations fetches
- rebase: add REBASE_DEFAULT
- pull: show warning with --ff
- pull: introduce --merge option
- pull: trivial whitespace style fix
- pull: display default warning only when non-ff
- pull: move default warning
- pull: trivial cleanup
- pull: cleanup autostash check
- pull: refactor fast-forward check
- pull: improve default warning
- doc: pull: explain what is a fast-forward
When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation. Fix this by (1) tightening
the condition to give the message---there is no reason to stop or
force the user to choose between rebase or merge if the history
fast-forwards, and (2) failing the operation when the history does
not fast-forward, instead of making a merge, in such a case.
* jk/check-config-parsing-error-in-upload-pack (2020-12-03) 1 commit
(merged to 'next' on 2020-12-08 at b618c7d956)
+ upload-pack: propagate return value from object filter config callback
Tighten error checking in the codepath that responds to "git fetch".
Will merge to 'master'.
* jk/multi-line-indent-style-fix (2020-12-03) 1 commit
(merged to 'next' on 2020-12-08 at e6d1026437)
+ style: indent multiline "if" conditions to align
Style fix.
Will merge to 'master'.
* jk/oid-array-cleanup (2020-12-07) 9 commits
- commit-graph: use size_t for array allocation and indexing
- commit-graph: replace packed_oid_list with oid_array
- commit-graph: drop count_distinct_commits() function
- oid-array: provide a for-loop iterator
- oid-array: make sort function public
- cache.h: move hash/oid functions to hash.h
- t0064: make duplicate tests more robust
- t0064: drop sha1 mention from filename
- oid-array.h: drop sha1 mention from header guard
Code clean-up.
Will merge to 'next'.
* js/cmake-extra-built-ins-fix (2020-12-04) 1 commit
(merged to 'next' on 2020-12-08 at f29945cb35)
+ cmake: determine list of extra built-ins dynamically
VSbuild fix.
Will merge to 'master'.
* js/t5526-with-no-particular-primary-branch-name (2020-12-04) 2 commits
(merged to 'next' on 2020-12-08 at b16af9417c)
+ t5526: drop the prereq expecting the default branch name `main`
+ t5526: avoid depending on a specific default branch name
Test update.
Will merge to 'master'.
* js/t6300-hardcode-main (2020-12-07) 1 commit
- t6300: avoid using the default name of the initial branch
Test update.
Will merge to 'next'.
* js/t7064-master-to-initial (2020-12-08) 1 commit
- t7064: avoid relying on a specific default branch name
Test update.
Will merge to 'next'.
* pk/subsub-fetch-fix-take-2 (2020-12-08) 1 commit
- submodules: fix of regression on fetching of non-init subsub-repo
"git fetch --recurse-submodules" fix.
* rj/make-clean (2020-12-08) 5 commits
- Makefile: don't use a versioned temp distribution directory
- Makefile: don't try to clean old debian build product
- gitweb/Makefile: conditionally include ../GIT-VERSION-FILE
- Documentation/Makefile: conditionally include ../GIT-VERSION-FILE
- Documentation/Makefile: conditionally include doc.dep
Build optimization.
Will merge to 'next'.
* tb/partial-clone-filters-fix (2020-12-03) 2 commits
- upload-pack.c: don't free allowed_filters util pointers
- builtin/clone.c: don't ignore transport_fetch_refs() errors
Fix potential server side resource deallocation issues when
responding to a partial clone request.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* mt/grep-sparse-checkout (2020-12-06) 10 commits
- t7817: do not depend on any specific default branch name
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* mt/rm-sparse-checkout (2020-12-08) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
probably is with potential consequences that is more/less grave?
* es/config-hooks (2020-12-07) 34 commits
- run-command: stop thinking about hooks
- receive-pack: convert receive hooks to hook.h
- post-update: use hook.h library
- proc-receive: acquire hook list from hook.h
- receive-pack: convert 'update' hook to hook.h
- reference-transaction: look for hooks in config
- transport: convert pre-push hook to use config
- hook: convert 'post-rewrite' hook to config
- hooks: convert 'post-checkout' hook to hook library
- git-p4: use 'git hook' to run hooks
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change hook to use config
- rebase: teach pre-rebase to use hook.h
- gc: use hook library for pre-auto-gc hook
- merge: use config-based hooks for post-merge hook
- am: convert applypatch hooks to use config
- commit: use config-based hooks
- hooks: allow callers to capture output
- run-command: allow capturing of collated output
- hook: provide stdin by string_list or callback
- run-command: add stdin callback for parallelization
- hook: allow specifying working directory for hooks
- hook: allow parallel hook execution
- run-command: allow stdin for run_processes_parallel
- hook: support passing stdin to hooks
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: respect hook.runHookDir
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Seems to break some tests in 'seen'.
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-10-09) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ss/submodule-add-in-c (2020-10-07) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Needs review.
* mt/parallel-checkout-part-1 (2020-11-04) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Needs review.
* fc/bash-completion-post-2.29 (2020-11-10) 26 commits
- completion: bash: shuffle __gitcomp functions
- completion: bash: cleanup __gitcomp* invocations
- completion: bash: add __gitcomp_opts
- completion: bash: improve __gitcomp description
- completion: bash: rename _get_comp_words_by_ref()
- completion: bash: trivial cleanup
- completion: bash: cleanup _get_comp_words_by_ref()
- completion: bash: refactor _get_comp_words_by_ref()
- completion: bash: simplify _get_comp_words_by_ref()
- test: completion: switch __gitcomp_nl prefix test
- completion: bash: simplify config_variable_name
- completion: bash: improve __gitcomp suffix code
- completion: bash: change suffix check in __gitcomp
- completion: bash: simplify __gitcomp
- completion: bash: refactor __gitcomp
- completion: bash: simplify equal suffix check
- completion: bash: factor out check in __gitcomp
- completion: bash: get rid of any non-append code
- completion: bash: get rid of _append() functions
- completion: bash: remove non-append functionality
- test: completion: add run_func() helper
- test: completion: fix currently typed words
- completion: bash: do not modify COMP_WORDBREAKS
- completion: bash: fix for suboptions with value
- completion: bash: add correct suffix in variables
- completion: bash: fix prefix detection in branch.*
Needs review.
* so/log-diff-merge (2020-11-09) 27 commits
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- t4013: add test for --diff-merges=first-parent
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Needs review.
* en/merge-ort-impl (2020-12-06) 21 commits
- merge-ort: free data structures in merge_finalize()
- merge-ort: add implementation of record_conflicted_index_entries()
- tree: enable cmp_cache_name_compare() to be used elsewhere
- merge-ort: add implementation of checkout()
- merge-ort: basic outline for merge_switch_to_result()
- merge-ort: step 3 of tree writing -- handling subdirectories as we go
- merge-ort: step 2 of tree writing -- function to create tree object
- merge-ort: step 1 of tree writing -- record basenames, modes, and oids
- merge-ort: have process_entries operate in a defined order
- merge-ort: add a preliminary simple process_entries() implementation
- merge-ort: avoid recursing into identical trees
- merge-ort: record stage and auxiliary info for every path
- merge-ort: compute a few more useful fields for collect_merge_info
- merge-ort: avoid repeating fill_tree_descriptor() on the same tree
- merge-ort: implement a very basic collect_merge_info()
- merge-ort: add an err() function similar to one from merge-recursive
- merge-ort: use histogram diff
- merge-ort: port merge_start() from merge-recursive
- merge-ort: add some high-level algorithm structure
- merge-ort: setup basic internal data structures
- Merge branch 'en/strmap' into en/merge-ort-impl
(this branch is used by en/merge-ort-2.)
Needs review.
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Needs review.
--------------------------------------------------
[Cooking]
* en/stash-apply-sparse-checkout (2020-12-01) 3 commits
- stash: fix stash application in sparse-checkouts
- stash: remove unnecessary process forking
- t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
"git stash" did not work well in a sparsely checked out working
tree.
* fc/atmark-in-refspec (2020-11-30) 3 commits
(merged to 'next' on 2020-12-08 at bfded23c1c)
+ refspec: make @ a synonym of HEAD
+ tests: push: trivial cleanup
+ tests: push: improve cleanup of HEAD tests
"@" sometimes worked (e.g. "git push origin @:there") as a part of
a refspec element, but "git push origin @" did not work, which has
been corrected.
Will merge to 'master'.
* js/init-defaultbranch-advice (2020-11-24) 4 commits
- init: provide useful advice about init.defaultBranch
- get_default_branch_name(): prepare for showing some advice
- branch -m: allow renaming a yet-unborn branch
- init: document `init.defaultBranch` better
Our users are going to be trained to prepare for future change of
init.defaultBranch configuration variable.
Expecting a reroll.
cf. <xmqq8saqjx2n.fsf@gitster.c.googlers.com>
I think a new advice.defaultBranchName is a bad idea.
* ps/config-env-pairs (2020-12-01) 4 commits
- config: allow specifying config entries via envvar pairs
- config: refactor parsing of GIT_CONFIG_PARAMETERS
- config: extract function to parse config pairs
- environment: make `getenv_safe()` non-static
Introduce a way to feed configuration variable-value pairs via
environment variables.
Will discard.
I am leaning toward dropping this new feature. The review
discussion seems to me that we are not convinced that this is
better than the suggested --config-env approach.
cf. <20201125224737.GK389879@camp.crustytoothpaste.net>
* tb/pack-bitmap (2020-12-08) 24 commits
- pack-bitmap-write: better reuse bitmaps
- pack-bitmap-write: relax unique revwalk condition
- pack-bitmap-write: use existing bitmaps
- pack-bitmap: factor out 'add_commit_to_bitmap()'
- pack-bitmap: factor out 'bitmap_for_commit()'
- pack-bitmap-write: ignore BITMAP_FLAG_REUSE
- pack-bitmap-write: build fewer intermediate bitmaps
- pack-bitmap.c: check reads more aggressively when loading
- pack-bitmap-write: rename children to reverse_edges
- t5310: add branch-based checks
- commit: implement commit_list_contains()
- bitmap: implement bitmap_is_subset()
- pack-bitmap-write: fill bitmap with commit history
- pack-bitmap-write: pass ownership of intermediate bitmaps
- pack-bitmap-write: reimplement bitmap writing
- ewah: add bitmap_dup() function
- ewah: implement bitmap_or()
- ewah: make bitmap growth less aggressive
- ewah: factor out bitmap growth
- rev-list: die when --test-bitmap detects a mismatch
- t5310: drop size of truncated ewah bitmap
- pack-bitmap: bounds-check size of cache extension
- pack-bitmap: fix header size check
- ewah/ewah_bitmap.c: avoid open-coding ALLOC_GROW()
Various improvement to the codepath that writes out pack bitmaps.
Will merge to 'next'?
* dd/help-autocorrect-never (2020-11-25) 1 commit
(merged to 'next' on 2020-12-08 at f1531ab641)
+ help.c: help.autocorrect=never means "do not compute suggestions"
"git $cmd $args", when $cmd is not a recognised subcommand, by
default tries to see if $cmd is a typo of an existing subcommand
and optionally executes the corrected command if there is only one
possibility, depending on the setting of help.autocorrect; the
users can now disable the whole thing, including the cycles spent
to find a likely typo, by setting the configuration variable to
'never'.
Will merge to 'master'.
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
- tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
- t99*: adjust the references to the default branch name "main"
- tests(git-p4): transition to the default branch name `main`
- t9[5-7]*: adjust the references to the default branch name "main"
- t9[0-4]*: adjust the references to the default branch name "main"
- t8*: adjust the references to the default branch name "main"
- t7[5-9]*: adjust the references to the default branch name "main"
- t7[0-4]*: adjust the references to the default branch name "main"
- t6[4-9]*: adjust the references to the default branch name "main"
- t64*: preemptively adjust alignment to prepare for `master` -> `main`
- t6[0-3]*: adjust the references to the default branch name "main"
- t5[6-9]*: adjust the references to the default branch name "main"
- t55[4-9]*: adjust the references to the default branch name "main"
- t55[23]*: adjust the references to the default branch name "main"
- t551*: adjust the references to the default branch name "main"
- t550*: adjust the references to the default branch name "main"
- t5503: prepare aligned comment for replacing `master` with `main`
- t5[0-4]*: adjust the references to the default branch name "main"
- t5323: prepare centered comment for `master` -> `main`
- t4*: adjust the references to the default branch name "main"
- t3[5-9]*: adjust the references to the default branch name "main"
- t34*: adjust the references to the default branch name "main"
- t3416: preemptively adjust alignment in a comment
- t3[0-3]*: adjust the references to the default branch name "main"
- t2*: adjust the references to the default branch name "main"
- t[01]*: adjust the references to the default branch name "main"
- t0060: preemptively adjust alignment
- tests: mark tests relying on the current default for `init.defaultBranch`
- Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
* ds/maintenance-part-4 (2020-12-01) 6 commits
- t7900: make macOS-specific test work on Windows
- t7900: fix test failures when invoked individually via --run
- maintenance: use Windows scheduled tasks
- maintenance: use launchctl on macOS
- maintenance: include 'cron' details in docs
- maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
Almost there.
cf. <CAPig+cQ6vZzbb36t5Kn=NM9wXC8i1MpcGXfK=QwnNRoTQsQP0A@mail.gmail.com>
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-12-08) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there.
cf. <85y2jiqq3c.fsf@gmail.com>
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
cf. <20201103053629.GA13228@Abhishek-Arch>
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Nov 2020, #06; Mon, 30)
@ 2020-12-01 5:15 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-12-01 5:15 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into. Some repositories have
only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/gc-keep-base-option (2020-11-21) 2 commits
(merged to 'next' on 2020-11-25 at ac76ddcfe7)
+ gc: rename keep_base_pack variable for --keep-largest-pack
+ gc docs: change --keep-base-pack to --keep-largest-pack
Fix an option name in "gc" documentation.
* hn/sleep-millisec-decl (2020-11-24) 1 commit
(merged to 'next' on 2020-11-25 at d11de8b987)
+ move sleep_millisec to git-compat-util.h
Move a definition of compatibility wrapper from cache.h to
git-compat-util.h
* jc/do-not-just-explain-but-update-your-patch (2020-11-24) 1 commit
(merged to 'next' on 2020-11-25 at 1f5235d4e1)
+ MyFirstContribition: answering questions is not the end of the story
Expectation for the original contributor after responding to a
review comment to use the explanation in a patch update has been
described.
* js/pull-rebase-use-advise (2020-11-19) 1 commit
(merged to 'next' on 2020-11-25 at 05db775119)
+ pull: colorize the hint about setting `pull.rebase`
UI improvement.
* js/t1309-master-to-topic (2020-11-19) 1 commit
(merged to 'next' on 2020-11-25 at 044da285ef)
+ t1309: use a neutral branch name in the `onbranch` test cases
Test preparation.
* js/t2106-cleanup (2020-11-18) 3 commits
(merged to 'next' on 2020-11-23 at b1bcd5d8b2)
+ t2106: ensure that the checkout fails for the expected reason
+ t2106: make test independent of the current main branch name
+ t2106: adjust style to the current conventions
A test script got cleaned up and then made not to depend on the
value of init.defaultBranch.
* js/t3040-cleanup (2020-11-18) 1 commit
(merged to 'next' on 2020-11-23 at 88951eae2f)
+ t3040: remove stale note
Cleanup.
* js/t3404-master-to-primary (2020-11-24) 1 commit
(merged to 'next' on 2020-11-25 at c2959cc831)
+ t3404: do not depend on any specific default branch name
A test script got cleaned up and then made not to depend on the
value of init.defaultBranch.
* js/t4015-wo-master (2020-11-19) 1 commit
(merged to 'next' on 2020-11-23 at b85c36ffb4)
+ t4015: let the test pass with any default branch name
A test script got cleaned up not to depend on the value of
init.defaultBranch.
* km/stash-error-message-fix (2020-11-24) 1 commit
(merged to 'next' on 2020-11-25 at 9ef82d6aa7)
+ stash: add missing space to an error message
Error message fix.
* mt/worktree-error-message-fix (2020-11-21) 1 commit
(merged to 'next' on 2020-11-25 at bc887168ff)
+ worktree: fix order of arguments in error message
Fix formulation of an error message with two placeholders in "git
worktree add" subcommand.
* na/notes-displayref-is-not-boolean (2020-11-23) 2 commits
(merged to 'next' on 2020-11-25 at b0dda46b56)
+ t3301: test proper exit response to no-value notes.displayRef.
+ notes.c: fix a segfault in notes_display_config()
Config parser fix for "git notes".
* sa/credential-store-timeout (2020-11-25) 1 commit
(merged to 'next' on 2020-11-25 at 7a9a4b68fd)
+ crendential-store: use timeout when locking file
Multiple "credential-store" backends can race to lock the same
file, causing everybody else but one to fail---reattempt locking
with some timeout to reduce the rate of the failure.
--------------------------------------------------
[New Topics]
* nk/perf-fsmonitor-cleanup (2020-11-30) 1 commit
- perf/fsmonitor: use test_must_be_empty helper
Test clean-up.
Will merge to 'next'.
* rs/fetch-pack-invalid-lockfile (2020-11-30) 1 commit
- fetch-pack: disregard invalid pack lockfiles
"fetch-pack" could pass NULL pointer to unlink(2) when it sees an
invalid filename; the error checking has been tightened to make
this impossible.
Will merge to 'next'.
* rs/maintenance-run-outside-repo (2020-11-30) 1 commit
- maintenance: fix SEGFAULT when no repository
"git maintenance run/start/stop" needed to be run in a repository
to hold the lockfile they use, but didn't make sure they are
actually in a repository, which has been corrected.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* mt/rm-sparse-checkout (2020-11-16) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
probably is with potential consequences that is more/less grave?
* es/config-hooks (2020-10-16) 8 commits
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-10-09) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ss/submodule-add-in-c (2020-10-07) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Needs review.
* mt/parallel-checkout-part-1 (2020-11-04) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Needs review.
* fc/bash-completion-post-2.29 (2020-11-10) 26 commits
- completion: bash: shuffle __gitcomp functions
- completion: bash: cleanup __gitcomp* invocations
- completion: bash: add __gitcomp_opts
- completion: bash: improve __gitcomp description
- completion: bash: rename _get_comp_words_by_ref()
- completion: bash: trivial cleanup
- completion: bash: cleanup _get_comp_words_by_ref()
- completion: bash: refactor _get_comp_words_by_ref()
- completion: bash: simplify _get_comp_words_by_ref()
- test: completion: switch __gitcomp_nl prefix test
- completion: bash: simplify config_variable_name
- completion: bash: improve __gitcomp suffix code
- completion: bash: change suffix check in __gitcomp
- completion: bash: simplify __gitcomp
- completion: bash: refactor __gitcomp
- completion: bash: simplify equal suffix check
- completion: bash: factor out check in __gitcomp
- completion: bash: get rid of any non-append code
- completion: bash: get rid of _append() functions
- completion: bash: remove non-append functionality
- test: completion: add run_func() helper
- test: completion: fix currently typed words
- completion: bash: do not modify COMP_WORDBREAKS
- completion: bash: fix for suboptions with value
- completion: bash: add correct suffix in variables
- completion: bash: fix prefix detection in branch.*
Needs review.
* so/log-diff-merge (2020-11-09) 27 commits
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- t4013: add test for --diff-merges=first-parent
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Needs review.
* en/merge-ort-impl (2020-11-11) 21 commits
- merge-ort: free data structures in merge_finalize()
- merge-ort: add implementation of record_unmerged_index_entries()
- tree: enable cmp_cache_name_compare() to be used elsewhere
- merge-ort: add implementation of checkout()
- merge-ort: basic outline for merge_switch_to_result()
- merge-ort: step 3 of tree writing -- handling subdirectories as we go
- merge-ort: step 2 of tree writing -- function to create tree object
- merge-ort: step 1 of tree writing -- record basenames, modes, and oids
- merge-ort: have process_entries operate in a defined order
- merge-ort: add a preliminary simple process_entries() implementation
- merge-ort: avoid recursing into identical trees
- merge-ort: record stage and auxiliary info for every path
- merge-ort: compute a few more useful fields for collect_merge_info
- merge-ort: avoid repeating fill_tree_descriptor() on the same tree
- merge-ort: implement a very basic collect_merge_info()
- merge-ort: add an err() function similar to one from merge-recursive
- merge-ort: use histogram diff
- merge-ort: port merge_start() from merge-recursive
- merge-ort: add some high-level algorithm structure
- merge-ort: setup basic internal data structures
- Merge branch 'en/strmap' into en/merge-ort-impl
Needs review.
A reroll exists.
cf. <pull.923.git.git.1606635803.gitgitgadget@gmail.com>
--------------------------------------------------
[Cooking]
* en/stash-apply-sparse-checkout (2020-11-21) 3 commits
- stash: fix stash application in sparse-checkouts
- stash: remove unnecessary process forking
- t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
* jk/stop-pack-objects-when-push-is-killed (2020-11-21) 1 commit
(merged to 'next' on 2020-11-25 at f73fb999cd)
+ send-pack: kill pack-objects helper on signal or exit
Receiving "git push" that is killed may leave zombie pack-objects
process behind, which has been corrected.
Will merge to 'master'.
* ma/grep-init-default (2020-11-30) 4 commits
- MyFirstObjectWalk: drop `init_walken_defaults()`
- grep: copy struct in one fell swoop
- grep: use designated initializers for `grep_defaults`
- grep: don't set up a "default" repo for grep
Code clean-up.
Will merge to 'next'.
* fc/atmark-in-refspec (2020-11-30) 3 commits
- refspec: make @ a synonym of HEAD
- tests: push: trivial cleanup
- tests: push: improve cleanup of HEAD tests
"@" sometimes worked (e.g. "git push origin @:there") as a part of
a refspec element, but "git push orign @" did not work, which has
been corrected.
* js/init-defaultbranch-advice (2020-11-24) 4 commits
- init: provide useful advice about init.defaultBranch
- get_default_branch_name(): prepare for showing some advice
- branch -m: allow renaming a yet-unborn branch
- init: document `init.defaultBranch` better
Our users are going to be trained to prepare for future change of
init.defaultBranch configuration variable.
* jt/trace-error-on-warning (2020-11-24) 1 commit
(merged to 'next' on 2020-11-30 at 1ab8a970f8)
+ usage: add trace2 entry upon warning()
Like die() and error(), a call to warning() will also trigger a
trace2 event.
Will merge to 'master'.
* ps/config-env-pairs (2020-11-24) 2 commits
- config: allow specifying config entries via envvar pairs
- config: extract function to parse config pairs
Introduce a way to feed configuration variable-value pairs via
environment variables.
Getting there.
cf. <X74CigYS7AUtMo9Q@tanuki>
* tb/idx-midx-race-fix (2020-11-25) 2 commits
(merged to 'next' on 2020-11-30 at 493ded178e)
+ midx.c: protect against disappearing packs
+ packfile.c: protect against disappearing indexes
Processes that access packdata while the .idx file gets removed
(e.g. while repacking) did not fail or fall back gracefully as they
could.
Will merge to 'master'.
* rs/stop-pack-objects-when-fetch-is-killed (2020-11-25) 1 commit
- upload-pack: kill pack-objects helper on signal or exit
"git upload-pack" that is killed may leave zombie pack-objects
process behind, which has been corrected.
Needs to be replaced with signed-off and/or improved version.
* tb/pack-bitmap (2020-11-21) 24 commits
- pack-bitmap-write: better reuse bitmaps
- pack-bitmap-write: relax unique rewalk condition
- pack-bitmap-write: use existing bitmaps
- pack-bitmap: factor out 'add_commit_to_bitmap()'
- pack-bitmap: factor out 'bitmap_for_commit()'
- pack-bitmap-write: ignore BITMAP_FLAG_REUSE
- pack-bitmap-write: build fewer intermediate bitmaps
- pack-bitmap.c: check reads more aggressively when loading
- pack-bitmap-write: rename children to reverse_edges
- t5310: add branch-based checks
- commit: implement commit_list_contains()
- bitmap: add bitmap_diff_nonzero()
- pack-bitmap-write: fill bitmap with commit history
- pack-bitmap-write: pass ownership of intermediate bitmaps
- pack-bitmap-write: reimplement bitmap writing
- ewah: add bitmap_dup() function
- ewah: implement bitmap_or()
- ewah: make bitmap growth less aggressive
- ewah: factor out bitmap growth
- rev-list: die when --test-bitmap detects a mismatch
- t5310: drop size of truncated ewah bitmap
- pack-bitmap: bounds-check size of cache extension
- pack-bitmap: fix header size check
- ewah/ewah_bitmap.c: grow buffer past 1
Various improvement to the codepath that writes out pack bitmaps.
Needs a bit of reshuffling?
cf. <X7xzWClGr3bM3wcg@coredump.intra.peff.net>
* ab/retire-parse-remote (2020-11-24) 4 commits
(merged to 'next' on 2020-11-25 at 644484d7df)
+ submodule: fix fetch_in_submodule logic
(merged to 'next' on 2020-11-18 at 80d4d8290c)
+ parse-remote: remove this now-unused library
+ submodule: remove sh function in favor of helper
+ submodule: use "fetch" logic instead of custom remote discovery
"git-parse-remote" shell script library outlived its usefulness.
Will merge to 'master'.
* pb/pull-rebase-recurse-submodules (2020-11-16) 4 commits
(merged to 'next' on 2020-11-25 at 9837b50d7f)
+ pull: check for local submodule modifications with the right range
+ t5572: describe '--rebase' tests a little more
+ t5572: add notes on a peculiar test
+ pull --rebase: compute rebase arguments in separate function
"git pull --rebase --recurse-submodules" checked for local changes
in a wrong range and failed to run correctly when it should.
Will merge to 'master'.
* tb/repack-simplify (2020-11-17) 3 commits
(merged to 'next' on 2020-11-25 at 79a98f2403)
+ builtin/repack.c: don't move existing packs out of the way
+ builtin/repack.c: keep track of what pack-objects wrote
+ repack: make "exts" array available outside cmd_repack()
Simplify the logic to deal with a repack operation that ended up
creating the same packfile.
Will merge to 'master'.
* dd/help-autocorrect-never (2020-11-25) 1 commit
- help.c: help.autocorrect=never means "do not compute suggestions"
"git $cmd $args", when $cmd is not a recognised subcommand, by
default tries to see if $cmd is a typo of an existing subcommand
and optionally executes the corrected command if there is only one
possibility, depending on the setting of help.autocorrect; the
users can now disable the whole thing, including the cycles spent
to find a likely typo, by setting the configuration variable to
'never'.
Getting there.
cf. <xmqqft4xdubq.fsf_-_@gitster.c.googlers.com>
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
- tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
- t99*: adjust the references to the default branch name "main"
- tests(git-p4): transition to the default branch name `main`
- t9[5-7]*: adjust the references to the default branch name "main"
- t9[0-4]*: adjust the references to the default branch name "main"
- t8*: adjust the references to the default branch name "main"
- t7[5-9]*: adjust the references to the default branch name "main"
- t7[0-4]*: adjust the references to the default branch name "main"
- t6[4-9]*: adjust the references to the default branch name "main"
- t64*: preemptively adjust alignment to prepare for `master` -> `main`
- t6[0-3]*: adjust the references to the default branch name "main"
- t5[6-9]*: adjust the references to the default branch name "main"
- t55[4-9]*: adjust the references to the default branch name "main"
- t55[23]*: adjust the references to the default branch name "main"
- t551*: adjust the references to the default branch name "main"
- t550*: adjust the references to the default branch name "main"
- t5503: prepare aligned comment for replacing `master` with `main`
- t5[0-4]*: adjust the references to the default branch name "main"
- t5323: prepare centered comment for `master` -> `main`
- t4*: adjust the references to the default branch name "main"
- t3[5-9]*: adjust the references to the default branch name "main"
- t34*: adjust the references to the default branch name "main"
- t3416: preemptively adjust alignment in a comment
- t3[0-3]*: adjust the references to the default branch name "main"
- t2*: adjust the references to the default branch name "main"
- t[01]*: adjust the references to the default branch name "main"
- t0060: preemptively adjust alignment
- tests: mark tests relying on the current default for `init.defaultBranch`
- Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
* ds/config-literal-value (2020-11-25) 8 commits
- config doc: value-pattern is not necessarily a regexp
- config: implement --fixed-value with --get*
- config: plumb --fixed-value into config API
- config: add --fixed-value option, un-implemented
- t1300: add test for --replace-all with value-pattern
- t1300: test "set all" mode with value-pattern
- config: replace 'value_regex' with 'value_pattern'
- config: convert multi_replace to flags
(this branch is used by ds/maintenance-part-3.)
Various subcommands of "git config" that takes value_regex
learn the "--literal-value" option to take the value_regex option
as a literal string.
Expecting a (hopefully final) reroll.
* ds/maintenance-part-3 (2020-11-25) 2 commits
- maintenance: use 'git config --fixed-value'
- Merge branch 'ds/config-literal-value' into ds/maintenance-part-3
(this branch uses ds/config-literal-value.)
"git maintenance" command had trouble working in a directory whose
pathname contained an ERE metacharacter like '+'.
Blocked by ds/config-literal-value.
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Needs review.
* ps/update-ref-multi-transaction (2020-11-16) 4 commits
(merged to 'next' on 2020-11-30 at c1c3e23374)
+ update-ref: disallow "start" for ongoing transactions
+ p1400: use `git-update-ref --stdin` to test multiple transactions
+ update-ref: allow creation of multiple transactions
+ t1400: avoid touching refs on filesystem
"git update-ref --stdin" learns to take multiple transactions in a
single session.
Will merge to 'master'.
* js/add-i-color-fix (2020-11-16) 11 commits
(merged to 'next' on 2020-11-30 at 5cb8202cd4)
+ add -i: verify in the tests that colors can be overridden
+ add -p: prefer color.diff.context over color.diff.plain
+ add -i (Perl version): color header to match the C version
+ add -i (built-in): use the same indentation as the Perl version
+ add -p (built-in): do not color the progress indicator separately
+ add -i (built-in): use correct names to load color.diff.* config
+ add -i (built-in): prevent the `reset` "color" from being configured
+ add -i: use `reset_color` consistently
+ add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers
+ add -i (built-in): send error messages to stderr
+ add -i (built-in): do show an error message for incorrect inputs
"git add -i" failed to honor custom colors configured to show
patches, which has been corrected.
Will merge to 'master'.
cf. <20201117015149.GC19433@coredump.intra.peff.net>
* js/trace2-session-id (2020-11-11) 11 commits
- receive-pack: log received client session ID
- send-pack: advertise session ID in capabilities
- upload-pack, serve: log received client session ID
- fetch-pack: advertise session ID in capabilities
- transport: log received server session ID
- serve: advertise session ID in v2 capabilities
- receive-pack: advertise session ID in v0 capabilities
- upload-pack: advertise session ID in v0 capabilities
- trace2: add a public function for getting the SID
- docs: new transfer.advertiseSID option
- docs: new capability to advertise session IDs
The transport layer was taught to optionally exchange the session
ID assigned by the trace2 subsystem during fetch/push transactions.
Will merge to 'next'.
* ds/maintenance-part-4 (2020-11-24) 4 commits
- maintenance: use Windows scheduled tasks
- maintenance: use launchctl on macOS
- maintenance: include 'cron' details in docs
- maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
Needs doc update and also adjusting "git status".
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there.
cf. <85y2jiqq3c.fsf@gmail.com>
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
cf. <20201103053629.GA13228@Abhishek-Arch>
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Nov 2020, #05; Wed, 25)
@ 2020-11-26 0:58 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-11-26 0:58 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The number of topics merged for the next release since Git 2.29 has
just passed 100 after the 8th batch of them have graduated.
I expect the rest of the week would be slower than usual, due to US
being holiday.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into. Some repositories have
only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/config-mak-uname-simplify (2020-11-11) 2 commits
(merged to 'next' on 2020-11-12 at e1bd51ee71)
+ config.mak.uname: remove unused NEEDS_SSL_WITH_CURL flag
+ config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag
Build configuration cleanup.
* en/strmap (2020-11-11) 15 commits
(merged to 'next' on 2020-11-12 at 41519a5f5c)
+ shortlog: use strset from strmap.h
+ Use new HASHMAP_INIT macro to simplify hashmap initialization
+ strmap: take advantage of FLEXPTR_ALLOC_STR when relevant
+ strmap: enable allocations to come from a mem_pool
+ strmap: add a strset sub-type
+ strmap: split create_entry() out of strmap_put()
+ strmap: add functions facilitating use as a string->int map
+ strmap: enable faster clearing and reusing of strmaps
+ strmap: add more utility functions
+ strmap: new utility functions
+ hashmap: provide deallocation function names
+ hashmap: introduce a new hashmap_partial_clear()
+ hashmap: allow re-use after hashmap_free()
+ hashmap: adjust spacing to fix argument alignment
+ hashmap: add usage documentation explaining hashmap_free[_entries]()
(this branch is used by en/merge-ort-impl.)
A specialization of hashmap that uses a string as key has been
introduced. Hopefully it will see wider use over time.
* fc/bash-completion-alias-of-alias (2020-11-17) 3 commits
(merged to 'next' on 2020-11-18 at 4241203041)
+ completion: bash: improve alias loop detection
(merged to 'next' on 2020-11-10 at 75f1f2b8a8)
+ completion: bash: check for alias loop
+ completion: bash: support recursive aliases
The command line completion script (in contrib/) learned to expand
commands that are alias of alias.
* jc/ci-github-set-env (2020-11-17) 1 commit
(merged to 'next' on 2020-11-19 at 00ff5e06ac)
+ ci: avoid `set-env` construct in print-test-failures.sh
Another CI adjustment.
* jc/format-patch-name-max (2020-11-09) 1 commit
(merged to 'next' on 2020-11-11 at 17e19bb17a)
+ format-patch: make output filename configurable
The maximum length of output filenames "git format-patch" creates
has become configurable (used to be capped at 64).
* jk/4gb-idx (2020-11-16) 5 commits
(merged to 'next' on 2020-11-18 at 2f99b73bda)
+ packfile: detect overflow in .idx file size checks
+ block-sha1: take a size_t length parameter
+ fsck: correctly compute checksums on idx files larger than 4GB
+ use size_t to store pack .idx byte offsets
+ compute pack .idx byte offsets using size_t
The code was not prepared to deal with pack .idx file that is
larger than 4GB.
* jk/diff-release-filespec-fix (2020-11-11) 2 commits
(merged to 'next' on 2020-11-12 at 3b21625881)
+ t7800: simplify difftool test
(merged to 'next' on 2020-11-09 at 6d89b9602d)
+ diff: allow passing NULL to diff_free_filespec_data()
(this branch is used by js/default-branch-name-tests-final-stretch.)
Running "git diff" while allowing external diff in a state with
unmerged paths used to segfault, which has been corrected.
* jk/rev-parse-end-of-options (2020-11-10) 3 commits
(merged to 'next' on 2020-11-11 at 2d517d1608)
+ rev-parse: handle --end-of-options
+ rev-parse: put all options under the "-" check
+ rev-parse: don't accept options after dashdash
"git rev-parse" learned the "--end-of-options" to help scripts to
safely take a parameter that is supposed to be a revision, e.g.
"git rev-parse --verify -q --end-of-options $rev".
* jx/t5411-flake-fix (2020-11-11) 3 commits
(merged to 'next' on 2020-11-18 at badb1fefe5)
+ receive-pack: use default version 0 for proc-receive
+ receive-pack: gently write messages to proc-receive
+ t5411: new helper filter_out_user_friendly_and_stable_output
The exchange between receive-pack and proc-receive hook did not
carefully check for errors.
* ma/list-object-filter-opt-msgfix (2020-11-16) 1 commit
(merged to 'next' on 2020-11-18 at 7cf396ee81)
+ list-objects-filter-options: fix function name in BUG
Error message fix.
We can further update it to lose the hand-maintained function name
from the message, but that can be done separately.
* pd/mergetool-nvimdiff (2020-11-11) 2 commits
(merged to 'next' on 2020-11-12 at aff20da3a2)
+ mergetool: avoid letting `list_tool_variants` break user-defined setups
+ mergetools/bc: add `bc4` to the alias list for Beyond Compare
Fix regression introduced when nvimdiff support in mergetool was added.
* pk/subsub-fetch-fix (2020-11-12) 1 commit
(merged to 'next' on 2020-11-18 at bdd3b21b7c)
+ submodules: fix of regression on fetching of non-init subsub-repo
"git fetch" did not work correctly with nested submodules where the
innermost submodule that is not of interest got updated in the
upstream, which has been corrected.
* rs/archive-plug-leak-refname (2020-11-16) 1 commit
(merged to 'next' on 2020-11-19 at 270ba7b8be)
+ archive: release refname after use
Memleak fix.
* rs/gc-sort-func-cast-fix (2020-11-18) 1 commit
(merged to 'next' on 2020-11-19 at 04529851e5)
+ gc: fix cast in compare_tasks_by_selection()
Fix broken sorting of maintenance tasks.
* rs/hashwrite-be64 (2020-11-12) 3 commits
(merged to 'next' on 2020-11-18 at 60385c6fa1)
+ pack-write: use hashwrite_be64()
+ midx: use hashwrite_be64()
+ csum-file: add hashwrite_be64()
Code simplification.
* rs/plug-diff-cache-leak (2020-11-16) 1 commit
(merged to 'next' on 2020-11-23 at a9666bbac3)
+ diff-lib: plug minor memory leaks in do_diff_cache()
Memleak fix.
* sg/bisect-approximately-halfway (2020-11-12) 1 commit
(merged to 'next' on 2020-11-18 at b13026a0f3)
+ bisect: loosen halfway() check for a large number of commits
"git bisect start/next" in a large span of history spends a lot of
time trying to come up with exactly the half-way point; this can be
optimized by stopping when we see a commit that is close enough to
the half-way point.
* sg/t5310-jgit-wants-sha1 (2020-11-16) 1 commit
(merged to 'next' on 2020-11-19 at 72fb4e7155)
+ t5310-pack-bitmaps: skip JGit tests with SHA256
Since jgit does not yet work with SHA-256 repositories, mark the
tests that uses it not to run unless we are testing with ShA-1
repositories.
* sg/tests-prereq (2020-11-18) 2 commits
(merged to 'next' on 2020-11-23 at e8926781aa)
+ tests: fix description of 'test_set_prereq'
+ tests: make sure nested lazy prereqs work reliably
A lazily defined test prerequisite can now be defined in terms of
another lazily defined test prerequisite.
--------------------------------------------------
[New Topics]
* ab/gc-keep-base-option (2020-11-21) 2 commits
(merged to 'next' on 2020-11-25 at ac76ddcfe7)
+ gc: rename keep_base_pack variable for --keep-largest-pack
+ gc docs: change --keep-base-pack to --keep-largest-pack
Fix an option name in "gc" documentation.
Will merge to 'master'.
* en/stash-apply-sparse-checkout (2020-11-21) 3 commits
- stash: fix stash application in sparse-checkouts
- stash: remove unnecessary process forking
- t7012: add a testcase demonstrating stash apply bugs in sparse checkouts
* jc/do-not-just-explain-but-update-your-patch (2020-11-24) 1 commit
(merged to 'next' on 2020-11-25 at 1f5235d4e1)
+ MyFirstContribition: answering questions is not the end of the story
Expectation for the original contributor after responding to a
review comment to use the explanation in a patch update has been
described.
Will merge to 'master'.
* jk/stop-pack-objects-when-push-is-killed (2020-11-21) 1 commit
(merged to 'next' on 2020-11-25 at f73fb999cd)
+ send-pack: kill pack-objects helper on signal or exit
Receiving "git push" that is killed may leave zombie pack-objects
process behind, which has been corrected.
Will merge to 'master'.
* ma/grep-init-default (2020-11-24) 4 commits
- MyFirstObjectWalk: drop `init_walken_defaults()`
- grep: copy struct in one fell swoop
- grep: use designated initializers for `grep_defaults`
- grep: don't set up a "default" repo for grep
Code clean-up.
Expecting a (hopefully final) reroll.
cf. <xmqqlfepg9dq.fsf@gitster.c.googlers.com>
* mt/worktree-error-message-fix (2020-11-21) 1 commit
(merged to 'next' on 2020-11-25 at bc887168ff)
+ worktree: fix order of arguments in error message
Fix formulation of an error message with two placeholders in "git
worktree add" subcommand.
Will merge to 'master'.
* na/notes-displayref-is-not-boolean (2020-11-23) 2 commits
(merged to 'next' on 2020-11-25 at b0dda46b56)
+ t3301: test proper exit response to no-value notes.displayRef.
+ notes.c: fix a segfault in notes_display_config()
Config parser fix for "git notes".
Will merge to 'master'.
* fc/atmark-in-refspec (2020-11-24) 1 commit
- refspec: make @ a synonym of HEAD
"@" sometimes worked (e.g. "git push origin @:there") as a part of
a refspec element, but "git push orign @" did not work, which has
been corrected.
* hn/sleep-millisec-decl (2020-11-24) 1 commit
(merged to 'next' on 2020-11-25 at d11de8b987)
+ move sleep_millisec to git-compat-util.h
Move a definition of compatibility wrapper from cache.h to
git-compat-util.h
Will merge to 'master'.
* js/init-defaultbranch-advice (2020-11-24) 4 commits
- init: provide useful advice about init.defaultBranch
- get_default_branch_name(): prepare for showing some advice
- branch -m: allow renaming a yet-unborn branch
- init: document `init.defaultBranch` better
Our users are going to be trained to prepare for future change of
init.defaultBranch configuration variable.
* js/t3404-master-to-primary (2020-11-24) 1 commit
(merged to 'next' on 2020-11-25 at c2959cc831)
+ t3404: do not depend on any specific default branch name
A test script got cleaned up and then made not to depend on the
value of init.defaultBranch.
Will merge to 'master'.
* jt/trace-error-on-warning (2020-11-24) 1 commit
- usage: add trace2 entry upon warning()
Like die() and error(), a call to warning() will also trigger a
trace2 event.
Will merge to 'next'.
* km/stash-error-message-fix (2020-11-24) 1 commit
(merged to 'next' on 2020-11-25 at 9ef82d6aa7)
+ stash: add missing space to an error message
Error message fix.
Will merge to 'master'.
* ps/config-env-pairs (2020-11-24) 2 commits
- config: allow specifying config entries via envvar pairs
- config: extract function to parse config pairs
Introduce a way to feed configuration variable-value pairs via
environment variables.
Getting there.
cf. <X74CigYS7AUtMo9Q@tanuki>
* sa/credential-store-timeout (2020-11-25) 1 commit
(merged to 'next' on 2020-11-25 at 7a9a4b68fd)
+ crendential-store: use timeout when locking file
Multiple "credential-store" backends can race to lock the same
file, causing everybody else but one to fail---reattempt locking
with some timeout to reduce the rate of the failure.
Will merge to 'master'.
* tb/idx-midx-race-fix (2020-11-25) 2 commits
- midx.c: protect against disappearing packs
- packfile.c: protect against disappearing indexes
Processes that access packdata while the .idx file gets removed
(e.g. while repacking) did not fail or fall back gracefully as they
could.
Will merge to 'next'.
* rs/stop-pack-objects-when-fetch-is-killed (2020-11-25) 1 commit
- upload-pack: kill pack-objects helper on signal or exit
"git upload-pack" that is killed may leave zombie pack-objects
process behind, which has been corrected.
Needs to be replaced with signed-off and/or improved version.
--------------------------------------------------
[Stalled]
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* mt/rm-sparse-checkout (2020-11-16) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
Need to wait for how these fit in larger picture.
cf. <CABPp-BGMX3wb7LiS1HkJpGveoW3J1oR0vVHbKTF5+qYLRF+59g@mail.gmail.com>
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
probably is with potential consequences that is more/less grave?
* es/config-hooks (2020-10-16) 8 commits
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-10-09) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ss/submodule-add-in-c (2020-10-07) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
Needs review.
* mt/parallel-checkout-part-1 (2020-11-04) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Needs review.
* fc/bash-completion-post-2.29 (2020-11-10) 26 commits
- completion: bash: shuffle __gitcomp functions
- completion: bash: cleanup __gitcomp* invocations
- completion: bash: add __gitcomp_opts
- completion: bash: improve __gitcomp description
- completion: bash: rename _get_comp_words_by_ref()
- completion: bash: trivial cleanup
- completion: bash: cleanup _get_comp_words_by_ref()
- completion: bash: refactor _get_comp_words_by_ref()
- completion: bash: simplify _get_comp_words_by_ref()
- test: completion: switch __gitcomp_nl prefix test
- completion: bash: simplify config_variable_name
- completion: bash: improve __gitcomp suffix code
- completion: bash: change suffix check in __gitcomp
- completion: bash: simplify __gitcomp
- completion: bash: refactor __gitcomp
- completion: bash: simplify equal suffix check
- completion: bash: factor out check in __gitcomp
- completion: bash: get rid of any non-append code
- completion: bash: get rid of _append() functions
- completion: bash: remove non-append functionality
- test: completion: add run_func() helper
- test: completion: fix currently typed words
- completion: bash: do not modify COMP_WORDBREAKS
- completion: bash: fix for suboptions with value
- completion: bash: add correct suffix in variables
- completion: bash: fix prefix detection in branch.*
Needs review.
* so/log-diff-merge (2020-11-09) 27 commits
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- t4013: add test for --diff-merges=first-parent
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
Needs review.
* en/merge-ort-impl (2020-11-11) 21 commits
- merge-ort: free data structures in merge_finalize()
- merge-ort: add implementation of record_unmerged_index_entries()
- tree: enable cmp_cache_name_compare() to be used elsewhere
- merge-ort: add implementation of checkout()
- merge-ort: basic outline for merge_switch_to_result()
- merge-ort: step 3 of tree writing -- handling subdirectories as we go
- merge-ort: step 2 of tree writing -- function to create tree object
- merge-ort: step 1 of tree writing -- record basenames, modes, and oids
- merge-ort: have process_entries operate in a defined order
- merge-ort: add a preliminary simple process_entries() implementation
- merge-ort: avoid recursing into identical trees
- merge-ort: record stage and auxiliary info for every path
- merge-ort: compute a few more useful fields for collect_merge_info
- merge-ort: avoid repeating fill_tree_descriptor() on the same tree
- merge-ort: implement a very basic collect_merge_info()
- merge-ort: add an err() function similar to one from merge-recursive
- merge-ort: use histogram diff
- merge-ort: port merge_start() from merge-recursive
- merge-ort: add some high-level algorithm structure
- merge-ort: setup basic internal data structures
- Merge branch 'en/strmap' into en/merge-ort-impl
Needs review.
--------------------------------------------------
[Cooking]
* tb/pack-bitmap (2020-11-21) 24 commits
- pack-bitmap-write: better reuse bitmaps
- pack-bitmap-write: relax unique rewalk condition
- pack-bitmap-write: use existing bitmaps
- pack-bitmap: factor out 'add_commit_to_bitmap()'
- pack-bitmap: factor out 'bitmap_for_commit()'
- pack-bitmap-write: ignore BITMAP_FLAG_REUSE
- pack-bitmap-write: build fewer intermediate bitmaps
- pack-bitmap.c: check reads more aggressively when loading
- pack-bitmap-write: rename children to reverse_edges
- t5310: add branch-based checks
- commit: implement commit_list_contains()
- bitmap: add bitmap_diff_nonzero()
- pack-bitmap-write: fill bitmap with commit history
- pack-bitmap-write: pass ownership of intermediate bitmaps
- pack-bitmap-write: reimplement bitmap writing
- ewah: add bitmap_dup() function
- ewah: implement bitmap_or()
- ewah: make bitmap growth less aggressive
- ewah: factor out bitmap growth
- rev-list: die when --test-bitmap detects a mismatch
- t5310: drop size of truncated ewah bitmap
- pack-bitmap: bounds-check size of cache extension
- pack-bitmap: fix header size check
- ewah/ewah_bitmap.c: grow buffer past 1
Various improvement to the codepath that writes out pack bitmaps.
Needs a bit of reshuffling?
cf. <X7xzWClGr3bM3wcg@coredump.intra.peff.net>
* ab/retire-parse-remote (2020-11-24) 4 commits
(merged to 'next' on 2020-11-25 at 644484d7df)
+ submodule: fix fetch_in_submodule logic
(merged to 'next' on 2020-11-18 at 80d4d8290c)
+ parse-remote: remove this now-unused library
+ submodule: remove sh function in favor of helper
+ submodule: use "fetch" logic instead of custom remote discovery
"git-parse-remote" shell script library outlived its usefulness.
Will merge to 'master'.
* pb/pull-rebase-recurse-submodules (2020-11-16) 4 commits
(merged to 'next' on 2020-11-25 at 9837b50d7f)
+ pull: check for local submodule modifications with the right range
+ t5572: describe '--rebase' tests a little more
+ t5572: add notes on a peculiar test
+ pull --rebase: compute rebase arguments in separate function
"git pull --rebase --recurse-submodules" checked for local changes
in a wrong range and failed to run correctly when it should.
Will merge to 'master'.
* tb/repack-simplify (2020-11-17) 3 commits
(merged to 'next' on 2020-11-25 at 79a98f2403)
+ builtin/repack.c: don't move existing packs out of the way
+ builtin/repack.c: keep track of what pack-objects wrote
+ repack: make "exts" array available outside cmd_repack()
Simplify the logic to deal with a repack operation that ended up
creating the same packfile.
Will merge to 'master'.
* dd/help-autocorrect-never (2020-11-25) 1 commit
- help.c: help.autocorrect=never means "do not compute suggestions"
"git $cmd $args", when $cmd is not a recognised subcommand, by
default tries to see if $cmd is a typo of an existing subcommand
and optionally executes the corrected command if there is only one
possibility, depending on the setting of help.autocorrect; the
users can now disable the whole thing, including the cycles spent
to find a likely typo, by setting the configuration variable to
'never'.
Getting there.
cf. <xmqqft4xdubq.fsf_-_@gitster.c.googlers.com>
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
- tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
- t99*: adjust the references to the default branch name "main"
- tests(git-p4): transition to the default branch name `main`
- t9[5-7]*: adjust the references to the default branch name "main"
- t9[0-4]*: adjust the references to the default branch name "main"
- t8*: adjust the references to the default branch name "main"
- t7[5-9]*: adjust the references to the default branch name "main"
- t7[0-4]*: adjust the references to the default branch name "main"
- t6[4-9]*: adjust the references to the default branch name "main"
- t64*: preemptively adjust alignment to prepare for `master` -> `main`
- t6[0-3]*: adjust the references to the default branch name "main"
- t5[6-9]*: adjust the references to the default branch name "main"
- t55[4-9]*: adjust the references to the default branch name "main"
- t55[23]*: adjust the references to the default branch name "main"
- t551*: adjust the references to the default branch name "main"
- t550*: adjust the references to the default branch name "main"
- t5503: prepare aligned comment for replacing `master` with `main`
- t5[0-4]*: adjust the references to the default branch name "main"
- t5323: prepare centered comment for `master` -> `main`
- t4*: adjust the references to the default branch name "main"
- t3[5-9]*: adjust the references to the default branch name "main"
- t34*: adjust the references to the default branch name "main"
- t3416: preemptively adjust alignment in a comment
- t3[0-3]*: adjust the references to the default branch name "main"
- t2*: adjust the references to the default branch name "main"
- t[01]*: adjust the references to the default branch name "main"
- t0060: preemptively adjust alignment
- tests: mark tests relying on the current default for `init.defaultBranch`
- Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
Prepare tests not to be affected by the name of the default branch
"git init" creates.
* js/t2106-cleanup (2020-11-18) 3 commits
(merged to 'next' on 2020-11-23 at b1bcd5d8b2)
+ t2106: ensure that the checkout fails for the expected reason
+ t2106: make test independent of the current main branch name
+ t2106: adjust style to the current conventions
A test script got cleaned up and then made not to depend on the
value of init.defaultBranch.
Will merge to 'master'.
* js/t3040-cleanup (2020-11-18) 1 commit
(merged to 'next' on 2020-11-23 at 88951eae2f)
+ t3040: remove stale note
Cleanup.
Will merge to 'master'.
* js/t4015-wo-master (2020-11-19) 1 commit
(merged to 'next' on 2020-11-23 at b85c36ffb4)
+ t4015: let the test pass with any default branch name
A test script got cleaned up not to depend on the value of
init.defaultBranch.
Will merge to 'master'.
* ds/config-literal-value (2020-11-25) 8 commits
- config doc: value-pattern is not necessarily a regexp
- config: implement --fixed-value with --get*
- config: plumb --fixed-value into config API
- config: add --fixed-value option, un-implemented
- t1300: add test for --replace-all with value-pattern
- t1300: test "set all" mode with value-pattern
- config: replace 'value_regex' with 'value_pattern'
- config: convert multi_replace to flags
(this branch is used by ds/maintenance-part-3.)
Various subcommands of "git config" that takes value_regex
learn the "--literal-value" option to take the value_regex option
as a literal string.
Expecting a (hopefully final) reroll.
* ds/maintenance-part-3 (2020-11-25) 2 commits
- maintenance: use 'git config --fixed-value'
- Merge branch 'ds/config-literal-value' into ds/maintenance-part-3
(this branch uses ds/config-literal-value.)
"git maintenance" command had trouble working in a directory whose
pathname contained an ERE metacharacter like '+'.
Blocked by ds/config-literal-value.
* js/pull-rebase-use-advise (2020-11-19) 1 commit
(merged to 'next' on 2020-11-25 at 05db775119)
+ pull: colorize the hint about setting `pull.rebase`
UI improvement.
Will merge to 'master'.
* js/t1309-master-to-topic (2020-11-19) 1 commit
(merged to 'next' on 2020-11-25 at 044da285ef)
+ t1309: use a neutral branch name in the `onbranch` test cases
Test preparation.
Will merge to 'master'.
* ag/merge-strategies-in-c (2020-11-24) 13 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6060: modify multiple files to expose a possible issue with merge-index
- t6407: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Needs review.
* ps/update-ref-multi-transaction (2020-11-16) 4 commits
- update-ref: disallow "start" for ongoing transactions
- p1400: use `git-update-ref --stdin` to test multiple transactions
- update-ref: allow creation of multiple transactions
- t1400: avoid touching refs on filesystem
"git update-ref --stdin" learns to take multiple transactions in a
single session.
Will merge to 'next'.
* js/add-i-color-fix (2020-11-16) 11 commits
- add -i: verify in the tests that colors can be overridden
- add -p: prefer color.diff.context over color.diff.plain
- add -i (Perl version): color header to match the C version
- add -i (built-in): use the same indentation as the Perl version
- add -p (built-in): do not color the progress indicator separately
- add -i (built-in): use correct names to load color.diff.* config
- add -i (built-in): prevent the `reset` "color" from being configured
- add -i: use `reset_color` consistently
- add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers
- add -i (built-in): send error messages to stderr
- add -i (built-in): do show an error message for incorrect inputs
"git add -i" failed to honor custom colors configured to show
patches, which has been corrected.
Will merge to 'next'.
cf. <20201117015149.GC19433@coredump.intra.peff.net>
* js/trace2-session-id (2020-11-11) 11 commits
- receive-pack: log received client session ID
- send-pack: advertise session ID in capabilities
- upload-pack, serve: log received client session ID
- fetch-pack: advertise session ID in capabilities
- transport: log received server session ID
- serve: advertise session ID in v2 capabilities
- receive-pack: advertise session ID in v0 capabilities
- upload-pack: advertise session ID in v0 capabilities
- trace2: add a public function for getting the SID
- docs: new transfer.advertiseSID option
- docs: new capability to advertise session IDs
The transport layer was taught to optionally exchange the session
ID assigned by the trace2 subsystem during fetch/push transactions.
Will merge to 'next'.
* ds/maintenance-part-4 (2020-11-24) 4 commits
- maintenance: use Windows scheduled tasks
- maintenance: use launchctl on macOS
- maintenance: include 'cron' details in docs
- maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
Needs doc update and also adjusting "git status".
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there.
cf. <85y2jiqq3c.fsf@gmail.com>
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
cf. <20201103053629.GA13228@Abhishek-Arch>
--------------------------------------------------
[Discarded]
* jk/use-strset-in-shortlog (2020-11-05) 1 commit
. shortlog: drop custom strset implementation
Now a part of the en/strmap topic.
* jt/push-with-base (2020-11-02) 5 commits
. SQUASH???
. Doc: push with --base
. remote-curl: teach --base for http(s)://
. push: teach --base for ssh:// and file://
. connect: refactor building of Extra Parameters
"git push" learns a way to tell an object that it expects the other
side to have and is usable as a common ancestor, which can be used
by the other side to shrink its initial ref advertisement.
* rs/chdir-notify-unleak (2020-11-16) 1 commit
. chdir-notify: UNLEAK registrated callback entries
Mark some stuff on list_head chain with UNLEAK() macro to squelch
leak checker.
Retracted.
cf. <3b2afb7a-57aa-025c-806f-ae3faa0ed077@web.de>
* av/fsmonitor-cleanup (2020-10-21) 2 commits
. fsmonitor: make output of test-dump-fsmonitor more concise
. fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
Code clean-up.
Unneeded?
cf. <20201022183822.GA781760@nand.local>
* jc/init-doc-default-branch (2020-11-18) 1 commit
. "init" doc: mention the configurability more clearly
Doc update.
* ds/treeless-clone-wo-submodule-recursing (2020-11-21) 1 commit
. clone: --filter=tree:0 implies fetch.recurseSubmodules=no
Retracted.
cf. <8a31af0e-4440-d957-11fb-48c4d2abd5c7@gmail.com>
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Nov 2020, #04; Thu, 19)
@ 2020-11-21 22:57 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-11-21 22:57 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The sixth batch of topics are in 'master' and the tests are being
prepared not to be disrupted by a potential change of the default
name for the initial branch.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into. Some repositories have
only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ds/maintenance-part-3 (2020-10-16) 8 commits
(merged to 'next' on 2020-11-10 at fe9475c696)
+ maintenance: add troubleshooting guide to docs
+ maintenance: use 'incremental' strategy by default
+ maintenance: create maintenance.strategy config
+ maintenance: add start/stop subcommands
+ maintenance: add [un]register subcommands
+ for-each-repo: run subcommands on configured repos
+ maintenance: add --schedule option and config
+ maintenance: optionally skip --auto process
(this branch is used by ds/maintenance-part-4.)
Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.
* dd/upload-pack-stateless-eof (2020-10-30) 1 commit
(merged to 'next' on 2020-11-09 at 01a1f1d4fd)
+ upload-pack: allow stateless client EOF just prior to haves
"git fetch --depth=<n>" over the stateless RPC / smart HTTP
transport handled EOF from the client poorly at the server end.
* dg/bswap-msvc (2020-11-11) 2 commits
(merged to 'next' on 2020-11-11 at 6b9e819b17)
+ compat/bswap.h: don't assume MSVC is little-endian
(merged to 'next' on 2020-11-09 at 91a67b86f7)
+ compat/bswap.h: simplify MSVC endianness detection
Define ARM64 compiled with MSVC to be little-endian.
* en/merge-ort-api-null-impl (2020-11-02) 4 commits
(merged to 'next' on 2020-11-10 at ed9eed1558)
+ merge,rebase,revert: select ort or recursive by config or environment
+ fast-rebase: demonstrate merge-ort's API via new test-tool command
+ merge-ort-wrappers: new convience wrappers to mimic the old merge API
+ merge-ort: barebones API of new merge strategy with empty implementation
(this branch is used by en/merge-ort-impl.)
Preparation for a new merge strategy.
* en/merge-tests (2020-10-26) 9 commits
(merged to 'next' on 2020-11-09 at 8ac9fe94a7)
+ t6423: add more details about direct resolution of directories
+ t6423: note improved ort handling with untracked files
+ t6423, t6436: note improved ort handling with dirty files
+ merge tests: expect slight differences in output for recursive vs. ort
+ t6423: expect improved conflict markers labels in the ort backend
+ t6404, t6423: expect improved rename/delete handling in ort backend
+ t6416: correct expectation for rename/rename(1to2) + directory/file
+ merge tests: expect improved directory/file conflict handling in ort
+ t/: new helper for tests that pass with ort but fail with recursive
Preparation for a new merge strategy.
* jc/blame-ignore-fix (2020-11-10) 1 commit
(merged to 'next' on 2020-11-10 at 384ace449d)
+ blame: silently ignore invalid ignore file objects
"git blame --ignore-revs-file=<file>" learned to ignore a
non-existent object name in the input, instead of complaining.
* jc/line-log-takes-no-pathspec (2020-11-04) 1 commit
(merged to 'next' on 2020-11-09 at 47c2c88b9d)
+ log: diagnose -L used with pathspec as an error
"git log -L<range>:<path>" is documented to take no pathspec, but
this was not enforced by the command line option parser, which has
been corrected.
* jc/sparse-error-for-developer-build (2020-10-31) 1 commit
(merged to 'next' on 2020-11-10 at 8cfbe66736)
+ Makefile: enable -Wsparse-error for DEVELOPER build
"make DEVELOPER=1 sparse" used to run sparse and let it emit
warnings; now such warnings will cause an error.
* jk/format-patch-output (2020-11-04) 3 commits
(merged to 'next' on 2020-11-09 at 1f1bb6ebff)
+ format-patch: support --output option
+ format-patch: tie file-opening logic to output_directory
+ format-patch: refactor output selection
"git format-patch --output=there" did not work as expected and
instead crashed. The option is now supported.
* js/default-branch-name-adjust-t5515 (2020-11-02) 4 commits
(merged to 'next' on 2020-11-09 at 568ba5aba5)
+ t5515: use `main` as the name of the main branch for testing (conclusion)
+ t5515: use `main` as the name of the main branch for testing (part 3)
+ t5515: use `main` as the name of the main branch for testing (part 2)
+ t5515: use `main` as the name of the main branch for testing (part 1)
Prepare a test script to transition of the default branch name to
'main'.
* nk/perf-fsmonitor (2020-10-26) 10 commits
(merged to 'next' on 2020-11-09 at 9fed160a17)
+ t/perf/fsmonitor: add benchmark for dirty status
+ t/perf/fsmonitor: perf comparison of multiple fsmonitor integrations
+ t/perf/fsmonitor: initialize test with git reset
+ t/perf/fsmonitor: factor setup for fsmonitor into function
+ t/perf/fsmonitor: silence initial git commit
+ t/perf/fsmonitor: shorten DESC to basename
+ t/perf/fsmonitor: factor description out for readability
+ t/perf/fsmonitor: improve error message if typoing hook name
+ t/perf/fsmonitor: move watchman setup to one-time-repo-setup
+ t/perf/fsmonitor: separate one time repo initialization
Add t/perf support for fsmonitor.
* pb/blame-funcname-range-userdiff (2020-11-01) 8 commits
(merged to 'next' on 2020-11-10 at 221bb3f773)
+ blame: simplify 'setup_blame_bloom_data' interface
+ blame: simplify 'setup_scoreboard' interface
+ blame: enable funcname blaming with userdiff driver
+ line-log: mention both modes in 'blame' and 'log' short help
+ doc: add more pointers to gitattributes(5) for userdiff
+ blame-options.txt: also mention 'funcname' in '-L' description
+ doc: line-range: improve formatting
+ doc: log, gitk: move '-L' description to 'line-range-options.txt'
"git blame -L :funcname -- path" did not work well for a path for
which a userdiff driver is defined.
* pw/rebase-i-orig-head (2020-11-04) 4 commits
(merged to 'next' on 2020-11-10 at 038a5295f5)
+ rebase -i: simplify get_revision_ranges()
+ rebase -i: use struct object_id when writing state
+ rebase -i: use struct object_id rather than looking up commit
+ rebase -i: stop overwriting ORIG_HEAD buffer
"git rebase -i" did not store ORIG_HEAD correctly.
cf. <xmqq7drbbcj5.fsf@gitster.c.googlers.com>
* rs/archive-high-compression (2020-11-09) 1 commit
(merged to 'next' on 2020-11-10 at 9bee80950e)
+ archive: support compression levels beyond 9
"git archive" now allows compression level higher than "-9"
when generating tar.gz output.
* rs/empty-reflog-check-fix (2020-11-01) 1 commit
(merged to 'next' on 2020-11-09 at 3da6b6fef0)
+ stash: simplify reflog emptiness check
The code to see if "git stash drop" can safely remove refs/stash
has been made more carerful.
--------------------------------------------------
[New Topics]
* rs/hashwrite-be64 (2020-11-12) 3 commits
(merged to 'next' on 2020-11-18 at 60385c6fa1)
+ pack-write: use hashwrite_be64()
+ midx: use hashwrite_be64()
+ csum-file: add hashwrite_be64()
Code simplification.
Will merge to 'master'.
* sg/bisect-approximately-halfway (2020-11-12) 1 commit
(merged to 'next' on 2020-11-18 at b13026a0f3)
+ bisect: loosen halfway() check for a large number of commits
"git bisect start/next" in a large span of history spends a lot of
time trying to come up with exactly the half-way point; this can be
optimized by stopping when we see a commit that is close enough to
the half-way point.
Will merge to 'master'.
* tb/pack-bitmap (2020-11-19) 24 commits
- pack-bitmap-write: better reuse bitmaps
- pack-bitmap-write: relax unique rewalk condition
- pack-bitmap-write: use existing bitmaps
- pack-bitmap: factor out 'add_commit_to_bitmap()'
- pack-bitmap: factor out 'bitmap_for_commit()'
- pack-bitmap-write: ignore BITMAP_FLAG_REUSE
- pack-bitmap-write: build fewer intermediate bitmaps
- pack-bitmap.c: check reads more aggressively when loading
- pack-bitmap-write: rename children to reverse_edges
- t5310: add branch-based checks
- commit: implement commit_list_contains()
- bitmap: add bitmap_diff_nonzero()
- pack-bitmap-write: fill bitmap with commit history
- pack-bitmap-write: pass ownership of intermediate bitmaps
- pack-bitmap-write: reimplement bitmap writing
- ewah: add bitmap_dup() function
- ewah: implement bitmap_or()
- ewah: make bitmap growth less aggressive
- ewah: factor out bitmap growth
- rev-list: die when --test-bitmap detects a mismatch
- t5310: drop size of truncated ewah bitmap
- pack-bitmap: bounds-check size of cache extension
- pack-bitmap: fix header size check
- ewah/ewah_bitmap.c: grow buffer past 1
Various improvement to the codepath that writes out pack bitmaps.
* ab/retire-parse-remote (2020-11-16) 3 commits
(merged to 'next' on 2020-11-18 at 80d4d8290c)
+ parse-remote: remove this now-unused library
+ submodule: remove sh function in favor of helper
+ submodule: use "fetch" logic instead of custom remote discovery
"git-parse-remote" shell script library outlived its usefulness.
Will merge to 'master'.
* jk/4gb-idx (2020-11-16) 5 commits
(merged to 'next' on 2020-11-18 at 2f99b73bda)
+ packfile: detect overflow in .idx file size checks
+ block-sha1: take a size_t length parameter
+ fsck: correctly compute checksums on idx files larger than 4GB
+ use size_t to store pack .idx byte offsets
+ compute pack .idx byte offsets using size_t
The code was not prepared to deal with pack .idx file that is
larger than 4GB.
Will merge to 'master'.
* ma/list-object-filter-opt-msgfix (2020-11-16) 1 commit
(merged to 'next' on 2020-11-18 at 7cf396ee81)
+ list-objects-filter-options: fix function name in BUG
Error message fix.
Will merge to 'master'.
We can further update it to lose the hand-maintained function name
from the message, but that can be done separately.
* mt/rm-sparse-checkout (2020-11-16) 1 commit
- rm: honor sparse checkout patterns
(this branch uses mt/grep-sparse-checkout.)
"git rm" follows suit to "git grep" to ignore paths outside the
sparsity pattern when the sparse checkout feature is in use.
* pb/pull-rebase-recurse-submodules (2020-11-16) 4 commits
- pull: check for local submodule modifications with the right range
- t5572: describe '--rebase' tests a little more
- t5572: add notes on a peculiar test
- pull --rebase: compute rebase arguments in separate function
"git pull --rebase --recurse-submodules" checked for local changes
in a wrong range and failed to run correctly when it should.
Will merge to 'next'.
* pk/subsub-fetch-fix (2020-11-12) 1 commit
(merged to 'next' on 2020-11-18 at bdd3b21b7c)
+ submodules: fix of regression on fetching of non-init subsub-repo
"git fetch" did not work correctly with nested submodules where the
innermost submodule that is not of interest got updated in the
upstream, which has been corrected.
Will merge to 'master'.
* rs/archive-plug-leak-refname (2020-11-16) 1 commit
(merged to 'next' on 2020-11-19 at 270ba7b8be)
+ archive: release refname after use
Memleak fix.
Will merge to 'master'.
* rs/chdir-notify-unleak (2020-11-16) 1 commit
- chdir-notify: UNLEAK registrated callback entries
Mark some stuff on list_head chain with UNLEAK() macro to squelch
leak checker.
Will merge to 'next'.
* rs/plug-diff-cache-leak (2020-11-16) 1 commit
- diff-lib: plug minor memory leaks in do_diff_cache()
Memleak fix.
Will merge to 'next'.
* sg/t5310-jgit-wants-sha1 (2020-11-16) 1 commit
(merged to 'next' on 2020-11-19 at 72fb4e7155)
+ t5310-pack-bitmaps: skip JGit tests with SHA256
Since jgit does not yet work with SHA-256 repositories, mark the
tests that uses it not to run unless we are testing with ShA-1
repositories.
Will merge to 'master'.
* tb/repack-simplify (2020-11-17) 3 commits
- builtin/repack.c: don't move existing packs out of the way
- builtin/repack.c: keep track of what pack-objects wrote
- repack: make "exts" array available outside cmd_repack()
Simplify the logic to deal with a repack operation that ended up
creating the same packfile.
Will merge to 'next'.
* dd/help-autocorrect-never (2020-11-18) 1 commit
- help.c: allow help.autocorrect to say "do not even compute suggestions"
"git $cmd $args", when $cmd is not a recognised subcommand, by
default tries to see if $cmd is a typo of an existing subcommand
and optionally executes the corrected command if there is only one
possibility, depending on the setting of help.autocorrect; the
users can now disable the whole thing, including the cycles spent
to find a likely typo, by setting the configuration variable to
'never'.
* jc/ci-github-set-env (2020-11-17) 1 commit
(merged to 'next' on 2020-11-19 at 00ff5e06ac)
+ ci: avoid `set-env` construct in print-test-failures.sh
Another CI adjustment.
Will merge to 'master'.
* jc/init-doc-default-branch (2020-11-18) 1 commit
- "init" doc: mention the configurability more clearly
Doc update.
Weatherbaloon.
* js/default-branch-name-tests-final-stretch (2020-11-19) 29 commits
- tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer needed
- t99*: adjust the references to the default branch name "main"
- tests(git-p4): transition to the default branch name `main`
- t9[5-7]*: adjust the references to the default branch name "main"
- t9[0-4]*: adjust the references to the default branch name "main"
- t8*: adjust the references to the default branch name "main"
- t7[5-9]*: adjust the references to the default branch name "main"
- t7[0-4]*: adjust the references to the default branch name "main"
- t6[4-9]*: adjust the references to the default branch name "main"
- t64*: preemptively adjust alignment to prepare for `master` -> `main`
- t6[0-3]*: adjust the references to the default branch name "main"
- t5[6-9]*: adjust the references to the default branch name "main"
- t55[4-9]*: adjust the references to the default branch name "main"
- t55[23]*: adjust the references to the default branch name "main"
- t551*: adjust the references to the default branch name "main"
- t550*: adjust the references to the default branch name "main"
- t5503: prepare aligned comment for replacing `master` with `main`
- t5[0-4]*: adjust the references to the default branch name "main"
- t5323: prepare centered comment for `master` -> `main`
- t4*: adjust the references to the default branch name "main"
- t3[5-9]*: adjust the references to the default branch name "main"
- t34*: adjust the references to the default branch name "main"
- t3416: preemptively adjust alignment in a comment
- t3[0-3]*: adjust the references to the default branch name "main"
- t2*: adjust the references to the default branch name "main"
- t[01]*: adjust the references to the default branch name "main"
- t0060: preemptively adjust alignment
- tests: mark tests relying on the current default for `init.defaultBranch`
- Merge 'jk/diff-release-filespec-fix' into js/default-branch-name-tests-final-stretch
(this branch uses jk/diff-release-filespec-fix.)
Prepare tests not to be affected by the name of the default branch
"git init" creates.
* js/t2106-cleanup (2020-11-18) 3 commits
- t2106: ensure that the checkout fails for the expected reason
- t2106: make test independent of the current main branch name
- t2106: adjust style to the current conventions
A test script got cleaned up and then made not to depend on the
value of init.defaultBranch.
Will merge to 'next'.
* js/t3040-cleanup (2020-11-18) 1 commit
- t3040: remove stale note
Cleanup.
Will merge to 'next'.
* js/t4015-wo-master (2020-11-19) 1 commit
- t4015: let the test pass with any default branch name
A test script got cleaned up not to depend on the value of
init.defaultBranch.
Will merge to 'next'.
* rs/gc-sort-func-cast-fix (2020-11-18) 1 commit
(merged to 'next' on 2020-11-19 at 04529851e5)
+ gc: fix cast in compare_tasks_by_selection()
Fix broken sorting of maintenance tasks.
Will merge to 'master'.
* sg/tests-prereq (2020-11-18) 2 commits
- tests: fix description of 'test_set_prereq'
- tests: make sure nested lazy prereqs work reliably
A lazily defined test prerequisite can now be defined in terms of
another lazily defined test prerequisite.
Will merge to 'next'.
* ds/config-literal-value (2020-11-19) 6 commits
- config: implement --literal-value with --get*
- config: plumb --literal-value into config API
- config: add --literal-value option, un-implemented
- config: convert multi_replace to flags
- t1300: add test for --replace-all with value_regex
- t1300: test "set all" mode with value_regex
(this branch is used by ds/maintenance-part-3.)
* ds/maintenance-part-3 (2020-11-19) 2 commits
- maintenance: use 'git config --literal-value'
- Merge branch 'ds/config-literal-value' into ds/maintenance-part-3
(this branch uses ds/config-literal-value.)
"git maintenance" command had trouble working in a directory whose
pathname contained an ERE metacharacter like '+'.
Will merge to 'next'.
* js/pull-rebase-use-advise (2020-11-19) 1 commit
- pull: colorize the hint about setting `pull.rebase`
* js/t1309-master-to-topic (2020-11-19) 1 commit
- t1309: use a neutral branch name in the `onbranch` test cases
--------------------------------------------------
[Stalled]
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need to
introduce a class that is separate from symlinked .gitmodules that
probably is with potential consequences that is more/less grave?
* es/config-hooks (2020-10-16) 8 commits
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-10-09) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ss/submodule-add-in-c (2020-10-07) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
* mt/parallel-checkout-part-1 (2020-11-04) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
(this branch is used by mt/rm-sparse-checkout.)
"git grep" has been tweaked to be limited to the sparse checkout
paths.
--------------------------------------------------
[Cooking]
* ag/merge-strategies-in-c (2020-11-16) 12 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- update-index: move add_cacheinfo() to read-cache.c
- t6027: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
* ps/update-ref-multi-transaction (2020-11-16) 4 commits
- update-ref: disallow "start" for ongoing transactions
- p1400: use `git-update-ref --stdin` to test multiple transactions
- update-ref: allow creation of multiple transactions
- t1400: avoid touching refs on filesystem
"git update-ref --stdin" learns to take multiple transactions in a
single session.
* fc/bash-completion-alias-of-alias (2020-11-17) 3 commits
(merged to 'next' on 2020-11-18 at 4241203041)
+ completion: bash: improve alias loop detection
(merged to 'next' on 2020-11-10 at 75f1f2b8a8)
+ completion: bash: check for alias loop
+ completion: bash: support recursive aliases
The command line completion script (in contrib/) learned to expand
commands that are alias of alias.
Will merge to 'master'.
* jk/rev-parse-end-of-options (2020-11-10) 3 commits
(merged to 'next' on 2020-11-11 at 2d517d1608)
+ rev-parse: handle --end-of-options
+ rev-parse: put all options under the "-" check
+ rev-parse: don't accept options after dashdash
"git rev-parse" learned the "--end-of-options" to help scripts to
safely take a parameter that is supposed to be a revision, e.g.
"git rev-parse --verify -q --end-of-options $rev".
Will merge to 'master'.
* fc/bash-completion-post-2.29 (2020-11-10) 26 commits
- completion: bash: shuffle __gitcomp functions
- completion: bash: cleanup __gitcomp* invocations
- completion: bash: add __gitcomp_opts
- completion: bash: improve __gitcomp description
- completion: bash: rename _get_comp_words_by_ref()
- completion: bash: trivial cleanup
- completion: bash: cleanup _get_comp_words_by_ref()
- completion: bash: refactor _get_comp_words_by_ref()
- completion: bash: simplify _get_comp_words_by_ref()
- test: completion: switch __gitcomp_nl prefix test
- completion: bash: simplify config_variable_name
- completion: bash: improve __gitcomp suffix code
- completion: bash: change suffix check in __gitcomp
- completion: bash: simplify __gitcomp
- completion: bash: refactor __gitcomp
- completion: bash: simplify equal suffix check
- completion: bash: factor out check in __gitcomp
- completion: bash: get rid of any non-append code
- completion: bash: get rid of _append() functions
- completion: bash: remove non-append functionality
- test: completion: add run_func() helper
- test: completion: fix currently typed words
- completion: bash: do not modify COMP_WORDBREAKS
- completion: bash: fix for suboptions with value
- completion: bash: add correct suffix in variables
- completion: bash: fix prefix detection in branch.*
* js/add-i-color-fix (2020-11-16) 11 commits
- add -i: verify in the tests that colors can be overridden
- add -p: prefer color.diff.context over color.diff.plain
- add -i (Perl version): color header to match the C version
- add -i (built-in): use the same indentation as the Perl version
- add -p (built-in): do not color the progress indicator separately
- add -i (built-in): use correct names to load color.diff.* config
- add -i (built-in): prevent the `reset` "color" from being configured
- add -i: use `reset_color` consistently
- add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers
- add -i (built-in): send error messages to stderr
- add -i (built-in): do show an error message for incorrect inputs
"git add -i" failed to honor custom colors configured to show
patches, which has been corrected.
* ab/config-mak-uname-simplify (2020-11-11) 2 commits
(merged to 'next' on 2020-11-12 at e1bd51ee71)
+ config.mak.uname: remove unused NEEDS_SSL_WITH_CURL flag
+ config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag
Build configuration cleanup.
Will merge to 'master'.
* pd/mergetool-nvimdiff (2020-11-11) 2 commits
(merged to 'next' on 2020-11-12 at aff20da3a2)
+ mergetool: avoid letting `list_tool_variants` break user-defined setups
+ mergetools/bc: add `bc4` to the alias list for Beyond Compare
Fix regression introduced when nvimdiff support in mergetool was added.
Will merge to 'master'.
* js/trace2-session-id (2020-11-11) 11 commits
- receive-pack: log received client session ID
- send-pack: advertise session ID in capabilities
- upload-pack, serve: log received client session ID
- fetch-pack: advertise session ID in capabilities
- transport: log received server session ID
- serve: advertise session ID in v2 capabilities
- receive-pack: advertise session ID in v0 capabilities
- upload-pack: advertise session ID in v0 capabilities
- trace2: add a public function for getting the SID
- docs: new transfer.advertiseSID option
- docs: new capability to advertise session IDs
The transport layer was taught to optionally exchange the session
ID assigned by the trace2 subsystem during fetch/push transactions.
* so/log-diff-merge (2020-11-09) 27 commits
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- t4013: add test for --diff-merges=first-parent
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
* ds/maintenance-part-4 (2020-11-04) 4 commits
- maintenance: use Windows scheduled tasks
- maintenance: use launchctl on macOS
- maintenance: include 'cron' details in docs
- maintenance: extract platform-specific scheduling
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
* en/merge-ort-impl (2020-11-11) 21 commits
- merge-ort: free data structures in merge_finalize()
- merge-ort: add implementation of record_unmerged_index_entries()
- tree: enable cmp_cache_name_compare() to be used elsewhere
- merge-ort: add implementation of checkout()
- merge-ort: basic outline for merge_switch_to_result()
- merge-ort: step 3 of tree writing -- handling subdirectories as we go
- merge-ort: step 2 of tree writing -- function to create tree object
- merge-ort: step 1 of tree writing -- record basenames, modes, and oids
- merge-ort: have process_entries operate in a defined order
- merge-ort: add a preliminary simple process_entries() implementation
- merge-ort: avoid recursing into identical trees
- merge-ort: record stage and auxiliary info for every path
- merge-ort: compute a few more useful fields for collect_merge_info
- merge-ort: avoid repeating fill_tree_descriptor() on the same tree
- merge-ort: implement a very basic collect_merge_info()
- merge-ort: add an err() function similar to one from merge-recursive
- merge-ort: use histogram diff
- merge-ort: port merge_start() from merge-recursive
- merge-ort: add some high-level algorithm structure
- merge-ort: setup basic internal data structures
- Merge branch 'en/strmap' into en/merge-ort-impl
(this branch uses en/strmap.)
* jc/format-patch-name-max (2020-11-09) 1 commit
(merged to 'next' on 2020-11-11 at 17e19bb17a)
+ format-patch: make output filename configurable
The maximum length of output filenames "git format-patch" creates
has become configurable (used to be capped at 64).
Will merge to 'master'.
* jk/diff-release-filespec-fix (2020-11-11) 2 commits
(merged to 'next' on 2020-11-12 at 3b21625881)
+ t7800: simplify difftool test
(merged to 'next' on 2020-11-09 at 6d89b9602d)
+ diff: allow passing NULL to diff_free_filespec_data()
(this branch is used by js/default-branch-name-tests-final-stretch.)
Running "git diff" while allowing external diff in a state with
unmerged paths used to segfault, which has been corrected.
Will merge to 'master'.
* jx/t5411-flake-fix (2020-11-11) 3 commits
(merged to 'next' on 2020-11-18 at badb1fefe5)
+ receive-pack: use default version 0 for proc-receive
+ receive-pack: gently write messages to proc-receive
+ t5411: new helper filter_out_user_friendly_and_stable_output
The exchange between receive-pack and proc-receive hook did not
carefully check for errors.
Will merge to 'master'.
* av/fsmonitor-cleanup (2020-10-21) 2 commits
- fsmonitor: make output of test-dump-fsmonitor more concise
- fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
Code clean-up.
Will discard.
Unneeded?
cf. <20201022183822.GA781760@nand.local>
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
Needs doc update and also adjusting "git status".
* en/strmap (2020-11-11) 15 commits
(merged to 'next' on 2020-11-12 at 41519a5f5c)
+ shortlog: use strset from strmap.h
+ Use new HASHMAP_INIT macro to simplify hashmap initialization
+ strmap: take advantage of FLEXPTR_ALLOC_STR when relevant
+ strmap: enable allocations to come from a mem_pool
+ strmap: add a strset sub-type
+ strmap: split create_entry() out of strmap_put()
+ strmap: add functions facilitating use as a string->int map
+ strmap: enable faster clearing and reusing of strmaps
+ strmap: add more utility functions
+ strmap: new utility functions
+ hashmap: provide deallocation function names
+ hashmap: introduce a new hashmap_partial_clear()
+ hashmap: allow re-use after hashmap_free()
+ hashmap: adjust spacing to fix argument alignment
+ hashmap: add usage documentation explaining hashmap_free[_entries]()
(this branch is used by en/merge-ort-impl.)
A speciailization of hashmap that uses a string as key has been
introduced. Hopefully it will see wider use over time.
Will merge to 'master'.
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there.
cf. <85y2jiqq3c.fsf@gmail.com>
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
cf. <20201103053629.GA13228@Abhishek-Arch>
--------------------------------------------------
[Discarded]
* jk/use-strset-in-shortlog (2020-11-05) 1 commit
. shortlog: drop custom strset implementation
Now a part of the en/strmap topic.
* jt/push-with-base (2020-11-02) 5 commits
. SQUASH???
. Doc: push with --base
. remote-curl: teach --base for http(s)://
. push: teach --base for ssh:// and file://
. connect: refactor building of Extra Parameters
"git push" learns a way to tell an object that it expects the other
side to have and is usable as a common ancestor, which can be used
by the other side to shrink its initial ref advertisement.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Nov 2020, #03; Wed, 11)
@ 2020-11-11 22:13 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-11-11 22:13 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The fifth batch of topics have been merged to 'master'.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into. Some repositories have
only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* cw/ci-ghwf-check-ws-errors (2020-11-03) 1 commit
(merged to 'next' on 2020-11-04 at dc1121823c)
+ ci: make the whitespace checker more robust
Dev support update.
* jc/abbrev-doc (2020-11-04) 1 commit
(merged to 'next' on 2020-11-09 at 09efe81b8b)
+ doc: clarify that --abbrev=<n> is about the minimum length
The documentation on the "--abbrev=<n>" option did not say the
output may be longer than "<n>" hexdigits, which has been
clarified.
* jc/sequencer-stopped-sha-simplify (2020-10-21) 1 commit
(merged to 'next' on 2020-11-02 at ba3dd9eaf4)
+ sequencer: tolerate abbreviated stopped-sha file
Recently the format of an internal state file "rebase -i" uses has
been tightened up for consistency, which would hurt those who start
"rebase -i" with old git and then continue with new git. Loosen
the reader side a bit (which we may want to tighten again in a year
or so).
* js/ci-github-set-env (2020-11-06) 1 commit
(merged to 'next' on 2020-11-09 at c4ce007b4c)
+ ci: avoid using the deprecated `set-env` construct
CI update.
* js/p4-default-branch (2020-11-09) 1 commit
(merged to 'next' on 2020-11-09 at a4b08b45da)
+ p4: respect init.defaultBranch
"git p4" now honors init.defaultBranch configuration.
* js/test-file-size (2020-11-06) 1 commit
(merged to 'next' on 2020-11-09 at b3594d0150)
+ tests: consolidate the `file_size` function into `test-lib-functions.sh`
Test clean-up.
* js/test-whitespace-fixes (2020-11-09) 6 commits
(merged to 'next' on 2020-11-09 at 383388929a)
+ t9603: use tabs for indentation
+ t5570: remove trailing padding
+ t5400,t5402: consistently indent with tabs, not with spaces
+ t3427: adjust stale comment
+ t3406: indent with tabs, not spaces
+ t1004: insert missing "branch" in a message
Test code clean-up.
* mc/typofix (2020-11-05) 1 commit
(merged to 'next' on 2020-11-09 at ed6106b6e3)
+ doc: fixing two trivial typos in Documentation/
Docfix.
* rs/clear-commit-marks-in-repo (2020-10-31) 2 commits
(merged to 'next' on 2020-11-04 at cb1e1d73cf)
+ bisect: clear flags in passed repository
+ object: allow clear_commit_marks_all to handle any repo
Code clean-up.
* rs/pack-write-hashwrite-simplify (2020-11-01) 1 commit
(merged to 'next' on 2020-11-04 at 7194d3e811)
+ pack-write: use hashwrite_be32() instead of double-buffering array
Code clean-up.
* rs/worktree-list-show-locked (2020-11-03) 1 commit
(merged to 'next' on 2020-11-04 at 5f4fa51a91)
+ t2402: fix typo
Typofix.
* sd/prompt-local-variable (2020-11-01) 1 commit
(merged to 'next' on 2020-11-04 at ddc4192867)
+ git-prompt.sh: localize `option` in __git_ps1_show_upstream
Code clean-up.
* so/format-patch-doc-on-default-diff-format (2020-10-31) 1 commit
(merged to 'next' on 2020-11-04 at 692e0b2f7a)
+ doc/diff-options: fix out of place mentions of '--patch/-p'
Docfix.
--------------------------------------------------
[New Topics]
* ps/update-ref-multi-transaction (2020-11-10) 4 commits
- update-ref: disallow "start" for ongoing transactions
- p1400: use `git-update-ref --stdin` to test multiple transactions
- update-ref: allow creation of multiple transactions
- t1400: avoid touching refs on filesystem
"git update-ref --stdin" learns to take multiple transactions in a
single session.
* fc/bash-completion-alias-of-alias (2020-11-09) 2 commits
(merged to 'next' on 2020-11-10 at 75f1f2b8a8)
+ completion: bash: check for alias loop
+ completion: bash: support recursive aliases
The command line completion script (in contrib/) learned to expand
commands that are alias of alias.
Will merge to 'master'.
* jc/blame-ignore-fix (2020-11-10) 1 commit
(merged to 'next' on 2020-11-10 at 384ace449d)
+ blame: silently ignore invalid ignore file objects
"git blame --ignore-revs-file=<file>" learned to ignore a
non-existent object name in the input, instead of complaining.
Will merge to 'master'.
* jk/rev-parse-end-of-options (2020-11-10) 3 commits
(merged to 'next' on 2020-11-11 at 2d517d1608)
+ rev-parse: handle --end-of-options
+ rev-parse: put all options under the "-" check
+ rev-parse: don't accept options after dashdash
"git rev-parse" learned the "--end-of-options" to help scripts to
safely take a parameter that is supposed to be a revision, e.g.
"git rev-parse --verify -q --end-of-options $rev".
Will merge to 'master'.
* fc/bash-completion-post-2.29 (2020-11-10) 26 commits
- completion: bash: shuffle __gitcomp functions
- completion: bash: cleanup __gitcomp* invocations
- completion: bash: add __gitcomp_opts
- completion: bash: improve __gitcomp description
- completion: bash: rename _get_comp_words_by_ref()
- completion: bash: trivial cleanup
- completion: bash: cleanup _get_comp_words_by_ref()
- completion: bash: refactor _get_comp_words_by_ref()
- completion: bash: simplify _get_comp_words_by_ref()
- test: completion: switch __gitcomp_nl prefix test
- completion: bash: simplify config_variable_name
- completion: bash: improve __gitcomp suffix code
- completion: bash: change suffix check in __gitcomp
- completion: bash: simplify __gitcomp
- completion: bash: refactor __gitcomp
- completion: bash: simplify equal suffix check
- completion: bash: factor out check in __gitcomp
- completion: bash: get rid of any non-append code
- completion: bash: get rid of _append() functions
- completion: bash: remove non-append functionality
- test: completion: add run_func() helper
- test: completion: fix currently typed words
- completion: bash: do not modify COMP_WORDBREAKS
- completion: bash: fix for suboptions with value
- completion: bash: add correct suffix in variables
- completion: bash: fix prefix detection in branch.*
* js/add-i-color-fix (2020-11-11) 11 commits
- add -i: verify in the tests that colors can be overridden
- add -p: prefer color.diff.context over color.diff.plain
- add -i (Perl version): include indentation in the colored header
- add -i (built-in): use the same indentation as the Perl version
- add -p (built-in): do not color the progress indicator separately
- add -i (built-in): use correct names to load color.diff.* config
- add -i (built-in): prevent the `reset` "color" from being configured
- add -i: use `reset_color` consistently
- add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers
- add -i (built-in): send error messages to stderr
- add -i (built-in): do show an error message for incorrect inputs
"git add -i" failed to honor custom colors configured to show
patches, which has been corrected.
The last step may want to be polished further.
cf. <20201111023549.GB806755@coredump.intra.peff.net>
* ab/config-mak-uname-simplify (2020-11-11) 2 commits
- config.mak.uname: remove unused NEEDS_SSL_WITH_CURL flag
- config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag
* pd/mergetool-nvimdiff (2020-11-11) 2 commits
- mergetool: avoid letting `list_tool_variants` break user-defined setups
- mergetools/bc: add `bc4` to the alias list for Beyond Compare
--------------------------------------------------
[Stalled]
* es/config-hooks (2020-10-16) 8 commits
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
* ag/merge-strategies-in-c (2020-10-06) 11 commits
. sequencer: use the "octopus" merge strategy without forking
. sequencer: use the "resolve" strategy without forking
. merge: use the "octopus" strategy without forking
. merge: use the "resolve" strategy without forking
. merge-octopus: rewrite in C
. merge-recursive: move better_branch_name() to merge.c
. merge-resolve: rewrite in C
. merge-index: don't fork if the requested program is `git-merge-one-file'
. merge-index: libify merge_one_path() and merge_all()
. merge-one-file: rewrite in C
. t6027: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Expecting an update.
cf.<693f417c-5612-7878-a055-2810f62af3b4@gmail.com>
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-10-09) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ss/submodule-add-in-c (2020-10-07) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
* mt/parallel-checkout-part-1 (2020-11-04) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
"git grep" has been tweaked to be limited to the sparse checkout
paths.
--------------------------------------------------
[Cooking]
* dd/upload-pack-stateless-eof (2020-10-30) 1 commit
(merged to 'next' on 2020-11-09 at 01a1f1d4fd)
+ upload-pack: allow stateless client EOF just prior to haves
"git fetch --depth=<n>" over the stateless RPC / smart HTTP
transport handled EOF from the client poorly at the server end.
Will merge to 'master'.
* js/trace2-session-id (2020-11-02) 11 commits
- receive-pack: log received client trace2 SID
- send-pack: advertise trace2 SID in capabilities
- upload-pack, serve: log received client trace2 SID
- fetch-pack: advertise trace2 SID in capabilities
- transport: log received server trace2 SID
- serve: advertise trace2 SID in v2 capabilities
- receive-pack: advertise trace2 SID in v0 capabilities
- upload-pack: advertise trace2 SID in v0 capabilities
- trace2: add a public function for getting the SID
- docs: new trace2.advertiseSID option
- docs: new capability to advertise trace2 SIDs
The transport layer was taught to optionally exchange the session
ID assigned by the trace2 subsystem during fetch/push transactions.
* jc/sparse-error-for-developer-build (2020-10-31) 1 commit
(merged to 'next' on 2020-11-10 at 8cfbe66736)
+ Makefile: enable -Wsparse-error for DEVELOPER build
"make DEVELOPER=1 sparse" used to run sparse and let it emit
warnings; now such warnings will cause an error.
Will merge to 'master'.
* pb/blame-funcname-range-userdiff (2020-11-01) 8 commits
(merged to 'next' on 2020-11-10 at 221bb3f773)
+ blame: simplify 'setup_blame_bloom_data' interface
+ blame: simplify 'setup_scoreboard' interface
+ blame: enable funcname blaming with userdiff driver
+ line-log: mention both modes in 'blame' and 'log' short help
+ doc: add more pointers to gitattributes(5) for userdiff
+ blame-options.txt: also mention 'funcname' in '-L' description
+ doc: line-range: improve formatting
+ doc: log, gitk: move '-L' description to 'line-range-options.txt'
"git blame -L :funcname -- path" did not work well for a path for
which a userdiff driver is defined.
Will merge to 'master'.
* so/log-diff-merge (2020-11-09) 27 commits
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- t4013: add test for --diff-merges=first-parent
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
* ds/maintenance-part-4 (2020-11-04) 4 commits
- maintenance: use Windows scheduled tasks
- maintenance: use launchctl on macOS
- maintenance: include 'cron' details in docs
- maintenance: extract platform-specific scheduling
(this branch uses ds/maintenance-part-3.)
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
* en/merge-ort-impl (2020-11-11) 21 commits
- merge-ort: free data structures in merge_finalize()
- merge-ort: add implementation of record_unmerged_index_entries()
- tree: enable cmp_cache_name_compare() to be used elsewhere
- merge-ort: add implementation of checkout()
- merge-ort: basic outline for merge_switch_to_result()
- merge-ort: step 3 of tree writing -- handling subdirectories as we go
- merge-ort: step 2 of tree writing -- function to create tree object
- merge-ort: step 1 of tree writing -- record basenames, modes, and oids
- merge-ort: have process_entries operate in a defined order
- merge-ort: add a preliminary simple process_entries() implementation
- merge-ort: avoid recursing into identical trees
- merge-ort: record stage and auxiliary info for every path
- merge-ort: compute a few more useful fields for collect_merge_info
- merge-ort: avoid repeating fill_tree_descriptor() on the same tree
- merge-ort: implement a very basic collect_merge_info()
- merge-ort: add an err() function similar to one from merge-recursive
- merge-ort: use histogram diff
- merge-ort: port merge_start() from merge-recursive
- merge-ort: add some high-level algorithm structure
- merge-ort: setup basic internal data structures
- Merge branch 'en/strmap' into en/merge-ort-impl
(this branch uses en/merge-ort-api-null-impl and en/strmap.)
* js/default-branch-name-adjust-t5515 (2020-11-02) 4 commits
(merged to 'next' on 2020-11-09 at 568ba5aba5)
+ t5515: use `main` as the name of the main branch for testing (conclusion)
+ t5515: use `main` as the name of the main branch for testing (part 3)
+ t5515: use `main` as the name of the main branch for testing (part 2)
+ t5515: use `main` as the name of the main branch for testing (part 1)
Prepare a test script to transition of the default branch name to
'main'.
Will merge to 'master'.
* jc/line-log-takes-no-pathspec (2020-11-04) 1 commit
(merged to 'next' on 2020-11-09 at 47c2c88b9d)
+ log: diagnose -L used with pathspec as an error
"git log -L<range>:<path>" is documented to take no pathspec, but
this was not enforced by the command line option parser, which has
been corrected.
Will merge to 'master'.
* jk/format-patch-output (2020-11-04) 3 commits
(merged to 'next' on 2020-11-09 at 1f1bb6ebff)
+ format-patch: support --output option
+ format-patch: tie file-opening logic to output_directory
+ format-patch: refactor output selection
"git format-patch --output=there" did not work as expected and
instead crashed. The option is now supported.
Will merge to 'master'.
* rs/empty-reflog-check-fix (2020-11-01) 1 commit
(merged to 'next' on 2020-11-09 at 3da6b6fef0)
+ stash: simplify reflog emptiness check
The code to see if "git stash drop" can safely remove refs/stash
has been made more carerful.
Will merge to 'master'.
* jc/format-patch-name-max (2020-11-09) 1 commit
(merged to 'next' on 2020-11-11 at 17e19bb17a)
+ format-patch: make output filename configurable
The maximum length of output filenames "git format-patch" creates
has become configurable (used to be capped at 64).
Will merge to 'master'.
* jk/diff-release-filespec-fix (2020-11-11) 2 commits
- t7800: simplify difftool test
(merged to 'next' on 2020-11-09 at 6d89b9602d)
+ diff: allow passing NULL to diff_free_filespec_data()
Running "git diff" while allowing external diff in a state with
unmerged paths used to segfault, which has been corrected.
Will merge to 'next'.
* jx/t5411-flake-fix (2020-11-11) 3 commits
- receive-pack: use default version 0 for proc-receive
- receive-pack: gently write messages to proc-receive
- t5411: new helper filter_out_user_friendly_and_stable_output
The exchange between receive-pack and proc-receive hook did not
carefully check for errors.
Will merge to 'next'?
* dg/bswap-msvc (2020-11-11) 2 commits
(merged to 'next' on 2020-11-11 at 6b9e819b17)
+ compat/bswap.h: don't assume MSVC is little-endian
(merged to 'next' on 2020-11-09 at 91a67b86f7)
+ compat/bswap.h: simplify MSVC endianness detection
Code simplification.
Will merge to 'master'.
* rs/archive-high-compression (2020-11-09) 1 commit
(merged to 'next' on 2020-11-10 at 9bee80950e)
+ archive: support compression levels beyond 9
"git archive" now allows compression level higher than "-9"
when generating tar.gz output.
Will merge to 'master'.
* av/fsmonitor-cleanup (2020-10-21) 2 commits
- fsmonitor: make output of test-dump-fsmonitor more concise
- fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
Code clean-up.
Will discard.
Unneeded?
cf. <20201022183822.GA781760@nand.local>
* en/merge-ort-api-null-impl (2020-11-02) 4 commits
(merged to 'next' on 2020-11-10 at ed9eed1558)
+ merge,rebase,revert: select ort or recursive by config or environment
+ fast-rebase: demonstrate merge-ort's API via new test-tool command
+ merge-ort-wrappers: new convience wrappers to mimic the old merge API
+ merge-ort: barebones API of new merge strategy with empty implementation
(this branch is used by en/merge-ort-impl.)
Preparation for a new merge strategy.
Will merge to 'master'.
* en/merge-tests (2020-10-26) 9 commits
(merged to 'next' on 2020-11-09 at 8ac9fe94a7)
+ t6423: add more details about direct resolution of directories
+ t6423: note improved ort handling with untracked files
+ t6423, t6436: note improved ort handling with dirty files
+ merge tests: expect slight differences in output for recursive vs. ort
+ t6423: expect improved conflict markers labels in the ort backend
+ t6404, t6423: expect improved rename/delete handling in ort backend
+ t6416: correct expectation for rename/rename(1to2) + directory/file
+ merge tests: expect improved directory/file conflict handling in ort
+ t/: new helper for tests that pass with ort but fail with recursive
Preparation for a new merge strategy.
Will merge to 'master'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
Needs doc update and also adjusting "git status".
* nk/perf-fsmonitor (2020-10-26) 10 commits
(merged to 'next' on 2020-11-09 at 9fed160a17)
+ t/perf/fsmonitor: add benchmark for dirty status
+ t/perf/fsmonitor: perf comparison of multiple fsmonitor integrations
+ t/perf/fsmonitor: initialize test with git reset
+ t/perf/fsmonitor: factor setup for fsmonitor into function
+ t/perf/fsmonitor: silence initial git commit
+ t/perf/fsmonitor: shorten DESC to basename
+ t/perf/fsmonitor: factor description out for readability
+ t/perf/fsmonitor: improve error message if typoing hook name
+ t/perf/fsmonitor: move watchman setup to one-time-repo-setup
+ t/perf/fsmonitor: separate one time repo initialization
Add t/perf support for fsmonitor.
Will merge to 'master'.
* pw/rebase-i-orig-head (2020-11-04) 4 commits
(merged to 'next' on 2020-11-10 at 038a5295f5)
+ rebase -i: simplify get_revision_ranges()
+ rebase -i: use struct object_id when writing state
+ rebase -i: use struct object_id rather than looking up commit
+ rebase -i: stop overwriting ORIG_HEAD buffer
"git rebase -i" did not store ORIG_HEAD correctly.
Will merge to 'master'.
cf. <xmqq7drbbcj5.fsf@gitster.c.googlers.com>
* en/strmap (2020-11-11) 15 commits
- shortlog: use strset from strmap.h
- Use new HASHMAP_INIT macro to simplify hashmap initialization
- strmap: take advantage of FLEXPTR_ALLOC_STR when relevant
- strmap: enable allocations to come from a mem_pool
- strmap: add a strset sub-type
- strmap: split create_entry() out of strmap_put()
- strmap: add functions facilitating use as a string->int map
- strmap: enable faster clearing and reusing of strmaps
- strmap: add more utility functions
- strmap: new utility functions
- hashmap: provide deallocation function names
- hashmap: introduce a new hashmap_partial_clear()
- hashmap: allow re-use after hashmap_free()
- hashmap: adjust spacing to fix argument alignment
- hashmap: add usage documentation explaining hashmap_free[_entries]()
(this branch is used by en/merge-ort-impl.)
A speciailization of hashmap that uses a string as key has been
introduced. Hopefully it will see wider use over time.
Will merge to 'next'.
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need
to introduce a class that is separate from symlinked .gitmodules
that probably is with potential consequences that is more grave?
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there.
cf. <85y2jiqq3c.fsf@gmail.com>
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
cf. <20201103053629.GA13228@Abhishek-Arch>
* ds/maintenance-part-3 (2020-10-16) 8 commits
(merged to 'next' on 2020-11-10 at fe9475c696)
+ maintenance: add troubleshooting guide to docs
+ maintenance: use 'incremental' strategy by default
+ maintenance: create maintenance.strategy config
+ maintenance: add start/stop subcommands
+ maintenance: add [un]register subcommands
+ for-each-repo: run subcommands on configured repos
+ maintenance: add --schedule option and config
+ maintenance: optionally skip --auto process
(this branch is used by ds/maintenance-part-4.)
Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.
Will merge to 'master'.
--------------------------------------------------
[Discarded]
* jk/use-strset-in-shortlog (2020-11-05) 1 commit
. shortlog: drop custom strset implementation
Now a part of the en/strmap topic.
* jt/push-with-base (2020-11-02) 5 commits
. SQUASH???
. Doc: push with --base
. remote-curl: teach --base for http(s)://
. push: teach --base for ssh:// and file://
. connect: refactor building of Extra Parameters
"git push" learns a way to tell an object that it expects the other
side to have and is usable as a common ancestor, which can be used
by the other side to shrink its initial ref advertisement.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Nov 2020, #02; Mon, 9)
@ 2020-11-09 23:42 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-11-09 23:42 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The third and fourth batches of topics in this cycle are in 'master'
now, including some microprojects by candidates for the Outreachy
program.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into. Some repositories have
only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/git-remote-exit-code (2020-10-27) 1 commit
(merged to 'next' on 2020-10-30 at 1fc119404b)
+ remote: add meaningful exit code on missing/existing
Exit codes from "git remote add" etc. were not usable by scripted
callers.
* as/tests-cleanup (2020-10-18) 1 commit
(merged to 'next' on 2020-10-28 at fd199beb31)
+ t2200,t9832: avoid using 'git' upstream in a pipe
Micro clean-up of a couple of test scripts.
* en/dir-rename-tests (2020-10-16) 4 commits
(merged to 'next' on 2020-10-28 at 7bbe123e70)
+ t6423: more involved rules for renaming directories into each other
+ t6423: update directory rename detection tests with new rule
+ t6423: more involved directory rename test
+ directory-rename-detection.txt: update references to regression tests
(this branch is used by en/merge-tests.)
More preliminary tests have been added to document desired outcome
of various "directory rename" situations.
* fc/zsh-completion (2020-10-28) 29 commits
(merged to 'next' on 2020-11-02 at 2c5e3a73ad)
+ zsh: update copyright notices
+ completion: bash: remove old compat wrappers
+ completion: bash: cleanup cygwin check
+ completion: bash: trivial cleanup
+ completion: zsh: add simple version check
+ completion: zsh: trivial simplification
+ completion: zsh: add alias descriptions
+ completion: zsh: improve command tags
+ completion: zsh: refactor command completion
+ completion: zsh: shuffle functions around
+ completion: zsh: simplify file_direct
+ completion: zsh: simplify nl_append
+ completion: zsh: trivial cleanup
+ completion: zsh: simplify direct compadd
+ completion: zsh: simplify compadd functions
+ completion: zsh: fix splitting of words
+ completion: zsh: add missing direct_append
+ completion: fix conflict with bashcomp
+ completion: zsh: fix completion for --no-.. options
+ completion: bash: remove zsh wrapper
+ completion: bash: synchronize zsh wrapper
+ completion: zsh: fix for command aliasing
+ completion: prompt: fix color for Zsh
+ completion: zsh: update slave script locations
+ completion: zsh: fix for directories with spaces
+ completion: zsh: reorganize install instructions
+ completion: zsh: fix bash script extension
+ completion: zsh: fix name due to broken autoloading
+ completion: zsh: fix __gitcomp_direct()
Zsh autocompletion (in contrib/) update.
* jk/checkout-index-errors (2020-10-27) 2 commits
(merged to 'next' on 2020-10-30 at 77dddffe1b)
+ checkout-index: propagate errors to exit code
+ checkout-index: drop error message from empty --stage=all
(this branch is used by mt/parallel-checkout-part-1.)
"git checkout-index" did not consistently signal an error with its
exit status.
* jk/committer-date-is-author-date-fix-simplify (2020-10-26) 1 commit
(merged to 'next' on 2020-10-30 at 9ba3fad57d)
+ am, sequencer: stop parsing our own committer ident
Code simplification.
* jk/perl-warning (2020-10-21) 1 commit
(merged to 'next' on 2020-10-28 at 5fcb98f2ff)
+ perl: check for perl warnings while running tests
Dev support.
cf. <20201022032400.GC1480820@coredump.intra.peff.net>
* jk/sideband-more-error-checking (2020-10-29) 1 commit
(merged to 'next' on 2020-10-30 at 8131784691)
+ sideband: diagnose more sideband anomalies
The code to detect premature EOF in the sideband demultiplexer has
been cleaned up.
* js/default-branch-name-adjust-t5411 (2020-10-31) 4 commits
(merged to 'next' on 2020-11-02 at d625eda73c)
+ t5411: finish preparing for `main` being the default branch name
+ t5411: adjust the remaining support files for init.defaultBranch=main
+ t5411: start adjusting the support files for init.defaultBranch=main
+ t5411: start using the default branch name "main"
Prepare a test script to transition of the default branch name to
'main'.
* mr/bisect-in-c-3 (2020-10-16) 7 commits
(merged to 'next' on 2020-10-28 at 435792b62f)
+ bisect--helper: retire `--bisect-autostart` subcommand
+ bisect--helper: retire `--write-terms` subcommand
+ bisect--helper: retire `--check-expected-revs` subcommand
+ bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
+ bisect--helper: retire `--next-all` subcommand
+ bisect--helper: retire `--bisect-clean-state` subcommand
+ bisect--helper: finish porting `bisect_start()` to C
Rewriting "git bisect" in C continues.
* nk/diff-files-vs-fsmonitor (2020-10-20) 7 commits
(merged to 'next' on 2020-10-28 at d3af804056)
+ p7519-fsmonitor: add a git add benchmark
+ p7519-fsmonitor: refactor to avoid code duplication
+ perf lint: add make test-lint to perf tests
+ t/perf: add fsmonitor perf test for git diff
+ t/perf/p7519-fsmonitor.sh: warm cache on first git status
+ t/perf/README: elaborate on output format
+ fsmonitor: use fsmonitor data in `git diff`
(this branch is used by nk/perf-fsmonitor.)
"git diff" and other commands that share the same machinery to
compare with working tree files have been taught to take advantage
of the fsmonitor data when available.
* pb/ref-filter-with-crlf (2020-10-29) 2 commits
(merged to 'next' on 2020-10-30 at 8be77584c5)
+ log, show: add tests for messages containing CRLF
+ ref-filter: handle CRLF at end-of-line more gracefully
A commit and tag object may have CR at the end of each and
every line (you can create such an object with hash-object or
using --cleanup=verbatim to decline the default clean-up
action), but it would make it impossible to have a blank line
to separate the title from the body of the message. Be lenient
and accept a line with lone CR on it as a blank line, too.
--------------------------------------------------
[New Topics]
* dd/upload-pack-stateless-eof (2020-10-30) 1 commit
(merged to 'next' on 2020-11-09 at 01a1f1d4fd)
+ upload-pack: allow stateless client EOF just prior to haves
"git fetch --depth=<n>" over the stateless RPC / smart HTTP
transport handled EOF from the client poorly at the server end.
Will merge to 'master'.
* js/trace2-session-id (2020-11-02) 11 commits
- receive-pack: log received client trace2 SID
- send-pack: advertise trace2 SID in capabilities
- upload-pack, serve: log received client trace2 SID
- fetch-pack: advertise trace2 SID in capabilities
- transport: log received server trace2 SID
- serve: advertise trace2 SID in v2 capabilities
- receive-pack: advertise trace2 SID in v0 capabilities
- upload-pack: advertise trace2 SID in v0 capabilities
- trace2: add a public function for getting the SID
- docs: new trace2.advertiseSID option
- docs: new capability to advertise trace2 SIDs
The transport layer was taught to optionally exchange the session
ID assigned by the trace2 subsystem during fetch/push transactions.
* so/format-patch-doc-on-default-diff-format (2020-10-31) 1 commit
(merged to 'next' on 2020-11-04 at 692e0b2f7a)
+ doc/diff-options: fix out of place mentions of '--patch/-p'
Docfix.
Will merge to 'master'.
* jc/sparse-error-for-developer-build (2020-10-31) 1 commit
- Makefile: enable -Wsparse-error for DEVELOPER build
"make DEVELOPER=1 sparse" used to run sparse and let it emit
warnings; now such warnings will cause an error.
Will merge to 'next'.
* pb/blame-funcname-range-userdiff (2020-11-01) 8 commits
- blame: simplify 'setup_blame_bloom_data' interface
- blame: simplify 'setup_scoreboard' interface
- blame: enable funcname blaming with userdiff driver
- line-log: mention both modes in 'blame' and 'log' short help
- doc: add more pointers to gitattributes(5) for userdiff
- blame-options.txt: also mention 'funcname' in '-L' description
- doc: line-range: improve formatting
- doc: log, gitk: move '-L' description to 'line-range-options.txt'
"git blame -L :funcname -- path" did not work well for a path for
which a userdiff driver is defined.
Will merge to 'next'.
* rs/clear-commit-marks-in-repo (2020-10-31) 2 commits
(merged to 'next' on 2020-11-04 at cb1e1d73cf)
+ bisect: clear flags in passed repository
+ object: allow clear_commit_marks_all to handle any repo
Code clean-up.
Will merge to 'master'.
* rs/pack-write-hashwrite-simplify (2020-11-01) 1 commit
(merged to 'next' on 2020-11-04 at 7194d3e811)
+ pack-write: use hashwrite_be32() instead of double-buffering array
Code clean-up.
Will merge to 'master'.
* sd/prompt-local-variable (2020-11-01) 1 commit
(merged to 'next' on 2020-11-04 at ddc4192867)
+ git-prompt.sh: localize `option` in __git_ps1_show_upstream
Code clean-up.
Will merge to 'master'.
* so/log-diff-merge (2020-11-09) 27 commits
- doc/git-show: include --diff-merges description
- doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- t4013: add test for --diff-merges=first-parent
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
"git log" learned a new "--diff-merges=<how>" option.
* cw/ci-ghwf-check-ws-errors (2020-11-03) 1 commit
(merged to 'next' on 2020-11-04 at dc1121823c)
+ ci: make the whitespace checker more robust
Dev support update.
Will merge to 'master'.
* ds/maintenance-part-4 (2020-11-04) 4 commits
- maintenance: use Windows scheduled tasks
- maintenance: use launchctl on macOS
- maintenance: include 'cron' details in docs
- maintenance: extract platform-specific scheduling
(this branch uses ds/maintenance-part-3.)
Follow-up on the "maintenance part-3" which introduced scheduled
maintenance tasks to support platforms whose native scheduling
methods are not 'cron'.
* en/merge-ort-impl (2020-11-06) 21 commits
- merge-ort: free data structures in merge_finalize()
- merge-ort: add implementation of record_unmerged_index_entries()
- tree: enable cmp_cache_name_compare() to be used elsewhere
- merge-ort: add implementation of checkout()
- merge-ort: basic outline for merge_switch_to_result()
- merge-ort: step 3 of tree writing -- handling subdirectories as we go
- merge-ort: step 2 of tree writing -- function to create tree object
- merge-ort: step 1 of tree writing -- record basenames, modes, and oids
- merge-ort: have process_entries operate in a defined order
- merge-ort: add a preliminary simple process_entries() implementation
- merge-ort: avoid recursing into identical trees
- merge-ort: record stage and auxiliary info for every path
- merge-ort: compute a few more useful fields for collect_merge_info
- merge-ort: avoid repeating fill_tree_descriptor() on the same tree
- merge-ort: implement a very basic collect_merge_info()
- merge-ort: add an err() function similar to one from merge-recursive
- merge-ort: use histogram diff
- merge-ort: port merge_start() from merge-recursive
- merge-ort: add some high-level algorithm structure
- merge-ort: setup basic internal data structures
- Merge branch 'en/strmap' into en/merge-ort-impl
(this branch uses en/merge-ort-api-null-impl and en/strmap.)
* js/default-branch-name-adjust-t5515 (2020-11-02) 4 commits
(merged to 'next' on 2020-11-09 at 568ba5aba5)
+ t5515: use `main` as the name of the main branch for testing (conclusion)
+ t5515: use `main` as the name of the main branch for testing (part 3)
+ t5515: use `main` as the name of the main branch for testing (part 2)
+ t5515: use `main` as the name of the main branch for testing (part 1)
Prepare a test script to transition of the default branch name to
'main'.
Will merge to 'master'.
* jt/push-with-base (2020-11-02) 5 commits
. SQUASH???
. Doc: push with --base
. remote-curl: teach --base for http(s)://
. push: teach --base for ssh:// and file://
. connect: refactor building of Extra Parameters
"git push" learns a way to tell an object that it expects the other
side to have and is usable as a common ancestor, which can be used
by the other side to shrink its initial ref advertisement.
* rs/worktree-list-show-locked (2020-11-03) 1 commit
(merged to 'next' on 2020-11-04 at 5f4fa51a91)
+ t2402: fix typo
Typofix.
Will merge to 'master'.
* jc/abbrev-doc (2020-11-04) 1 commit
(merged to 'next' on 2020-11-09 at 09efe81b8b)
+ doc: clarify that --abbrev=<n> is about the minimum length
The documentation on the "--abbrev=<n>" option did not say the
output may be longer than "<n>" hexdigits, which has been
clarified.
Will merge to 'master'.
* jc/line-log-takes-no-pathspec (2020-11-04) 1 commit
(merged to 'next' on 2020-11-09 at 47c2c88b9d)
+ log: diagnose -L used with pathspec as an error
"git log -L<range>:<path>" is documented to take no pathspec, but
this was not enforced by the command line option parser, which has
been corrected.
Will merge to 'master'.
* jk/format-patch-output (2020-11-04) 3 commits
(merged to 'next' on 2020-11-09 at 1f1bb6ebff)
+ format-patch: support --output option
+ format-patch: tie file-opening logic to output_directory
+ format-patch: refactor output selection
"git format-patch --output=there" did not work as expected and
instead crashed. The option is now supported.
Will merge to 'master'.
* rs/empty-reflog-check-fix (2020-11-01) 1 commit
(merged to 'next' on 2020-11-09 at 3da6b6fef0)
+ stash: simplify reflog emptiness check
The code to see if "git stash drop" can safely remove refs/stash
has been made more carerful.
Will merge to 'master'.
* mc/typofix (2020-11-05) 1 commit
(merged to 'next' on 2020-11-09 at ed6106b6e3)
+ doc: fixing two trivial typos in Documentation/
Docfix.
Will merge to 'master'.
* jc/format-patch-name-max (2020-11-06) 1 commit
- format-patch: make output filename configurable
The maximum length of output filenames "git format-patch" creates
has become configurable (used to be capped at 64).
Will merge to 'next'?
* jk/diff-release-filespec-fix (2020-11-06) 1 commit
(merged to 'next' on 2020-11-09 at 6d89b9602d)
+ diff: allow passing NULL to diff_free_filespec_data()
Running "git diff" while allowing external diff in a state with
unmerged paths used to segfault, which has been corrected.
Will merge to 'master'.
* js/ci-github-set-env (2020-11-06) 1 commit
(merged to 'next' on 2020-11-09 at c4ce007b4c)
+ ci: avoid using the deprecated `set-env` construct
CI update.
Will merge to 'master'.
* js/test-file-size (2020-11-06) 1 commit
(merged to 'next' on 2020-11-09 at b3594d0150)
+ tests: consolidate the `file_size` function into `test-lib-functions.sh`
Test clean-up.
Will merge to 'master'.
* jx/t5411-flake-fix (2020-11-09) 1 commit
. t5411: consistent result for proc-receive broken test
A flakey test has been cleaned up.
This merely is sweeping an underlying breakage under the rug.
cf. <20201109231246.GA677345@coredump.intra.peff.net>
* dg/bswap-msvc (2020-11-09) 1 commit
(merged to 'next' on 2020-11-09 at 91a67b86f7)
+ compat/bswap.h: simplify MSVC endianness detection
Code simplification.
Will merge to 'master'.
* js/p4-default-branch (2020-11-09) 1 commit
(merged to 'next' on 2020-11-09 at a4b08b45da)
+ p4: respect init.defaultBranch
"git p4" now honors init.defaultBranch configuration.
Will merge to 'master'.
* js/test-whitespace-fixes (2020-11-09) 6 commits
(merged to 'next' on 2020-11-09 at 383388929a)
+ t9603: use tabs for indentation
+ t5570: remove trailing padding
+ t5400,t5402: consistently indent with tabs, not with spaces
+ t3427: adjust stale comment
+ t3406: indent with tabs, not spaces
+ t1004: insert missing "branch" in a message
Test code clean-up.
Will merge to 'master'.
* rs/archive-high-compression (2020-11-09) 1 commit
- archive: support compression levels beyond 9
"git archive" now allows compression level higher than "-9"
when generating tar.gz output.
Will merge to 'next'?
--------------------------------------------------
[Stalled]
* es/config-hooks (2020-10-16) 8 commits
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
* ag/merge-strategies-in-c (2020-10-06) 11 commits
. sequencer: use the "octopus" merge strategy without forking
. sequencer: use the "resolve" strategy without forking
. merge: use the "octopus" strategy without forking
. merge: use the "resolve" strategy without forking
. merge-octopus: rewrite in C
. merge-recursive: move better_branch_name() to merge.c
. merge-resolve: rewrite in C
. merge-index: don't fork if the requested program is `git-merge-one-file'
. merge-index: libify merge_one_path() and merge_all()
. merge-one-file: rewrite in C
. t6027: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
Expecting an update.
cf.<693f417c-5612-7878-a055-2810f62af3b4@gmail.com>
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Expecting a reroll.
cf. <20201015000410.GB328643@google.com>
cf. <CAM4o00eefXK2CJ_FxwwVPpBKL01JsJANf+SdjCtw_0NVV82L+Q@mail.gmail.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-10-09) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ss/submodule-add-in-c (2020-10-07) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
* mt/parallel-checkout-part-1 (2020-11-04) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
"git grep" has been tweaked to be limited to the sparse checkout
paths.
--------------------------------------------------
[Cooking]
* av/fsmonitor-cleanup (2020-10-21) 2 commits
- fsmonitor: make output of test-dump-fsmonitor more concise
- fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
Code clean-up.
Will discard.
Unneeded?
cf. <20201022183822.GA781760@nand.local>
* jc/sequencer-stopped-sha-simplify (2020-10-21) 1 commit
(merged to 'next' on 2020-11-02 at ba3dd9eaf4)
+ sequencer: tolerate abbreviated stopped-sha file
Recently the format of an internal state file "rebase -i" uses has
been tightened up for consistency, which would hurt those who start
"rebase -i" with old git and then continue with new git. Loosen
the reader side a bit (which we may want to tighten again in a year
or so).
Will merge to 'master'
* en/merge-ort-api-null-impl (2020-11-02) 4 commits
- merge,rebase,revert: select ort or recursive by config or environment
- fast-rebase: demonstrate merge-ort's API via new test-tool command
- merge-ort-wrappers: new convience wrappers to mimic the old merge API
- merge-ort: barebones API of new merge strategy with empty implementation
(this branch is used by en/merge-ort-impl.)
Preparation for a new merge strategy.
Will merge to 'next'.
* en/merge-tests (2020-10-26) 9 commits
(merged to 'next' on 2020-11-09 at 8ac9fe94a7)
+ t6423: add more details about direct resolution of directories
+ t6423: note improved ort handling with untracked files
+ t6423, t6436: note improved ort handling with dirty files
+ merge tests: expect slight differences in output for recursive vs. ort
+ t6423: expect improved conflict markers labels in the ort backend
+ t6404, t6423: expect improved rename/delete handling in ort backend
+ t6416: correct expectation for rename/rename(1to2) + directory/file
+ merge tests: expect improved directory/file conflict handling in ort
+ t/: new helper for tests that pass with ort but fail with recursive
Preparation for a new merge strategy.
Will merge to 'master'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
Needs doc update and also adjusting "git status".
* nk/perf-fsmonitor (2020-10-26) 10 commits
(merged to 'next' on 2020-11-09 at 9fed160a17)
+ t/perf/fsmonitor: add benchmark for dirty status
+ t/perf/fsmonitor: perf comparison of multiple fsmonitor integrations
+ t/perf/fsmonitor: initialize test with git reset
+ t/perf/fsmonitor: factor setup for fsmonitor into function
+ t/perf/fsmonitor: silence initial git commit
+ t/perf/fsmonitor: shorten DESC to basename
+ t/perf/fsmonitor: factor description out for readability
+ t/perf/fsmonitor: improve error message if typoing hook name
+ t/perf/fsmonitor: move watchman setup to one-time-repo-setup
+ t/perf/fsmonitor: separate one time repo initialization
Add t/perf support for fsmonitor.
Will merge to 'master'.
* pw/rebase-i-orig-head (2020-11-04) 4 commits
- rebase -i: simplify get_revision_ranges()
- rebase -i: use struct object_id when writing state
- rebase -i: use struct object_id rather than looking up commit
- rebase -i: stop overwriting ORIG_HEAD buffer
"git rebase -i" did not store ORIG_HEAD correctly.
Will merge to 'next'.
cf. <xmqq7drbbcj5.fsf@gitster.c.googlers.com>
* en/strmap (2020-11-06) 15 commits
- shortlog: use strset from strmap.h
- Use new HASHMAP_INIT macro to simplify hashmap initialization
- strmap: take advantage of FLEXPTR_ALLOC_STR when relevant
- strmap: enable allocations to come from a mem_pool
- strmap: add a strset sub-type
- strmap: split create_entry() out of strmap_put()
- strmap: add functions facilitating use as a string->int map
- strmap: enable faster clearing and reusing of strmaps
- strmap: add more utility functions
- strmap: new utility functions
- hashmap: provide deallocation function names
- hashmap: introduce a new hashmap_partial_clear()
- hashmap: allow re-use after hashmap_free()
- hashmap: adjust spacing to fix argument alignment
- hashmap: add usage documentation explaining hashmap_free[_entries]()
(this branch is used by en/merge-ort-impl.)
A speciailization of hashmap that uses a string as key has been
introduced. Hopefully it will see wider use over time.
Will merge to 'next'?
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need
to introduce a class that is separate from symlinked .gitmodules
that probably is with potential consequences that is more grave?
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Getting there.
cf. <85y2jiqq3c.fsf@gmail.com>
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
cf. <20201103053629.GA13228@Abhishek-Arch>
* ds/maintenance-part-3 (2020-10-16) 8 commits
- maintenance: add troubleshooting guide to docs
- maintenance: use 'incremental' strategy by default
- maintenance: create maintenance.strategy config
- maintenance: add start/stop subcommands
- maintenance: add [un]register subcommands
- for-each-repo: run subcommands on configured repos
- maintenance: add --schedule option and config
- maintenance: optionally skip --auto process
(this branch is used by ds/maintenance-part-4.)
Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.
Will merge to 'next'?
--------------------------------------------------
[Discarded]
* jk/use-strset-in-shortlog (2020-11-05) 1 commit
. shortlog: drop custom strset implementation
Now a part of the en/strmap topic.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Nov 2020, #01; Mon, 2)
@ 2020-11-02 22:27 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-11-02 22:27 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The third batch of topics in this cycle are in 'master' now,
including some microprojects by candidates for the Outreachy
program.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into. Some repositories have
only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* as/sample-push-to-checkout-hook (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 644026c2f6)
+ hook: add sample template for push-to-checkout
Add a sample 'push-to-checkout' hook, that performs the same as
what the built-in default action does.
* bc/svn-hash-oid-fix (2020-10-21) 1 commit
(merged to 'next' on 2020-10-26 at 743b549d5d)
+ svn: use correct variable name for short OID
A recent oid->hash conversion missed one spot, breaking "git svn".
* bk/sob-dco (2020-10-20) 4 commits
(merged to 'next' on 2020-10-26 at d0e5066a7e)
+ Documentation: stylistically normalize references to Signed-off-by:
+ SubmittingPatches: clarify DCO is our --signoff rule
+ Documentation: clarify and expand description of --signoff
+ doc: preparatory clean-up of description on the sign-off option
Document that the meaning of a Signed-off-by trailer can vary from
project to project in the end-user documentation, and clarify what
it means to this project.
* cm/t7xxx-cleanup (2020-10-22) 6 commits
(merged to 'next' on 2020-10-26 at 8b58e54942)
+ t7102: prepare expected output inside test_expect_* block
+ t7201: put each command on a separate line
+ t7201: use 'git -C' to avoid subshell
+ t7102,t7201: remove whitespace after redirect operator
+ t7102,t7201: remove unnecessary blank spaces in test body
+ t7101,t7102,t7201: modernize test formatting
Originally merged to 'next' on 2020-10-23
Micro clean-up.
* ct/t0000-use-test-path-is-file (2020-10-18) 1 commit
(merged to 'next' on 2020-10-26 at 9b70aa748f)
+ t0000: use test_path_is_file instead of "test -f"
Originally merged to 'next' on 2020-10-23
Micro clean-up of a test script.
* dl/diff-merge-base (2020-09-21) 10 commits
(merged to 'next' on 2020-10-26 at 114d94030b)
+ contrib/completion: complete `git diff --merge-base`
+ builtin/diff-tree: learn --merge-base
+ builtin/diff-index: learn --merge-base
+ t4068: add --merge-base tests
+ diff-lib: define diff_get_merge_base()
+ diff-lib: accept option flags in run_diff_index()
+ contrib/completion: extract common diff/difftool options
+ git-diff.txt: backtick quote command text
+ git-diff-index.txt: make --cached description a proper sentence
+ t4068: remove unnecessary >tmp
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.
* dl/resurrect-update-for-sha256 (2020-10-08) 2 commits
(merged to 'next' on 2020-10-26 at 7e94297aa4)
+ contrib/git-resurrect.sh: use hash-agnostic OID pattern
+ contrib/git-resurrect.sh: indent with tabs
Originally merged to 'next' on 2020-10-23
"git resurrect" script (in contrib/) learned that the object names
may be longer than 40-hex depending on the hash function in use.
* ds/commit-graph-merging-fix (2020-10-09) 2 commits
(merged to 'next' on 2020-10-26 at a0cf763826)
+ commit-graph: don't write commit-graph when disabled
+ commit-graph: ignore duplicates when merging layers
When "git commit-graph" detects the same commit recorded more than
once while it is merging the layers, it used to die. The code now
ignores all but one of them and continues.
* ds/maintenance-commit-graph-auto-fix (2020-10-12) 2 commits
(merged to 'next' on 2020-10-26 at 429d1371d8)
+ maintenance: core.commitGraph=false prevents writes
+ maintenance: test commit-graph auto condition
Test-coverage enhancement of running commit-graph task "git
maintenance" as needed led to discovery and fix of a bug.
* en/sequencer-rollback-lock-cleanup (2020-10-21) 1 commit
(merged to 'next' on 2020-10-26 at 1234e8297f)
+ sequencer: remove duplicate rollback_lock_file() call
Code clean-up.
* en/t7518-unflake (2020-10-18) 1 commit
(merged to 'next' on 2020-10-26 at 443459f7ca)
+ t7518: fix flaky grep invocation
Originally merged to 'next' on 2020-10-23
Work around flakiness in a test.
* en/test-selector (2020-10-18) 3 commits
(merged to 'next' on 2020-10-26 at 3d6e77c3ff)
+ test-lib: reduce verbosity of skipped tests
+ t6006, t6012: adjust tests to use 'setup' instead of synonyms
+ test-lib: allow selecting tests by substring/glob with --run
Our test scripts can be told to run only individual pieces while
skipping others with the "--run=..." option; they were taught to
take a substring of test title, in addition to numbers, to name the
test pieces to run.
* es/test-cmp-typocatcher (2020-10-20) 1 commit
(merged to 'next' on 2020-10-26 at 62d89db753)
+ Revert "test_cmp: diagnose incorrect arguments"
A test helper "test_cmp A B" was taught to diagnose missing files A
or B as a bug in test, but some tests legitimately wanted to notice
a failure to even create file B as an error, in addition to leaving
the expected result in it, and were misdiagnosed as a bug. This
has been corrected.
* es/tutorial-mention-asciidoc-early (2020-10-16) 1 commit
(merged to 'next' on 2020-10-28 at 96e0d84d94)
+ MyFirstContribution: clarify asciidoc dependency
Doc update.
* jc/doc-final-resend (2020-10-26) 1 commit
(merged to 'next' on 2020-10-30 at 2dd2c8a0d9)
+ SubmittingPatches: clarify the purpose of the final resend
Update developer doc.
* jk/fast-import-marks-alloc-fix (2020-10-15) 1 commit
(merged to 'next' on 2020-10-26 at 2f0a73fd48)
+ fast-import: fix over-allocation of marks storage
"git fast-import" wasted a lot of memory when many marks were in use.
* jk/fast-import-marks-cleanup (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 1ba987dd54)
+ fast-import: remove duplicated option-parsing line
Code clean-up.
* jk/no-common (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at c888cb8b28)
+ config.mak.dev: build with -fno-common
Dev support to catch a tentative definition of a variable in our C
code as an error.
* jk/report-fn-typedef (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at fa4e128b65)
+ usage: define a type for a reporting function
Code clean-up.
* js/avoid-split-sideband-message (2020-10-27) 3 commits
(merged to 'next' on 2020-10-27 at 06b2f75522)
+ test-pkt-line: drop colon from sideband identity
(merged to 'next' on 2020-10-26 at 1b550f3245)
+ sideband: report unhandled incomplete sideband messages as bugs
+ sideband: avoid reporting incomplete sideband messages
(this branch is used by jk/sideband-more-error-checking.)
The side-band status report can be sent at the same time as the
primary payload multiplexed, but the demultiplexer on the receiving
end incorrectly split a single status report into two, which has
been corrected.
* js/ci-ghwf-dedup-tests (2020-10-12) 2 commits
(merged to 'next' on 2020-10-26 at 4832a8f40b)
+ ci: make the "skip-if-redundant" check more defensive
+ ci: work around old records of GitHub runs
Originally merged to 'next' on 2020-10-23
GitHub Actions automated test improvement to skip tests on a tree
identical to what has already been tested.
* js/default-branch-name-part-4-minus-1 (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at 0a66b76c66)
+ t1400: prepare for `main` being default branch name
+ tests: prepare aligned mentions of the default branch name
+ t9902: prepare a test for the upcoming default branch name
+ t3200: prepare for `main` being shorter than `master`
+ t5703: adjust a test case for the upcoming default branch name
+ t6200: adjust suppression pattern to also match "main"
+ tests: start moving to a different default main branch name
+ t9801: use `--` in preparation for default branch rename
+ fmt-merge-msg: also suppress "into main" by default
(this branch is used by js/default-branch-name-adjust-t5411.)
Adjust tests so that they won't scream when the default initial
branch name is changed to 'main'.
* js/t7006-cleanup (2020-10-21) 1 commit
(merged to 'next' on 2020-10-26 at b8582f842d)
+ t7006: Use test_path_is_* functions in test script
Code clean-up.
* jt/apply-reverse-twice (2020-10-20) 1 commit
(merged to 'next' on 2020-10-26 at f060893eb7)
+ apply: when -R, also reverse list of sections
"git apply -R" did not handle patches that touch the same path
twice correctly, which has been corrected. This is most relevant
in a patch that changes a path from a regular file to a symbolic
link (and vice versa).
* lo/zsh-completion (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 100dc6adde)
+ completion: fix zsh installation instructions
Update instructions for command line completion (in contrib/) for zsh.
* mk/diff-ignore-regex (2020-10-20) 2 commits
(merged to 'next' on 2020-10-26 at c68727da93)
+ diff: add -I<regex> that ignores matching changes
+ merge-base, xdiff: zero out xpparam_t structures
"git diff" family of commands learned the "-I<regex>" option to
ignore hunks whose changed lines all match the given pattern.
* nk/dir-c-comment-update (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 3a4cb82ad6)
+ dir.c: fix comments to agree with argument name
Update stale in-code comment.
* sc/sequencer-gpg-octopus (2020-10-18) 3 commits
(merged to 'next' on 2020-10-26 at e1c956e52a)
+ t3435: add tests for rebase -r GPG signing
+ sequencer: pass explicit --no-gpg-sign to merge
+ sequencer: fix gpg option passed to merge subcommand
"git rebase --rebase-merges" did not correctly pass --gpg-sign
command line option to underlying "git merge" when replaying a merge
using non-default merge strategy or when replaying an octopus merge
(because replaying a two-head merge with the default strategy was
done in a separate codepath, the problem did not trigger for most
users), which has been corrected.
* tk/credential-config (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 6ab486f389)
+ credential: load default config
"git credential' didn't honor the core.askPass configuration
variable (among other things), which has been corrected.
* ve/userdiff-bash (2020-10-22) 1 commit
(merged to 'next' on 2020-10-26 at 2b34be98fe)
+ userdiff: support Bash
The userdiff pattern learned to identify the function definition in
POSIX shells and bash.
--------------------------------------------------
[New Topics]
* dd/upload-pack-stateless-eof (2020-10-30) 1 commit
- upload-pack: allow stateless client EOF just prior to haves
* js/trace2-session-id (2020-10-31) 11 commits
- upload-pack.c: fix a sparse warning
- receive-pack: log received client trace2 SID
- send-pack: advertise trace2 SID in capabilities
- upload-pack, serve: log received client trace2 SID
- fetch-pack: advertise trace2 SID in capabilities
- transport: log received server trace2 SID
- serve: advertise trace2 SID in v2 capabilities
- receive-pack: advertise trace2 SID in v0 capabilities
- upload-pack: advertise trace2 SID in v0 capabilities
- docs: new trace2.advertiseSID option
- docs: new capability to advertise trace2 SIDs
* so/format-patch-doc-on-default-diff-format (2020-10-31) 1 commit
- doc/diff-options: fix out of place mentions of '--patch/-p'
* jc/sparse-error-for-developer-build (2020-10-31) 1 commit
- Makefile: enable -Wsparse-error for DEVELOPER build
* pb/blame-funcname-range-userdiff (2020-11-01) 8 commits
- blame: simplify 'setup_blame_bloom_data' interface
- blame: simplify 'setup_scoreboard' interface
- blame: enable funcname blaming with userdiff driver
- line-log: mention both modes in 'blame' and 'log' short help
- doc: add more pointers to gitattributes(5) for userdiff
- blame-options.txt: also mention 'funcname' in '-L' description
- doc: line-range: improve formatting
- doc: log, gitk: move '-L' description to 'line-range-options.txt'
* rs/clear-commit-marks-in-repo (2020-10-31) 2 commits
- bisect: clear flags in passed repository
- object: allow clear_commit_marks_all to handle any repo
* rs/empty-stash-check-fix (2020-11-01) 1 commit
- stash: simplify reflog emptiness check
* rs/pack-write-hashwrite-simplify (2020-11-01) 1 commit
- pack-write: use hashwrite_be32() instead of double-buffering array
* sd/prompt-local-variable (2020-11-01) 1 commit
- git-prompt.sh: localize `option` in __git_ps1_show_upstream
* so/log-diff-merge (2020-11-01) 26 commits
- doc/rev-list-options: document --first-parent implies --diff-merges=first-parent
- doc/diff-generate-patch: mention new --diff-merges option
- doc/git-log: describe new --diff-merges options
- t4013: add test for --diff-merges=first-parent
- diff-merges: implement new values for --diff-merges
- diff-merges: make -m/-c/--cc explicitly mutually exclusive
- diff-merges: refactor opt settings into separate functions
- diff-merges: get rid of now empty diff_merges_init_revs()
- diff-merges: group diff-merge flags next to each other inside 'rev_info'
- diff-merges: split 'ignore_merges' field
- diff-merges: fix -m to properly override -c/--cc
- t4013: add tests for -m failing to override -c/--cc
- t4013: support test_expect_failure through ':failure' magic
- diff-merges: revise revs->diff flag handling
- diff-merges: introduce revs->first_parent_merges flag
- diff-merges: new function diff_merges_set_dense_combined_if_unset()
- diff-merges: new function diff_merges_suppress()
- diff-merges: re-arrange functions to match the order they are called in
- diff-merges: rename diff_merges_default_to_enable() to match semantics
- diff-merges: move checks for first_parent_only out of the module
- diff-merges: rename all functions to have common prefix
- revision: move diff merges functions to its own diff-merges.c
- revision: provide implementation for diff merges tweaks
- revision: factor out initialization of diff-merge related settings
- revision: factor out setup of diff-merge related settings
- revision: factor out parsing of diff-merge related options
--------------------------------------------------
[Stalled]
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
cf. <20201015000410.GB328643@google.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-10-09) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Needs Review]
* ag/merge-strategies-in-c (2020-10-06) 11 commits
. sequencer: use the "octopus" merge strategy without forking
. sequencer: use the "resolve" strategy without forking
. merge: use the "octopus" strategy without forking
. merge: use the "resolve" strategy without forking
. merge-octopus: rewrite in C
. merge-recursive: move better_branch_name() to merge.c
. merge-resolve: rewrite in C
. merge-index: don't fork if the requested program is `git-merge-one-file'
. merge-index: libify merge_one_path() and merge_all()
. merge-one-file: rewrite in C
. t6027: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
* ss/submodule-add-in-c (2020-10-07) 3 commits
. t7400: add test to check 'submodule add' for tracked paths
. submodule: port submodule subcommand 'add' from shell to C
. dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
--------------------------------------------------
[Cooking]
* jk/sideband-more-error-checking (2020-10-29) 1 commit
(merged to 'next' on 2020-10-30 at 8131784691)
+ sideband: diagnose more sideband anomalies
The code to detect premature EOF in the sideband demultiplexer has
been cleaned up.
Will merge to 'master'.
* js/default-branch-name-adjust-t5411 (2020-10-31) 4 commits
(merged to 'next' on 2020-11-02 at d625eda73c)
+ t5411: finish preparing for `main` being the default branch name
+ t5411: adjust the remaining support files for init.defaultBranch=main
+ t5411: start adjusting the support files for init.defaultBranch=main
+ t5411: start using the default branch name "main"
Prepare a test script to transition of the default branch name to
'main'.
Will merge to 'master'.
* av/fsmonitor-cleanup (2020-10-21) 2 commits
- fsmonitor: make output of test-dump-fsmonitor more concise
- fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
Code clean-up.
Unneeded? Perhaps will drop.
cf. <20201022183822.GA781760@nand.local>
* jc/sequencer-stopped-sha-simplify (2020-10-21) 1 commit
(merged to 'next' on 2020-11-02 at ba3dd9eaf4)
+ sequencer: tolerate abbreviated stopped-sha file
Recently the format of an internal state file "rebase -i" uses has
been tightened up for consistency, which would hurt those who start
"rebase -i" with old git and then continue with new git. Loosen
the reader side a bit (which we may want to tighten again in a year
or so).
Will merge to 'master'
* jk/perl-warning (2020-10-21) 1 commit
(merged to 'next' on 2020-10-28 at 5fcb98f2ff)
+ perl: check for perl warnings while running tests
Dev support.
Will merge to 'master'.
cf. <20201022032400.GC1480820@coredump.intra.peff.net>
* pb/ref-filter-with-crlf (2020-10-29) 2 commits
(merged to 'next' on 2020-10-30 at 8be77584c5)
+ log, show: add tests for messages containing CRLF
+ ref-filter: handle CRLF at end-of-line more gracefully
A commit and tag object may have CR at the end of each and
every line (you can create such an object with hash-object or
using --cleanup=verbatim to decline the default clean-up
action), but it would make it impossible to have a blank line
to separate the title from the body of the message. Be lenient
and accept a line with lone CR on it as a blank line, too.
Will merge to 'master'.
* ab/git-remote-exit-code (2020-10-27) 1 commit
(merged to 'next' on 2020-10-30 at 1fc119404b)
+ remote: add meaningful exit code on missing/existing
Exit codes from "git remote add" etc. were not usable by scripted
callers.
Will merge to 'master'.
* en/merge-ort-api-null-impl (2020-10-29) 4 commits
- merge,rebase,revert: select ort or recursive by config or environment
- fast-rebase: demonstrate merge-ort's API via new test-tool command
- merge-ort-wrappers: new convience wrappers to mimic the old merge API
- merge-ort: barebones API of new merge strategy with empty implementation
Preparation for a new merge strategy.
Looking good.
* en/merge-tests (2020-10-26) 9 commits
- t6423: add more details about direct resolution of directories
- t6423: note improved ort handling with untracked files
- t6423, t6436: note improved ort handling with dirty files
- merge tests: expect slight differences in output for recursive vs. ort
- t6423: expect improved conflict markers labels in the ort backend
- t6404, t6423: expect improved rename/delete handling in ort backend
- t6416: correct expectation for rename/rename(1to2) + directory/file
- merge tests: expect improved directory/file conflict handling in ort
- t/: new helper for tests that pass with ort but fail with recursive
(this branch uses en/dir-rename-tests.)
Preparation for a new merge strategy.
* jk/committer-date-is-author-date-fix-simplify (2020-10-26) 1 commit
(merged to 'next' on 2020-10-30 at 9ba3fad57d)
+ am, sequencer: stop parsing our own committer ident
Code simplification.
Will merge to 'master'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
Needs doc update.
* fc/zsh-completion (2020-10-28) 29 commits
(merged to 'next' on 2020-11-02 at 2c5e3a73ad)
+ zsh: update copyright notices
+ completion: bash: remove old compat wrappers
+ completion: bash: cleanup cygwin check
+ completion: bash: trivial cleanup
+ completion: zsh: add simple version check
+ completion: zsh: trivial simplification
+ completion: zsh: add alias descriptions
+ completion: zsh: improve command tags
+ completion: zsh: refactor command completion
+ completion: zsh: shuffle functions around
+ completion: zsh: simplify file_direct
+ completion: zsh: simplify nl_append
+ completion: zsh: trivial cleanup
+ completion: zsh: simplify direct compadd
+ completion: zsh: simplify compadd functions
+ completion: zsh: fix splitting of words
+ completion: zsh: add missing direct_append
+ completion: fix conflict with bashcomp
+ completion: zsh: fix completion for --no-.. options
+ completion: bash: remove zsh wrapper
+ completion: bash: synchronize zsh wrapper
+ completion: zsh: fix for command aliasing
+ completion: prompt: fix color for Zsh
+ completion: zsh: update slave script locations
+ completion: zsh: fix for directories with spaces
+ completion: zsh: reorganize install instructions
+ completion: zsh: fix bash script extension
+ completion: zsh: fix name due to broken autoloading
+ completion: zsh: fix __gitcomp_direct()
Zsh autocompletion (in contrib/) update.
Will merge to 'master'.
* nk/perf-fsmonitor (2020-10-26) 10 commits
- t/perf/fsmonitor: add benchmark for dirty status
- t/perf/fsmonitor: perf comparison of multiple fsmonitor integrations
- t/perf/fsmonitor: initialize test with git reset
- t/perf/fsmonitor: factor setup for fsmonitor into function
- t/perf/fsmonitor: silence initial git commit
- t/perf/fsmonitor: shorten DESC to basename
- t/perf/fsmonitor: factor description out for readability
- t/perf/fsmonitor: improve error message if typoing hook name
- t/perf/fsmonitor: move watchman setup to one-time-repo-setup
- t/perf/fsmonitor: separate one time repo initialization
(this branch uses nk/diff-files-vs-fsmonitor.)
Add t/perf support for fsmonitor.
* jk/checkout-index-errors (2020-10-27) 2 commits
(merged to 'next' on 2020-10-30 at 77dddffe1b)
+ checkout-index: propagate errors to exit code
+ checkout-index: drop error message from empty --stage=all
(this branch is used by mt/parallel-checkout-part-1.)
"git checkout-index" did not consistently signal an error with its
exit status.
Will merge to 'master'.
* pw/rebase-i-orig-head (2020-10-27) 4 commits
- rebase -i: simplify get_revision_ranges()
- rebase -i: use struct object_id when writing state
- rebase -i: use struct object_id rather than looking up commit
- rebase -i: stop overwriting ORIG_HEAD buffer
"git rebase -i" did not
Expecting an update to the log message, but otherwise the change
looked sensible.
cf. <xmqq7drbbcj5.fsf@gitster.c.googlers.com>
* en/strmap (2020-11-02) 13 commits
- Use new HASHMAP_INIT macro to simplify hashmap initialization
- strmap: take advantage of FLEXPTR_ALLOC_STR when relevant
- strmap: enable allocations to come from a mem_pool
- strmap: add a strset sub-type
- strmap: add functions facilitating use as a string->int map
- strmap: enable faster clearing and reusing of strmaps
- strmap: add more utility functions
- strmap: new utility functions
- hashmap: provide deallocation function names
- hashmap: introduce a new hashmap_partial_clear()
- hashmap: allow re-use after hashmap_free()
- hashmap: adjust spacing to fix argument alignment
- hashmap: add usage documentation explaining hashmap_free[_entries]()
A speciailization of hashmap that uses a string as key has been
introduced. Hopefully it will see wider use over time.
Rerolled.
cf. <20201023080202.GA4012156@coredump.intra.peff.net>
cf. <CABPp-BFV8ZAu5vLarG2mX8gT5bfV31oqbd-vjAQF_YDcyNSRiw@mail.gmail.com>
* mr/bisect-in-c-3 (2020-10-16) 7 commits
(merged to 'next' on 2020-10-28 at 435792b62f)
+ bisect--helper: retire `--bisect-autostart` subcommand
+ bisect--helper: retire `--write-terms` subcommand
+ bisect--helper: retire `--check-expected-revs` subcommand
+ bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
+ bisect--helper: retire `--next-all` subcommand
+ bisect--helper: retire `--bisect-clean-state` subcommand
+ bisect--helper: finish porting `bisect_start()` to C
Rewriting "git bisect" in C continues.
Will merge to 'master'.
* as/tests-cleanup (2020-10-18) 1 commit
(merged to 'next' on 2020-10-28 at fd199beb31)
+ t2200,t9832: avoid using 'git' upstream in a pipe
Micro clean-up of a couple of test scripts.
Will merge to 'master'.
* en/dir-rename-tests (2020-10-16) 4 commits
(merged to 'next' on 2020-10-28 at 7bbe123e70)
+ t6423: more involved rules for renaming directories into each other
+ t6423: update directory rename detection tests with new rule
+ t6423: more involved directory rename test
+ directory-rename-detection.txt: update references to regression tests
(this branch is used by en/merge-tests.)
More preliminary tests have been added to document desired outcome
of various "directory rename" situations.
Will merge to 'master'.
* nk/diff-files-vs-fsmonitor (2020-10-20) 7 commits
(merged to 'next' on 2020-10-28 at d3af804056)
+ p7519-fsmonitor: add a git add benchmark
+ p7519-fsmonitor: refactor to avoid code duplication
+ perf lint: add make test-lint to perf tests
+ t/perf: add fsmonitor perf test for git diff
+ t/perf/p7519-fsmonitor.sh: warm cache on first git status
+ t/perf/README: elaborate on output format
+ fsmonitor: use fsmonitor data in `git diff`
(this branch is used by nk/perf-fsmonitor.)
"git diff" and other commands that share the same machinery to
compare with working tree files have been taught to take advantage
of the fsmonitor data when available.
Will merge to 'master'.
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need
to introduce a class that is separate from symlinked .gitmodules
that probably is with potential consequences that is more grave?
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Almost there.
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
* mt/parallel-checkout-part-1 (2020-10-29) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
(this branch uses jk/checkout-index-errors.)
Parallel checkout.
* ds/maintenance-part-3 (2020-10-16) 8 commits
- maintenance: add troubleshooting guide to docs
- maintenance: use 'incremental' strategy by default
- maintenance: create maintenance.strategy config
- maintenance: add start/stop subcommands
- maintenance: add [un]register subcommands
- for-each-repo: run subcommands on configured repos
- maintenance: add --schedule option and config
- maintenance: optionally skip --auto process
Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.
* es/config-hooks (2020-10-16) 8 commits
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
"git grep" has been tweaked to be limited to the sparse checkout
paths.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Oct 2020, #05; Thu, 29)
@ 2020-10-29 22:26 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-10-29 22:26 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Git 2.29.2 has been tagged. About 30+ topics are in 'next' waiting
their turns to graduate to 'master', while a handful more of topics
in 'seen' are marked to graduate to 'next'. Since it's been a while
since I sent out the "A note from the maintainer" message the last
time, I'll send out one shortly.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into. Some repositories have
only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[New Topics]
* jk/sideband-more-error-checking (2020-10-29) 1 commit
- sideband: diagnose more sideband anomalies
(this branch uses js/avoid-split-sideband-message.)
The code to detect premature EOF in the sideband demultiplexer has
been cleaned up.
Will merge to 'next'.
* js/default-branch-name-adjust-t5411 (2020-10-28) 4 commits
- t5411: finish preparing for `main` being the default branch name
- t5411: adjust the remaining support files for init.defaultBranch=main
- t5411: start adjusting the support files for init.defaultBranch=main
- t5411: start using the default branch name "main"
(this branch uses js/default-branch-name-part-4-minus-1.)
Prepare a test script to transition of the default branch name to
'main'.
Other than a minor nit, overall it looked sensible.
cf. <xmqq5z6u9kkv.fsf@gitster.c.googlers.com>
--------------------------------------------------
[Stalled]
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
cf. <20201015000410.GB328643@google.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-10-09) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Cooking]
* cm/t7xxx-cleanup (2020-10-22) 6 commits
(merged to 'next' on 2020-10-26 at 8b58e54942)
+ t7102: prepare expected output inside test_expect_* block
+ t7201: put each command on a separate line
+ t7201: use 'git -C' to avoid subshell
+ t7102,t7201: remove whitespace after redirect operator
+ t7102,t7201: remove unnecessary blank spaces in test body
+ t7101,t7102,t7201: modernize test formatting
Originally merged to 'next' on 2020-10-23
Micro clean-up.
Will merge to 'master'.
* js/avoid-split-sideband-message (2020-10-27) 3 commits
(merged to 'next' on 2020-10-27 at 06b2f75522)
+ test-pkt-line: drop colon from sideband identity
(merged to 'next' on 2020-10-26 at 1b550f3245)
+ sideband: report unhandled incomplete sideband messages as bugs
+ sideband: avoid reporting incomplete sideband messages
(this branch is used by jk/sideband-more-error-checking.)
The side-band status report can be sent at the same time as the
primary payload multiplexed, but the demultiplexer on the receiving
end incorrectly split a single status report into two, which has
been corrected.
Will merge to 'master'.
* jt/apply-reverse-twice (2020-10-20) 1 commit
(merged to 'next' on 2020-10-26 at f060893eb7)
+ apply: when -R, also reverse list of sections
"git apply -R" did not handle patches that touch the same path
twice correctly, which has been corrected. This is most relevant
in a patch that changes a path from a regular file to a symbolic
link (and vice versa).
Will merge to 'master'.
* av/fsmonitor-cleanup (2020-10-21) 2 commits
- fsmonitor: make output of test-dump-fsmonitor more concise
- fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
Code clean-up.
Unneeded? Perhaps will drop.
cf. <20201022183822.GA781760@nand.local>
* bc/svn-hash-oid-fix (2020-10-21) 1 commit
(merged to 'next' on 2020-10-26 at 743b549d5d)
+ svn: use correct variable name for short OID
A recent oid->hash conversion missed one spot, breaking "git svn".
Will merge to 'master'.
* en/sequencer-rollback-lock-cleanup (2020-10-21) 1 commit
(merged to 'next' on 2020-10-26 at 1234e8297f)
+ sequencer: remove duplicate rollback_lock_file() call
Code clean-up.
Will merge to 'master'.
* jc/sequencer-stopped-sha-simplify (2020-10-21) 1 commit
- sequencer: tolerate abbreviated stopped-sha file
Recently the format of an internal state file "rebase -i" uses has
been tightened up for consistency, which would hurt those who start
"rebase -i" with old git and then continue with new git. Loosen
the reader side a bit (which we may want to tighten again in a year
or so).
Is this a real issue, or just a theoretical one? Perhaps drop?
cf. <xmqqd01b429a.fsf@gitster.c.googlers.com>
* jk/perl-warning (2020-10-21) 1 commit
(merged to 'next' on 2020-10-28 at 5fcb98f2ff)
+ perl: check for perl warnings while running tests
Dev support.
Will merge to 'master'.
cf. <20201022032400.GC1480820@coredump.intra.peff.net>
* js/default-branch-name-part-4-minus-1 (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at 0a66b76c66)
+ t1400: prepare for `main` being default branch name
+ tests: prepare aligned mentions of the default branch name
+ t9902: prepare a test for the upcoming default branch name
+ t3200: prepare for `main` being shorter than `master`
+ t5703: adjust a test case for the upcoming default branch name
+ t6200: adjust suppression pattern to also match "main"
+ tests: start moving to a different default main branch name
+ t9801: use `--` in preparation for default branch rename
+ fmt-merge-msg: also suppress "into main" by default
(this branch is used by js/default-branch-name-adjust-t5411.)
Adjust tests so that they won't scream when the default initial
branch name is changed to 'main'.
Will merge to 'master'.
* js/t7006-cleanup (2020-10-21) 1 commit
(merged to 'next' on 2020-10-26 at b8582f842d)
+ t7006: Use test_path_is_* functions in test script
Code clean-up.
Will merge to 'master'.
* pb/ref-filter-with-crlf (2020-10-29) 2 commits
- log, show: add tests for messages containing CRLF
- ref-filter: handle CRLF at end-of-line more gracefully
A commit and tag object may have CR at the end of each and
every line (you can create such an object with hash-object or
using --cleanup=verbatim to decline the default clean-up
action), but it would make it impossible to have a blank line
to separate the title from the body of the message. Be lenient
and accept a line with lone CR on it as a blank line, too.
Will merge to 'next'.
* ve/userdiff-bash (2020-10-22) 1 commit
(merged to 'next' on 2020-10-26 at 2b34be98fe)
+ userdiff: support Bash
The userdiff pattern learned to identify the function definition in
POSIX shells and bash.
Will merge to 'master'.
* ab/git-remote-exit-code (2020-10-27) 1 commit
- remote: add meaningful exit code on missing/existing
Exit codes from "git remote add" etc. were not usable by scripted
callers.
Will merge to 'next'.
* en/merge-ort-api-null-impl (2020-10-29) 4 commits
- merge,rebase,revert: select ort or recursive by config or environment
- fast-rebase: demonstrate merge-ort's API via new test-tool command
- merge-ort-wrappers: new convience wrappers to mimic the old merge API
- merge-ort: barebones API of new merge strategy with empty implementation
Preparation for a new merge strategy.
Looking good.
* en/merge-tests (2020-10-26) 9 commits
- t6423: add more details about direct resolution of directories
- t6423: note improved ort handling with untracked files
- t6423, t6436: note improved ort handling with dirty files
- merge tests: expect slight differences in output for recursive vs. ort
- t6423: expect improved conflict markers labels in the ort backend
- t6404, t6423: expect improved rename/delete handling in ort backend
- t6416: correct expectation for rename/rename(1to2) + directory/file
- merge tests: expect improved directory/file conflict handling in ort
- t/: new helper for tests that pass with ort but fail with recursive
(this branch uses en/dir-rename-tests.)
Preparation for a new merge strategy.
* jk/committer-date-is-author-date-fix-simplify (2020-10-26) 1 commit
- am, sequencer: stop parsing our own committer ident
Code symplification.
Will merge to 'next'.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
Needs doc update.
* fc/zsh-completion (2020-10-28) 29 commits
- zsh: update copyright notices
- completion: bash: remove old compat wrappers
- completion: bash: cleanup cygwin check
- completion: bash: trivial cleanup
- completion: zsh: add simple version check
- completion: zsh: trivial simplification
- completion: zsh: add alias descriptions
- completion: zsh: improve command tags
- completion: zsh: refactor command completion
- completion: zsh: shuffle functions around
- completion: zsh: simplify file_direct
- completion: zsh: simplify nl_append
- completion: zsh: trivial cleanup
- completion: zsh: simplify direct compadd
- completion: zsh: simplify compadd functions
- completion: zsh: fix splitting of words
- completion: zsh: add missing direct_append
- completion: fix conflict with bashcomp
- completion: zsh: fix completion for --no-.. options
- completion: bash: remove zsh wrapper
- completion: bash: synchronize zsh wrapper
- completion: zsh: fix for command aliasing
- completion: prompt: fix color for Zsh
- completion: zsh: update slave script locations
- completion: zsh: fix for directories with spaces
- completion: zsh: reorganize install instructions
- completion: zsh: fix bash script extension
- completion: zsh: fix name due to broken autoloading
- completion: zsh: fix __gitcomp_direct()
Zsh autocompletion (in contrib/) update.
Will merge to 'next'.
* jc/doc-final-resend (2020-10-26) 1 commit
- SubmittingPatches: clarify the purpose of the final resend
Update developer doc.
Will merge to 'next'.
* nk/perf-fsmonitor (2020-10-26) 10 commits
- t/perf/fsmonitor: add benchmark for dirty status
- t/perf/fsmonitor: perf comparison of multiple fsmonitor integrations
- t/perf/fsmonitor: initialize test with git reset
- t/perf/fsmonitor: factor setup for fsmonitor into function
- t/perf/fsmonitor: silence initial git commit
- t/perf/fsmonitor: shorten DESC to basename
- t/perf/fsmonitor: factor description out for readability
- t/perf/fsmonitor: improve error message if typoing hook name
- t/perf/fsmonitor: move watchman setup to one-time-repo-setup
- t/perf/fsmonitor: separate one time repo initialization
(this branch uses nk/diff-files-vs-fsmonitor.)
Add t/perf support for fsmonitor.
* jk/checkout-index-errors (2020-10-27) 2 commits
- checkout-index: propagate errors to exit code
- checkout-index: drop error message from empty --stage=all
(this branch is used by mt/parallel-checkout-part-1.)
"git checkout-index" did not consistently signal an error with its
exit status.
Will merge to 'next'.
* pw/rebase-i-orig-head (2020-10-27) 4 commits
- rebase -i: simplify get_revision_ranges()
- rebase -i: use struct object_id when writing state
- rebase -i: use struct object_id rather than looking up commit
- rebase -i: stop overwriting ORIG_HEAD buffer
"git rebase -i" did not
Expecting an update to the log message, but otherwise the change
looked sensible.
cf. <xmqq7drbbcj5.fsf@gitster.c.googlers.com>
* en/strmap (2020-10-13) 10 commits
- strmap: enable allocations to come from a mem_pool
- strmap: add a strset sub-type
- strmap: add functions facilitating use as a string->int map
- strmap: enable faster clearing and reusing of strmaps
- strmap: add more utility functions
- strmap: new utility functions
- hashmap: introduce a new hashmap_partial_clear()
- hashmap: allow re-use after hashmap_free()
- hashmap: adjust spacing to fix argument alignment
- hashmap: add usage documentation explaining hashmap_free[_entries]()
A speciailization of hashmap that uses a string as key has been
introduced. Hopefully it will see wider use over time.
On hold.
cf. <20201023080202.GA4012156@coredump.intra.peff.net>
cf. <CABPp-BFV8ZAu5vLarG2mX8gT5bfV31oqbd-vjAQF_YDcyNSRiw@mail.gmail.com>
* en/test-selector (2020-10-18) 3 commits
(merged to 'next' on 2020-10-26 at 3d6e77c3ff)
+ test-lib: reduce verbosity of skipped tests
+ t6006, t6012: adjust tests to use 'setup' instead of synonyms
+ test-lib: allow selecting tests by substring/glob with --run
Our test scripts can be told to run only individual pieces while
skipping others with the "--run=..." option; they were taught to
take a substring of test title, in addition to numbers, to name the
test pices to run.
Will merge to 'master'.
* jk/report-fn-typedef (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at fa4e128b65)
+ usage: define a type for a reporting function
Code clean-up.
Will merge to 'master'.
* mr/bisect-in-c-3 (2020-10-16) 7 commits
(merged to 'next' on 2020-10-28 at 435792b62f)
+ bisect--helper: retire `--bisect-autostart` subcommand
+ bisect--helper: retire `--write-terms` subcommand
+ bisect--helper: retire `--check-expected-revs` subcommand
+ bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
+ bisect--helper: retire `--next-all` subcommand
+ bisect--helper: retire `--bisect-clean-state` subcommand
+ bisect--helper: finish porting `bisect_start()` to C
Rewriting "git bisect" in C continues.
Will merge to 'master'.
* sc/sequencer-gpg-octopus (2020-10-18) 3 commits
(merged to 'next' on 2020-10-26 at e1c956e52a)
+ t3435: add tests for rebase -r GPG signing
+ sequencer: pass explicit --no-gpg-sign to merge
+ sequencer: fix gpg option passed to merge subcommand
"git rebase --rebase-merges" did not correctly pass --gpg-sign
command line option to underying "git merge" when replaying a merge
using non-default merge strategy or when replaying an octopus merge
(because replaying a two-head merge with the default strategy was
done in a separate codepath, the problem did not trigger for most
users), which has been corrected.
Will merge to 'master'.
* as/sample-push-to-checkout-hook (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 644026c2f6)
+ hook: add sample template for push-to-checkout
Add a sample 'push-to-checkout' hook, that performs the same as
what the built-in default action does.
Will merge to 'master'.
* as/tests-cleanup (2020-10-18) 1 commit
(merged to 'next' on 2020-10-28 at fd199beb31)
+ t2200,t9832: avoid using 'git' upstream in a pipe
Micro clean-up of a couple of test scripts.
Will merge to 'master'.
* bk/sob-dco (2020-10-20) 4 commits
(merged to 'next' on 2020-10-26 at d0e5066a7e)
+ Documentation: stylistically normalize references to Signed-off-by:
+ SubmittingPatches: clarify DCO is our --signoff rule
+ Documentation: clarify and expand description of --signoff
+ doc: preparatory clean-up of description on the sign-off option
Document that the meaning of a Signed-off-by trailer can vary from
project to project in the end-user documentation, and clarify what
it means to this project.
Will merge to 'master'.
* ct/t0000-use-test-path-is-file (2020-10-18) 1 commit
(merged to 'next' on 2020-10-26 at 9b70aa748f)
+ t0000: use test_path_is_file instead of "test -f"
Originally merged to 'next' on 2020-10-23
Micro clean-up of a test script.
Will merge to 'master'.
* en/dir-rename-tests (2020-10-16) 4 commits
(merged to 'next' on 2020-10-28 at 7bbe123e70)
+ t6423: more involved rules for renaming directories into each other
+ t6423: update directory rename detection tests with new rule
+ t6423: more involved directory rename test
+ directory-rename-detection.txt: update references to regression tests
(this branch is used by en/merge-tests.)
More preliminary tests have been added to document desired outcome
of various "directory rename" situations.
Will merge to 'master'.
* en/t7518-unflake (2020-10-18) 1 commit
(merged to 'next' on 2020-10-26 at 443459f7ca)
+ t7518: fix flaky grep invocation
Originally merged to 'next' on 2020-10-23
Work around flakiness in a test.
Will merge to 'master'.
* es/test-cmp-typocatcher (2020-10-20) 1 commit
(merged to 'next' on 2020-10-26 at 62d89db753)
+ Revert "test_cmp: diagnose incorrect arguments"
A test helper "test_cmp A B" was taught to diagnose missing files A
or B as a bug in test, but some tests legitimately wanted to notice
a failure to even create file B as an error, in addition to leaving
the expected result in it, and were misdiagnosed as a bug. This
has been corrected.
Will merge to 'master'.
* es/tutorial-mention-asciidoc-early (2020-10-16) 1 commit
(merged to 'next' on 2020-10-28 at 96e0d84d94)
+ MyFirstContribution: clarify asciidoc dependency
Doc update.
Will merge to 'master'.
* jk/fast-import-marks-alloc-fix (2020-10-15) 1 commit
(merged to 'next' on 2020-10-26 at 2f0a73fd48)
+ fast-import: fix over-allocation of marks storage
"git fast-import" wasted a lot of memory when many marks were in use.
Will merge to 'master'.
* jk/fast-import-marks-cleanup (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 1ba987dd54)
+ fast-import: remove duplicated option-parsing line
Code clean-up.
Will merge to 'master'.
* jk/no-common (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at c888cb8b28)
+ config.mak.dev: build with -fno-common
Dev support to catch a tentative definition of a variable in our C
code as an error.
Will merge to 'master'.
* js/ci-ghwf-dedup-tests (2020-10-12) 2 commits
(merged to 'next' on 2020-10-26 at 4832a8f40b)
+ ci: make the "skip-if-redundant" check more defensive
+ ci: work around old records of GitHub runs
Originally merged to 'next' on 2020-10-23
GitHub Actions automated test improvement to skip tests on a tree
identical to what has already been tested.
Will merge to 'master'.
* lo/zsh-completion (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 100dc6adde)
+ completion: fix zsh installation instructions
Update instructions for command line completion (in contrib/) for zsh.
Will merge to 'master'.
* nk/diff-files-vs-fsmonitor (2020-10-20) 7 commits
(merged to 'next' on 2020-10-28 at d3af804056)
+ p7519-fsmonitor: add a git add benchmark
+ p7519-fsmonitor: refactor to avoid code duplication
+ perf lint: add make test-lint to perf tests
+ t/perf: add fsmonitor perf test for git diff
+ t/perf/p7519-fsmonitor.sh: warm cache on first git status
+ t/perf/README: elaborate on output format
+ fsmonitor: use fsmonitor data in `git diff`
(this branch is used by nk/perf-fsmonitor.)
"git diff" and other commands that share the same machinery to
compare with working tree files have been taught to take advantage
of the fsmonitor data when available.
Will merge to 'master'.
* nk/dir-c-comment-update (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 3a4cb82ad6)
+ dir.c: fix comments to agree with argument name
Update stale in-code comment.
Will merge to 'master'.
* tk/credential-config (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 6ab486f389)
+ credential: load default config
"git credential' didn't honor the core.askPass configuration
variable (among other things), which has been corrected.
Will merge to 'master'.
* ag/merge-strategies-in-c (2020-10-06) 11 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- t6027: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
It seems that there are real projects with .gitignore recorded as
symlinks, which may need to loosen the fsck setting. Do we need
to introduce a class that is separate from symlinked .gitmodules
that probably is with potential consequences that is more grave?
* dl/resurrect-update-for-sha256 (2020-10-08) 2 commits
(merged to 'next' on 2020-10-26 at 7e94297aa4)
+ contrib/git-resurrect.sh: use hash-agnostic OID pattern
+ contrib/git-resurrect.sh: indent with tabs
Originally merged to 'next' on 2020-10-23
"git resurrect" script (in contrib/) learned that the object names
may be longer than 40-hex depending on the hash function in use.
Will merge to 'master'.
* ds/commit-graph-merging-fix (2020-10-09) 2 commits
(merged to 'next' on 2020-10-26 at a0cf763826)
+ commit-graph: don't write commit-graph when disabled
+ commit-graph: ignore duplicates when merging layers
When "git commit-graph" detects the same commit recorded more than
once while it is merging the layers, it used to die. The code now
ignores all but one of them and continues.
Will merge to 'master'.
* ds/maintenance-commit-graph-auto-fix (2020-10-12) 2 commits
(merged to 'next' on 2020-10-26 at 429d1371d8)
+ maintenance: core.commitGraph=false prevents writes
+ maintenance: test commit-graph auto condition
Test-coverage enhancement of running commit-graph task "git
maintenance" as needed led to discovery and fix of a bug.
Will merge to 'master'.
* ss/submodule-add-in-c (2020-10-07) 3 commits
- t7400: add test to check 'submodule add' for tracked paths
- submodule: port submodule subcommand 'add' from shell to C
- dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Almost there.
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
* mk/diff-ignore-regex (2020-10-20) 2 commits
(merged to 'next' on 2020-10-26 at c68727da93)
+ diff: add -I<regex> that ignores matching changes
+ merge-base, xdiff: zero out xpparam_t structures
"git diff" family of commands learned the "-I<regex>" option to
ignore hunks whose changed lines all match the given pattern.
Will merge to 'master'.
* mt/parallel-checkout-part-1 (2020-10-29) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
(this branch uses jk/checkout-index-errors.)
Parallel checkout.
* dl/diff-merge-base (2020-09-21) 10 commits
(merged to 'next' on 2020-10-26 at 114d94030b)
+ contrib/completion: complete `git diff --merge-base`
+ builtin/diff-tree: learn --merge-base
+ builtin/diff-index: learn --merge-base
+ t4068: add --merge-base tests
+ diff-lib: define diff_get_merge_base()
+ diff-lib: accept option flags in run_diff_index()
+ contrib/completion: extract common diff/difftool options
+ git-diff.txt: backtick quote command text
+ git-diff-index.txt: make --cached description a proper sentence
+ t4068: remove unnecessary >tmp
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.
Will merge to 'master'.
* ds/maintenance-part-3 (2020-10-16) 8 commits
- maintenance: add troubleshooting guide to docs
- maintenance: use 'incremental' strategy by default
- maintenance: create maintenance.strategy config
- maintenance: add start/stop subcommands
- maintenance: add [un]register subcommands
- for-each-repo: run subcommands on configured repos
- maintenance: add --schedule option and config
- maintenance: optionally skip --auto process
Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.
* es/config-hooks (2020-10-16) 8 commits
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
"git grep" has been tweaked to be limited to the sparse checkout
paths.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Oct 2020, #04; Tue, 27)
@ 2020-10-27 23:33 5% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-10-27 23:33 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The first batch of topics in this cycle are merged to 'master', and
the tip of 'next' has been rewound and rebuilt. A handful of new
topics are also in 'next'.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into. Some repositories have
only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* cc/doc-filter-branch-typofix (2020-10-20) 1 commit
(merged to 'next' on 2020-10-23 at fc3c91dbc4)
+ filter-branch doc: fix filter-repo typo
Docfix.
* cw/ci-ghwf-check-ws-errors (2020-10-09) 1 commit
(merged to 'next' on 2020-10-26 at e7f8479a06)
+ ci: github action - add check for whitespace errors
Originally merged to 'next' on 2020-10-15
Dev support.
* dl/checkout-guess (2020-10-08) 2 commits
(merged to 'next' on 2020-10-26 at ba63e6e268)
+ checkout: learn to respect checkout.guess
+ Documentation/config/checkout: replace sq with backticks
Originally merged to 'next' on 2020-10-08
"git checkout" learned to use checkout.guess configuration variable
and enable/disable its "--[no-]guess" option accordingly.
* dl/checkout-p-merge-base (2020-10-07) 4 commits
(merged to 'next' on 2020-10-26 at 1c401bcb0b)
+ t2016: add a NEEDSWORK about the PERL prerequisite
+ add-patch: add NEEDSWORK about comparing commits
+ Doc: document "A...B" form for <tree-ish> in checkout and switch
+ builtin/checkout: fix `git checkout -p HEAD...` bug
Originally merged to 'next' on 2020-10-08
"git checkout -p A...B [-- <path>]" did not work, even though the
same command without "-p" correctly used the merge-base between
commits A and B.
* ds/maintenance-part-2 (2020-09-25) 8 commits
(merged to 'next' on 2020-10-26 at 226ac6646d)
+ maintenance: add incremental-repack auto condition
+ maintenance: auto-size incremental-repack batch
+ maintenance: add incremental-repack task
+ midx: use start_delayed_progress()
+ midx: enable core.multiPackIndex by default
+ maintenance: create auto condition for loose-objects
+ maintenance: add loose-objects task
+ maintenance: add prefetch task
(this branch is used by ds/maintenance-part-3.)
Originally merged to 'next' on 2020-10-04
"git maintenance", an extended big brother of "git gc", continues
to evolve.
* jk/committer-date-is-author-date-fix (2020-10-23) 3 commits
(merged to 'next' on 2020-10-23 at ee490e95b8)
+ rebase: fix broken email with --committer-date-is-author-date
+ am: fix broken email with --committer-date-is-author-date
+ t3436: check --committer-date-is-author-date result more carefully
(this branch is used by jk/committer-date-is-author-date-fix-simplify.)
In 2.29, "--committer-date-is-author-date" option of "rebase" and
"am" subcommands lost the e-mail address by mistake, which has been
corrected.
* js/no-builtins-on-disk-option (2020-10-21) 1 commit
(merged to 'next' on 2020-10-22 at 88cec4a607)
+ SKIP_DASHED_BUILT_INS: do not skip the bin/ programs
Brown-paper-bag fix.
* js/userdiff-php (2020-10-07) 1 commit
(merged to 'next' on 2020-10-26 at 21dc182f78)
+ userdiff: PHP: catch "abstract" and "final" functions
Originally merged to 'next' on 2020-10-08
Userdiff for PHP update.
* kb/userdiff-rust-macro-rules (2020-10-07) 1 commit
(merged to 'next' on 2020-10-26 at 681f75320c)
+ userdiff: recognize 'macro_rules!' as starting a Rust function block
Originally merged to 'next' on 2020-10-08
Userdiff for Rust update.
* rk/completion-stash (2020-10-07) 2 commits
(merged to 'next' on 2020-10-26 at d694e89155)
+ git-completion.bash: stash-show: complete $__git_diff_common_options
+ git-completion.bash: __git_diff_common_options: add --[no-]patch
Originally merged to 'next' on 2020-10-08
The command line completion script (in contrib/) learned that "git
stash show" takes the options "git diff" takes.
* rs/dist-doc-with-git-archive (2020-10-12) 2 commits
(merged to 'next' on 2020-10-26 at 1391e1ae82)
+ Makefile: remove the unused variable TAR_DIST_EXTRA_OPTS
+ Makefile: use git init/add/commit/archive for dist-doc
Originally merged to 'next' on 2020-10-15
Use "git archive" more to produce the release tarball.
* rs/tighten-callers-of-deref-tag (2020-10-12) 3 commits
(merged to 'next' on 2020-10-26 at b33d5986e5)
+ line-log: handle deref_tag() returning NULL
+ blame: handle deref_tag() returning NULL
+ grep: handle deref_tag() returning NULL
Originally merged to 'next' on 2020-10-15
Code clean-up.
* rs/worktree-list-show-locked (2020-10-12) 1 commit
(merged to 'next' on 2020-10-26 at 398e14f216)
+ worktree: teach `list` to annotate locked worktree
Originally merged to 'next' on 2020-10-15
"git worktree list" now shows if each worktree is locked. This
possibly may open us to show other kinds of states in the future.
* sb/clone-origin (2020-09-30) 7 commits
(merged to 'next' on 2020-10-26 at 83fbb58da1)
+ clone: allow configurable default for `-o`/`--origin`
+ clone: read new remote name from remote_name instead of option_origin
+ clone: validate --origin option before use
+ refs: consolidate remote name validation
+ remote: add tests for add and rename with invalid names
+ clone: use more conventional config/option layering
+ clone: add tests for --template and some disallowed option pairs
Originally merged to 'next' on 2020-10-06
"git clone" learned clone.defaultremotename configuration variable
to customize what nickname to use to call the remote the repository
was cloned from.
* sd/userdiff-css-update (2020-10-08) 1 commit
(merged to 'next' on 2020-10-26 at 253e1d021b)
+ userdiff: expand detected chunk headers for css
Originally merged to 'next' on 2020-10-08
Userdiff for CSS update.
* sk/force-if-includes (2020-10-03) 4 commits
(merged to 'next' on 2020-10-26 at 648422f517)
+ t, doc: update tests, reference for "--force-if-includes"
+ push: parse and set flag for "--force-if-includes"
+ push: add reflog check for "--force-if-includes"
+ Merge branch 'ds/in-merge-bases-many-optim-bug' into sk/force-if-includes
Originally merged to 'next' on 2020-10-04
"git push --force-with-lease[=<ref>]" can easily be misused to lose
commits unless the user takes good care of their own "git fetch".
A new option "--force-if-includes" attempts to ensure that what is
being force-pushed was created after examining the commit at the
tip of the remote ref that is about to be force-replaced.
--------------------------------------------------
[New Topics]
* cm/t7xxx-cleanup (2020-10-22) 6 commits
(merged to 'next' on 2020-10-26 at 8b58e54942)
+ t7102: prepare expected output inside test_expect_* block
+ t7201: put each command on a separate line
+ t7201: use 'git -C' to avoid subshell
+ t7102,t7201: remove whitespace after redirect operator
+ t7102,t7201: remove unnecessary blank spaces in test body
+ t7101,t7102,t7201: modernize test formatting
Originally merged to 'next' on 2020-10-23
Micro clean-up.
Will merge to 'master'.
* js/avoid-split-sideband-message (2020-10-27) 3 commits
(merged to 'next' on 2020-10-27 at 06b2f75522)
+ test-pkt-line: drop colon from sideband identity
(merged to 'next' on 2020-10-26 at 1b550f3245)
+ sideband: report unhandled incomplete sideband messages as bugs
+ sideband: avoid reporting incomplete sideband messages
The side-band status report can be sent at the same time as the
primary payload multiplexed, but the demultiplexer on the receiving
end incorrectly split a single status report into two, which has
been corrected.
Will merge to 'master'.
* jt/apply-reverse-twice (2020-10-20) 1 commit
(merged to 'next' on 2020-10-26 at f060893eb7)
+ apply: when -R, also reverse list of sections
"git apply -R" did not handle patches that touch the same path
twice correctly, which has been corrected. This is most relevant
in a patch that changes a path from a regular file to a symbolic
link (and vice versa).
Will merge to 'master'.
* av/fsmonitor-cleanup (2020-10-21) 2 commits
- fsmonitor: make output of test-dump-fsmonitor more concise
- fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
Code clean-up.
Unneeded?
cf. <20201022183822.GA781760@nand.local>
* bc/svn-hash-oid-fix (2020-10-21) 1 commit
(merged to 'next' on 2020-10-26 at 743b549d5d)
+ svn: use correct variable name for short OID
A recent oid->hash conversion missed one spot, breaking "git svn".
Will merge to 'master'.
* en/sequencer-rollback-lock-cleanup (2020-10-21) 1 commit
(merged to 'next' on 2020-10-26 at 1234e8297f)
+ sequencer: remove duplicate rollback_lock_file() call
Code clean-up.
Will merge to 'master'.
* jc/sequencer-stopped-sha-simplify (2020-10-21) 1 commit
- sequencer: tolerate abbreviated stopped-sha file
Recently the format of an internal state file "rebase -i" uses has
been tightened up for consistency, which would hurt those who start
"rebase -i" with old git and then continue with new git. Loosen
the reader side a bit (which we may want to tighten again in a year
or so).
Is this a real issue, or just a theoretical one?
cf. <xmqqd01b429a.fsf@gitster.c.googlers.com>
* jk/perl-warning (2020-10-21) 1 commit
- perl: check for perl warnings while running tests
Dev support.
Will merge to 'next'.
cf. <20201022032400.GC1480820@coredump.intra.peff.net>
* js/default-branch-name-part-4-minus-1 (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at 0a66b76c66)
+ t1400: prepare for `main` being default branch name
+ tests: prepare aligned mentions of the default branch name
+ t9902: prepare a test for the upcoming default branch name
+ t3200: prepare for `main` being shorter than `master`
+ t5703: adjust a test case for the upcoming default branch name
+ t6200: adjust suppression pattern to also match "main"
+ tests: start moving to a different default main branch name
+ t9801: use `--` in preparation for default branch rename
+ fmt-merge-msg: also suppress "into main" by default
Adjust tests so that they won't scream when the default initial
branch name is changed to 'main'.
Will merge to 'master'.
* js/t7006-cleanup (2020-10-21) 1 commit
(merged to 'next' on 2020-10-26 at b8582f842d)
+ t7006: Use test_path_is_* functions in test script
Code clean-up.
Will merge to 'master'.
* pb/ref-filter-with-crlf (2020-10-22) 2 commits
- log, show: add tests for messages containing CRLF
- ref-filter: handle CRLF at end-of-line more gracefully
A commit and tag object may have CR at the end of each and
every line (you can create such an object with hash-object or
using --cleanup=verbatim to decline the default clean-up
action), but it would make it impossible to have a blank line
to separate the title from the body of the message. Be lenient
and accept a line with lone CR on it as a blank line, too.
Will merge to 'next'.
* ve/userdiff-bash (2020-10-22) 1 commit
(merged to 'next' on 2020-10-26 at 2b34be98fe)
+ userdiff: support Bash
The userdiff pattern learned to identify the function definition in
POSIX shells and bash.
Will merge to 'master'.
* ab/git-remote-exit-code (2020-10-27) 1 commit
- remote: add meaningful exit code on missing/existing
Exit codes from "git remote add" etc. were not usable by scripted
callers.
* en/merge-ort-api-null-impl (2020-10-26) 4 commits
- merge,rebase,revert: select ort or recursive by config or environment
- fast-rebase: demonstrate merge-ort's API via temporary/hidden command
- merge-ort-wrappers: new convience wrappers to mimic the old merge API
- merge-ort: barebones API of new merge strategy with empty implementation
Preparation for a new merge strategy.
* en/merge-tests (2020-10-26) 9 commits
- t6423: add more details about direct resolution of directories
- t6423: note improved ort handling with untracked files
- t6423, t6436: note improved ort handling with dirty files
- merge tests: expect slight differences in output for recursive vs. ort
- t6423: expect improved conflict markers labels in the ort backend
- t6404, t6423: expect improved rename/delete handling in ort backend
- t6416: correct expectation for rename/rename(1to2) + directory/file
- merge tests: expect improved directory/file conflict handling in ort
- t/: new helper for tests that pass with ort but fail with recursive
(this branch uses en/dir-rename-tests.)
Preparation for a new merge strategy.
* jk/committer-date-is-author-date-fix-simplify (2020-10-26) 1 commit
- am, sequencer: stop parsing our own committer ident
Code symplification.
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness. The inconsistency has been fixed.
Needs doc update.
* fc/zsh-completion (2020-10-26) 29 commits
- zsh: update copyright notices
- completion: bash: remove old compat wrappers
- completion: bash: cleanup cygwin check
- completion: bash: trivial cleanup
- completion: zsh: add simple version check
- completion: zsh: trivial simplification
- completion: zsh: add alias descriptions
- completion: zsh: improve command tags
- completion: zsh: refactor command completion
- completion: zsh: shuffle functions around
- completion: zsh: simplify file_direct
- completion: zsh: simplify nl_append
- completion: zsh: trivial cleanup
- completion: zsh: simplify direct compadd
- completion: zsh: simplify compadd functions
- completion: zsh: fix splitting of words
- completion: zsh: add missing direct_append
- completion: fix conflict with bashcomp
- completion: zsh: fix completion for --no-.. options
- completion: bash: remove zsh wrapper
- completion: bash: synchronize zsh wrapper
- completion: zsh: fix for command aliasing
- completion: prompt: fix color for Zsh
- completion: zsh: update slave script locations
- completion: zsh: fix for directories with spaces
- completion: zsh: reorganize install instructions
- completion: zsh: fix bash script extension
- completion: zsh: fix name due to broken autoloading
- completion: zsh: fix __gitcomp_direct()
* jc/doc-final-resend (2020-10-26) 1 commit
- SubmittingPatches: clarify the purpose of the final resend
* nk/perf-fsmonitor (2020-10-26) 10 commits
- t/perf/fsmonitor: add benchmark for dirty status
- t/perf/fsmonitor: perf comparison of multiple fsmonitor integrations
- t/perf/fsmonitor: initialize test with git reset
- t/perf/fsmonitor: factor setup for fsmonitor into function
- t/perf/fsmonitor: silence initial git commit
- t/perf/fsmonitor: shorten DESC to basename
- t/perf/fsmonitor: factor description out for readability
- t/perf/fsmonitor: improve error message if typoing hook name
- t/perf/fsmonitor: move watchman setup to one-time-repo-setup
- t/perf/fsmonitor: separate one time repo initialization
(this branch uses nk/diff-files-vs-fsmonitor.)
* jk/checkout-index-errors (2020-10-27) 2 commits
- checkout-index: propagate errors to exit code
- checkout-index: drop error message from empty --stage=all
* pw/rebase-i-orig-head (2020-10-27) 4 commits
- rebase -i: simplify get_revision_ranges()
- rebase -i: use struct object_id when writing state
- rebase -i: use struct object_id rather than looking up commit
- rebase -i: stop overwriting ORIG_HEAD buffer
--------------------------------------------------
[Stalled]
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
cf. <20201015000410.GB328643@google.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-10-09) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Cooking]
* en/strmap (2020-10-13) 10 commits
- strmap: enable allocations to come from a mem_pool
- strmap: add a strset sub-type
- strmap: add functions facilitating use as a string->int map
- strmap: enable faster clearing and reusing of strmaps
- strmap: add more utility functions
- strmap: new utility functions
- hashmap: introduce a new hashmap_partial_clear()
- hashmap: allow re-use after hashmap_free()
- hashmap: adjust spacing to fix argument alignment
- hashmap: add usage documentation explaining hashmap_free[_entries]()
A speciailization of hashmap that uses a string as key has been
introduced. Hopefully it will see wider use over time.
On hold.
cf. <20201023080202.GA4012156@coredump.intra.peff.net>
cf. <CABPp-BFV8ZAu5vLarG2mX8gT5bfV31oqbd-vjAQF_YDcyNSRiw@mail.gmail.com>
* en/test-selector (2020-10-18) 3 commits
(merged to 'next' on 2020-10-26 at 3d6e77c3ff)
+ test-lib: reduce verbosity of skipped tests
+ t6006, t6012: adjust tests to use 'setup' instead of synonyms
+ test-lib: allow selecting tests by substring/glob with --run
Our test scripts can be told to run only individual pieces while
skipping others with the "--run=..." option; they were taught to
take a substring of test title, in addition to numbers, to name the
test pices to run.
Will merge to 'master'.
* jk/report-fn-typedef (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at fa4e128b65)
+ usage: define a type for a reporting function
Code clean-up.
Will merge to 'master'.
* mr/bisect-in-c-3 (2020-10-16) 7 commits
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--write-terms` subcommand
- bisect--helper: retire `--check-expected-revs` subcommand
- bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
- bisect--helper: retire `--next-all` subcommand
- bisect--helper: retire `--bisect-clean-state` subcommand
- bisect--helper: finish porting `bisect_start()` to C
Rewriting "git bisect" in C continues.
Will merge to 'next'.
* sc/sequencer-gpg-octopus (2020-10-18) 3 commits
(merged to 'next' on 2020-10-26 at e1c956e52a)
+ t3435: add tests for rebase -r GPG signing
+ sequencer: pass explicit --no-gpg-sign to merge
+ sequencer: fix gpg option passed to merge subcommand
"git rebase --rebase-merges" did not correctly pass --gpg-sign
command line option to underying "git merge" when replaying a merge
using non-default merge strategy or when replaying an octopus merge
(because replaying a two-head merge with the default strategy was
done in a separate codepath, the problem did not trigger for most
users), which has been corrected.
Will merge to 'master'.
* as/sample-push-to-checkout-hook (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 644026c2f6)
+ hook: add sample template for push-to-checkout
Add a sample 'push-to-checkout' hook, that performs the same as
what the built-in default action does.
Will merge to 'master'.
* as/tests-cleanup (2020-10-18) 1 commit
- t2200,t9832: avoid using 'git' upstream in a pipe
Micro clean-up of a couple of test scripts.
Will merge to 'next'.
* bk/sob-dco (2020-10-20) 4 commits
(merged to 'next' on 2020-10-26 at d0e5066a7e)
+ Documentation: stylistically normalize references to Signed-off-by:
+ SubmittingPatches: clarify DCO is our --signoff rule
+ Documentation: clarify and expand description of --signoff
+ doc: preparatory clean-up of description on the sign-off option
Document that the meaning of a Signed-off-by trailer can vary from
project to project in the end-user documentation, and clarify what
it means to this project.
Will merge to 'master'.
* ct/t0000-use-test-path-is-file (2020-10-18) 1 commit
(merged to 'next' on 2020-10-26 at 9b70aa748f)
+ t0000: use test_path_is_file instead of "test -f"
Originally merged to 'next' on 2020-10-23
Micro clean-up of a test script.
Will merge to 'master'.
* en/dir-rename-tests (2020-10-16) 4 commits
- t6423: more involved rules for renaming directories into each other
- t6423: update directory rename detection tests with new rule
- t6423: more involved directory rename test
- directory-rename-detection.txt: update references to regression tests
(this branch is used by en/merge-tests.)
More preliminary tests have been added to document desired outcome
of various "directory rename" situations.
Will merge to 'next'.
* en/t7518-unflake (2020-10-18) 1 commit
(merged to 'next' on 2020-10-26 at 443459f7ca)
+ t7518: fix flaky grep invocation
Originally merged to 'next' on 2020-10-23
Work around flakiness in a test.
Will merge to 'master'.
* es/test-cmp-typocatcher (2020-10-20) 1 commit
(merged to 'next' on 2020-10-26 at 62d89db753)
+ Revert "test_cmp: diagnose incorrect arguments"
A test helper "test_cmp A B" was taught to diagnose missing files A
or B as a bug in test, but some tests legitimately wanted to notice
a failure to even create file B as an error, in addition to leaving
the expected result in it, and were misdiagnosed as a bug. This
has been corrected.
Will merge to 'master'.
* es/tutorial-mention-asciidoc-early (2020-10-16) 1 commit
- MyFirstContribution: clarify asciidoc dependency
Doc update.
Will merge to 'next'.
* jk/fast-import-marks-alloc-fix (2020-10-15) 1 commit
(merged to 'next' on 2020-10-26 at 2f0a73fd48)
+ fast-import: fix over-allocation of marks storage
"git fast-import" wasted a lot of memory when many marks were in use.
Will merge to 'master'.
* jk/fast-import-marks-cleanup (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 1ba987dd54)
+ fast-import: remove duplicated option-parsing line
Code clean-up.
Will merge to 'master'.
* jk/no-common (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at c888cb8b28)
+ config.mak.dev: build with -fno-common
Dev support to catch a tentative definition of a variable in our C
code as an error.
Will merge to 'master'.
* js/ci-ghwf-dedup-tests (2020-10-12) 2 commits
(merged to 'next' on 2020-10-26 at 4832a8f40b)
+ ci: make the "skip-if-redundant" check more defensive
+ ci: work around old records of GitHub runs
Originally merged to 'next' on 2020-10-23
GitHub Actions automated test improvement to skip tests on a tree
identical to what has already been tested.
Will merge to 'master'.
* lo/zsh-completion (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 100dc6adde)
+ completion: fix zsh installation instructions
Update instructions for command line completion (in contrib/) for zsh.
Will merge to 'master'.
* nk/diff-files-vs-fsmonitor (2020-10-20) 7 commits
- p7519-fsmonitor: add a git add benchmark
- p7519-fsmonitor: refactor to avoid code duplication
- perf lint: add make test-lint to perf tests
- t/perf: add fsmonitor perf test for git diff
- t/perf/p7519-fsmonitor.sh: warm cache on first git status
- t/perf/README: elaborate on output format
- fsmonitor: use fsmonitor data in `git diff`
(this branch is used by nk/perf-fsmonitor.)
"git diff" and other commands that share the same machinery to
compare with working tree files have been taught to take advantage
of the fsmonitor data when available.
Will merge to 'next'.
* nk/dir-c-comment-update (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 3a4cb82ad6)
+ dir.c: fix comments to agree with argument name
Update stale in-code comment.
Will merge to 'master'.
* tk/credential-config (2020-10-16) 1 commit
(merged to 'next' on 2020-10-26 at 6ab486f389)
+ credential: load default config
"git credential' didn't honor the core.askPass configuration
variable (among other things), which has been corrected.
Will merge to 'master'.
* ag/merge-strategies-in-c (2020-10-06) 11 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- t6027: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
* jk/symlinked-dotgitx-files (2020-10-23) 9 commits
(merged to 'next' on 2020-10-26 at c1dd37b024)
+ docs: document symlink restrictions for .git* files
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
Originally merged to 'next' on 2020-10-23
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
Will merge to 'master'.
* dl/resurrect-update-for-sha256 (2020-10-08) 2 commits
(merged to 'next' on 2020-10-26 at 7e94297aa4)
+ contrib/git-resurrect.sh: use hash-agnostic OID pattern
+ contrib/git-resurrect.sh: indent with tabs
Originally merged to 'next' on 2020-10-23
"git resurrect" script (in contrib/) learned that the object names
may be longer than 40-hex depending on the hash function in use.
Will merge to 'master'.
* ds/commit-graph-merging-fix (2020-10-09) 2 commits
(merged to 'next' on 2020-10-26 at a0cf763826)
+ commit-graph: don't write commit-graph when disabled
+ commit-graph: ignore duplicates when merging layers
When "git commit-graph" detects the same commit recorded more than
once while it is merging the layers, it used to die. The code now
ignores all but one of them and continues.
Will merge to 'master'.
* ds/maintenance-commit-graph-auto-fix (2020-10-12) 2 commits
(merged to 'next' on 2020-10-26 at 429d1371d8)
+ maintenance: core.commitGraph=false prevents writes
+ maintenance: test commit-graph auto condition
Test-coverage enhancement of running commit-graph task "git
maintenance" as needed led to discovery and fix of a bug.
Will merge to 'master'.
* ss/submodule-add-in-c (2020-10-07) 3 commits
- t7400: add test to check 'submodule add' for tracked paths
- submodule: port submodule subcommand 'add' from shell to C
- dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
Almost there.
cf. <685afed6-f01f-5d22-80d4-00fdc11caf0a@gmail.com>
* mk/diff-ignore-regex (2020-10-20) 2 commits
(merged to 'next' on 2020-10-26 at c68727da93)
+ diff: add -I<regex> that ignores matching changes
+ merge-base, xdiff: zero out xpparam_t structures
"git diff" family of commands learned the "-I<regex>" option to
ignore hunks whose changed lines all match the given pattern.
Will merge to 'master'.
* mt/parallel-checkout-part-1 (2020-10-22) 20 commits
- parallel-checkout: drop unused checkout state parameter
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
Ejected from 'next'
cf. <CAHd-oW568aNLYYMBDPJiUsWzh2xxtm8gnqLEiX_RTDa81BL_yw@mail.gmail.com>
* dl/diff-merge-base (2020-09-21) 10 commits
(merged to 'next' on 2020-10-26 at 114d94030b)
+ contrib/completion: complete `git diff --merge-base`
+ builtin/diff-tree: learn --merge-base
+ builtin/diff-index: learn --merge-base
+ t4068: add --merge-base tests
+ diff-lib: define diff_get_merge_base()
+ diff-lib: accept option flags in run_diff_index()
+ contrib/completion: extract common diff/difftool options
+ git-diff.txt: backtick quote command text
+ git-diff-index.txt: make --cached description a proper sentence
+ t4068: remove unnecessary >tmp
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.
Will merge to 'master'.
* ds/maintenance-part-3 (2020-10-16) 8 commits
- maintenance: add troubleshooting guide to docs
- maintenance: use 'incremental' strategy by default
- maintenance: create maintenance.strategy config
- maintenance: add start/stop subcommands
- maintenance: add [un]register subcommands
- for-each-repo: run subcommands on configured repos
- maintenance: add --schedule option and config
- maintenance: optionally skip --auto process
Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.
* es/config-hooks (2020-10-16) 8 commits
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
"git grep" has been tweaked to be limited to the sparse checkout
paths.
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Oct 2020, #03; Mon, 19)
@ 2020-10-19 18:13 6% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-10-19 18:13 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Git 2.29 final has been tagged. We will hopefully either (1) not
see brown-paper-bag breakages at all, or (2) will see some but can
immediately deal with them, in coming couple of days. After that,
the 2.30 cycle will gain steam, starting next week. Let's see.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into. Some repositories have
only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[New Topics]
* cw/ci-ghwf-check-ws-errors (2020-10-09) 1 commit
(merged to 'next' on 2020-10-15 at 159e0f0277)
+ ci: github action - add check for whitespace errors
Dev support.
Will cook in 'next'.
* en/strmap (2020-10-13) 10 commits
- strmap: enable allocations to come from a mem_pool
- strmap: add a strset sub-type
- strmap: add functions facilitating use as a string->int map
- strmap: enable faster clearing and reusing of strmaps
- strmap: add more utility functions
- strmap: new utility functions
- hashmap: introduce a new hashmap_partial_clear()
- hashmap: allow re-use after hashmap_free()
- hashmap: adjust spacing to fix argument alignment
- hashmap: add usage documentation explaining hashmap_free[_entries]()
A speciailization of hashmap that uses a string as key has been
introduced. Hopefully it will see wider use over time.
Will merge to 'next'.
* en/test-selector (2020-10-18) 3 commits
- test-lib: reduce verbosity of skipped tests
- t6006, t6012: adjust tests to use 'setup' instead of synonyms
- test-lib: allow selecting tests by substring/glob with --run
Our test scripts can be told to run only individual pieces while
skipping others with the "--run=..." option; they were taught to
take a substring of test title, in addition to numbers, to name the
test pices to run.
Will merge to 'next'.
* jk/report-fn-typedef (2020-10-16) 1 commit
- usage: define a type for a reporting function
Code clean-up.
Needs to get its log message updated.
* mr/bisect-in-c-3 (2020-10-16) 7 commits
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect--helper: retire `--write-terms` subcommand
- bisect--helper: retire `--check-expected-revs` subcommand
- bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
- bisect--helper: retire `--next-all` subcommand
- bisect--helper: retire `--bisect-clean-state` subcommand
- bisect--helper: finish porting `bisect_start()` to C
Rewriting "git bisect" in C continues.
How ready is this one?
* rs/dist-doc-with-git-archive (2020-10-12) 2 commits
(merged to 'next' on 2020-10-15 at cb1029e046)
+ Makefile: remove the unused variable TAR_DIST_EXTRA_OPTS
+ Makefile: use git init/add/commit/archive for dist-doc
Use "git archive" more to produce the release tarball.
Will cook in 'next'.
* rs/tighten-callers-of-deref-tag (2020-10-12) 3 commits
(merged to 'next' on 2020-10-15 at a0df4a45cb)
+ line-log: handle deref_tag() returning NULL
+ blame: handle deref_tag() returning NULL
+ grep: handle deref_tag() returning NULL
Code clean-up.
Will cook in 'next'.
* rs/worktree-list-show-locked (2020-10-12) 1 commit
(merged to 'next' on 2020-10-15 at 3917e61c28)
+ worktree: teach `list` to annotate locked worktree
"git worktree list" now shows if each worktree is locked. This
possibly may open us to show other kinds of states in the future.
Will cook in 'next'.
* sc/sequencer-gpg-octopus (2020-10-18) 3 commits
- t3435: add tests for rebase -r GPG signing
- sequencer: pass explicit --no-gpg-sign to merge
- sequencer: fix gpg option passed to merge subcommand
"git rebase --rebase-merges" did not correctly pass --gpg-sign
command line option to underying "git merge" when replaying a merge
using non-default merge strategy or when replaying an octopus merge
(because replaying a two-head merge with the default strategy was
done in a separate codepath, the problem did not trigger for most
users), which has been corrected.
Will merge to 'next'.
* sm/curl-retry (2020-10-13) 3 commits
- http: automatically retry some requests
- replace CURLOPT_FILE With CURLOPT_WRITEDATA
- remote-curl: add testing for intelligent retry for HTTP
The http transport has been taught to retry a failed request that
may reasonably be retried.
Need to pick up reroll.
* as/sample-push-to-checkout-hook (2020-10-16) 1 commit
- hook: add sample template for push-to-checkout
Add a sample 'push-to-checkout' hook, that performs the same as
what the built-in default action does.
Will merge to 'next'.
* as/tests-cleanup (2020-10-18) 1 commit
- t2200,t9832: avoid using 'git' upstream in a pipe
Micro clean-up of a couple of test scripts.
Will merge to 'next'.
* bk/sob-dco (2020-10-18) 3 commits
- SubmittingPatches: clarify DCO is our --signoff rule
- Documentation: clarify and expand description of --signoff
- doc: preparatory clean-up of description on the sign-off option
Document that the meaning of a Signed-off-by trailer can vary from
project to project in the end-user documentation, and clarify what
it means to this project.
* ct/t0000-use-test-path-is-file (2020-10-18) 1 commit
- t0000: use test_path_is_file instead of "test -f"
Micro clean-up of a test script.
* en/dir-rename-tests (2020-10-16) 4 commits
- t6423: more involved rules for renaming directories into each other
- t6423: update directory rename detection tests with new rule
- t6423: more involved directory rename test
- directory-rename-detection.txt: update references to regression tests
More preliminary tests have been added to document desired outcome
of various "directory rename" situations.
Will merge to 'next'.
* en/t7518-unflake (2020-10-18) 1 commit
- t7518: fix flaky grep invocation
Work around flakiness in a test.
Will merge to 'next'.
* es/test-cmp-typocatcher (2020-10-16) 1 commit
- Revert "test_cmp: diagnose incorrect arguments"
A test helper "test_cmp A B" was taught to diagnose missing files A
or B as a bug in test, but some tests legitimately wanted to notice
a failure to even create file B as an error, in addition to leaving
the expected result in it, and were misdiagnosed as a bug. This
has been corrected.
Will merge to 'next'.
* es/tutorial-mention-asciidoc-early (2020-10-16) 1 commit
- MyFirstContribution: clarify asciidoc dependency
Doc update.
Will merge to 'next'.
* jk/fast-import-marks-alloc-fix (2020-10-15) 1 commit
- fast-import: fix over-allocation of marks storage
"git fast-import" wasted a lot of memory when many marks were in use.
Will merge to 'next'.
* jk/fast-import-marks-cleanup (2020-10-16) 1 commit
- fast-import: remove duplicated option-parsing line
Code clean-up.
Will merge to 'next'.
* jk/no-common (2020-10-16) 1 commit
- config.mak.dev: build with -fno-common
Dev support to catch a tentative definition of a variable in our C
code as an error.
Will merge to 'next'.
* js/ci-ghwf-dedup-tests (2020-10-12) 2 commits
- ci: make the "skip-if-redundant" check more defensive
- ci: work around old records of GitHub runs
GitHub Actions automated test improvement to skip tests on a tree
identical to what has already been tested.
Will merge to 'next'.
* lo/zsh-completion (2020-10-16) 1 commit
- completion: fix zsh installation instructions
Update instructions for command line completion (in contrib/) for zsh.
Will merge to 'next'.
* nk/diff-files-vs-fsmonitor (2020-10-18) 4 commits
- t/perf: add fsmonitor perf test for git diff
- t/perf/p7519-fsmonitor.sh: warm cache on first git status
- t/perf/README: elaborate on output format
- fsmonitor: use fsmonitor data in `git diff`
"git diff" and other commands that share the same machinery to
compare with working tree files have been taught to take advantage
of the fsmonitor data when available.
Will merge to 'next'.
* nk/dir-c-comment-update (2020-10-16) 1 commit
- dir.c: fix comments to agree with argument name
Update stale in-code comment.
Will merge to 'next'.
* tk/credential-config (2020-10-16) 1 commit
- credential: load default config
"git credential' didn't honor the core.askPass configuration
variable (among other things), which has been corrected.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-10-09) 2 commits
- rev-parse: add option for absolute or relative path formatting
- abspath: add a function to resolve paths with missing components
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Cooking]
* ag/merge-strategies-in-c (2020-10-06) 11 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- t6027: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
* jk/symlinked-dotgitx-files (2020-10-06) 8 commits
(merged to 'next' on 2020-10-08 at b9e128a280)
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
Will cook in 'next'.
* dl/checkout-guess (2020-10-08) 2 commits
(merged to 'next' on 2020-10-08 at c9a6bc9a54)
+ checkout: learn to respect checkout.guess
+ Documentation/config/checkout: replace sq with backticks
"git checkout" learned to use checkout.guess configuration variable
and enable/disable its "--[no-]guess" option accordingly.
Will cook in 'next'.
* dl/checkout-p-merge-base (2020-10-07) 4 commits
(merged to 'next' on 2020-10-08 at 807e047d68)
+ t2016: add a NEEDSWORK about the PERL prerequisite
+ add-patch: add NEEDSWORK about comparing commits
+ Doc: document "A...B" form for <tree-ish> in checkout and switch
+ builtin/checkout: fix `git checkout -p HEAD...` bug
"git checkout -p A...B [-- <path>]" did not work, even though the
same command without "-p" correctly used the merge-base between
commits A and B.
Will cook in 'next'.
* dl/resurrect-update-for-sha256 (2020-10-08) 2 commits
- contrib/git-resurrect.sh: use hash-agnostic OID pattern
- contrib/git-resurrect.sh: indent with tabs
"git resurrect" script (in contrib/) learned that the object names
may be longer than 40-hex depending on the hash function in use.
* ds/commit-graph-merging-fix (2020-10-09) 2 commits
- commit-graph: don't write commit-graph when disabled
- commit-graph: ignore duplicates when merging layers
When "git commit-graph" detects the same commit recorded more than
once while it is merging the layers, it used to die. The code now
ignores all but one of them and continues.
Will merge to 'next'.
* ds/maintenance-commit-graph-auto-fix (2020-10-12) 2 commits
- maintenance: core.commitGraph=false prevents writes
- maintenance: test commit-graph auto condition
Test-coverage enhancement of running commit-graph task "git
maintenance" as needed led to discovery and fix of a bug.
Will merge to 'next'.
* js/userdiff-php (2020-10-07) 1 commit
(merged to 'next' on 2020-10-08 at 988c7ea068)
+ userdiff: PHP: catch "abstract" and "final" functions
Userdiff for PHP update.
Will cook in 'next'.
* kb/userdiff-rust-macro-rules (2020-10-07) 1 commit
(merged to 'next' on 2020-10-08 at 949063bcae)
+ userdiff: recognize 'macro_rules!' as starting a Rust function block
Userdiff for Rust update.
Will cook in 'next'.
* rk/completion-stash (2020-10-07) 2 commits
(merged to 'next' on 2020-10-08 at ad60933f40)
+ git-completion.bash: stash-show: complete $__git_diff_common_options
+ git-completion.bash: __git_diff_common_options: add --[no-]patch
The command line completion script (in contrib/) learned that "git
stash show" takes the options "git diff" takes.
Will cook in 'next'.
* sd/userdiff-css-update (2020-10-08) 1 commit
(merged to 'next' on 2020-10-08 at 69b7e9df5d)
+ userdiff: expand detected chunk headers for css
Userdiff for CSS update.
Will cook in 'next'.
* ss/submodule-add-in-c (2020-10-07) 3 commits
- t7400: add test to check 'submodule add' for tracked paths
- submodule: port submodule subcommand 'add' from shell to C
- dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
How ready is this?
* mk/diff-ignore-regex (2020-10-16) 2 commits
- diff: add -I<regex> that ignores matching changes
- merge-base, xdiff: zero out xpparam_t structures
"git diff" family of commands learned the "-I<regex>" option to
ignore hunks whose changed lines all match the given pattern.
Expecting a reroll.
* mt/parallel-checkout-part-1 (2020-10-05) 20 commits
(merged to 'next' on 2020-10-05 at 571e16d68a)
+ parallel-checkout: drop unused checkout state parameter
(merged to 'next' on 2020-10-04 at 20438c1143)
+ ci: run test round with parallel-checkout enabled
+ parallel-checkout: add tests related to .gitattributes
+ parallel-checkout: add tests related to clone collisions
+ parallel-checkout: add tests for basic operations
+ checkout-index: add parallel checkout support
+ builtin/checkout.c: complete parallel checkout support
+ make_transient_cache_entry(): optionally alloc from mem_pool
+ parallel-checkout: support progress displaying
+ parallel-checkout: make it truly parallel
+ unpack-trees: add basic support for parallel checkout
+ entry: add checkout_entry_ca() which takes preloaded conv_attrs
+ entry: move conv_attrs lookup up to checkout_entry()
+ entry: extract cache_entry update from write_entry()
+ entry: make fstat_output() and read_blob_entry() public
+ entry: extract a header file for entry.c functions
+ convert: add conv_attrs classification
+ convert: add get_stream_filter_ca() variant
+ convert: add [async_]convert_to_working_tree_ca() variants
+ convert: make convert_attrs() and convert structs public
Parallel checkout.
Will cook in 'next'.
* dl/diff-merge-base (2020-09-21) 10 commits
- contrib/completion: complete `git diff --merge-base`
- builtin/diff-tree: learn --merge-base
- builtin/diff-index: learn --merge-base
- t4068: add --merge-base tests
- diff-lib: define diff_get_merge_base()
- diff-lib: accept option flags in run_diff_index()
- contrib/completion: extract common diff/difftool options
- git-diff.txt: backtick quote command text
- git-diff-index.txt: make --cached description a proper sentence
- t4068: remove unnecessary >tmp
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.
* sb/clone-origin (2020-09-30) 7 commits
(merged to 'next' on 2020-10-06 at 7178c9af9c)
+ clone: allow configurable default for `-o`/`--origin`
+ clone: read new remote name from remote_name instead of option_origin
+ clone: validate --origin option before use
+ refs: consolidate remote name validation
+ remote: add tests for add and rename with invalid names
+ clone: use more conventional config/option layering
+ clone: add tests for --template and some disallowed option pairs
"git clone" learned clone.defaultremotename configuration variable
to customize what nickname to use to call the remote the repository
was cloned from.
Will cook in 'next'.
* sk/force-if-includes (2020-10-03) 4 commits
(merged to 'next' on 2020-10-04 at 09c4c1e088)
+ t, doc: update tests, reference for "--force-if-includes"
+ push: parse and set flag for "--force-if-includes"
+ push: add reflog check for "--force-if-includes"
+ Merge branch 'ds/in-merge-bases-many-optim-bug' into sk/force-if-includes
"git push --force-with-lease[=<ref>]" can easily be misused to lose
commits unless the user takes good care of their own "git fetch".
A new option "--force-if-includes" attempts to ensure that what is
being force-pushed was created after examining the commit at the
tip of the remote ref that is about to be force-replaced.
Will cook in 'next'.
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* ds/maintenance-part-3 (2020-10-16) 8 commits
- maintenance: add troubleshooting guide to docs
- maintenance: use 'incremental' strategy by default
- maintenance: create maintenance.strategy config
- maintenance: add start/stop subcommands
- maintenance: add [un]register subcommands
- for-each-repo: run subcommands on configured repos
- maintenance: add --schedule option and config
- maintenance: optionally skip --auto process
(this branch uses ds/maintenance-part-2.)
Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.
* es/config-hooks (2020-10-16) 8 commits
- hook: replace find_hook() with hook_exists()
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: implement hookcmd.<name>.skip
- hook: include hookdir hook in list
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* ds/maintenance-part-2 (2020-09-25) 8 commits
(merged to 'next' on 2020-10-04 at c2a46f390c)
+ maintenance: add incremental-repack auto condition
+ maintenance: auto-size incremental-repack batch
+ maintenance: add incremental-repack task
+ midx: use start_delayed_progress()
+ midx: enable core.multiPackIndex by default
+ maintenance: create auto condition for loose-objects
+ maintenance: add loose-objects task
+ maintenance: add prefetch task
(this branch is used by ds/maintenance-part-3.)
"git maintenance", an extended big brother of "git gc", continues
to evolve.
Will cook in 'next'.
^ permalink raw reply [relevance 6%]
* Re: [PATCH 0/5][Outreachy] modernizing the test scripts
2020-10-16 12:54 0% ` Christian Couder
@ 2020-10-17 8:27 0% ` Charvi Mendiratta
0 siblings, 0 replies; 200+ results
From: Charvi Mendiratta @ 2020-10-17 8:27 UTC (permalink / raw)
To: Christian Couder; +Cc: git, phillip.wood123, Eric Sunshine
On Fri, 16 Oct 2020 at 18:24, Christian Couder
<christian.couder@gmail.com> wrote:
Thank you Christian, I have sent the new updated patch series .
>
> On Thu, Oct 15, 2020 at 7:57 PM charvi-077 <charvi077@gmail.com> wrote:
> >
> > This is my first patch series to the GIT mailing list. I followed the
> > link[1] and t7001 patches to modernize and clean up the test scripts.
>
> Thanks for getting started contributing!
>
> > This patch series :
> > -modernize the three test scripts : t7101, t7201 and t102.
>
> s/t102/t7102/
>
> On https://git.github.io/Outreachy-21-Microprojects/ we say:
>
> "Find one test script that needs some of the same changes and make them."
>
> So working only one test script, for example only t7101, would have
> been better than working on 3 test scripts. Now that you started
> working on 3 test scripts, it's ok to finish modernizing all these 3
> test scripts though.
>
Yes, I agree this but t7101 has very minor changes required that I
have completed so I switched to another one simultaneously . But in
future I will make sure to follow this practise . Also, till now I
have done majority of the changes as mentioned in the link in all the
three scripts and will try to do more and complete it .
> > - cleans up with 5 types of changes in all the three scripts.
> > 1. Converting the old old style test format to new one
>
> s/old old/old/
>
> > 2. Removing blankspaces in test bodies
> > 3. Removing whitespaces after the redirect operator, according to
> > Codingguidelines .
>
> s/Codingguidelines/CodingGuidelines/
>
> > 4. Using git -C instead of cd
> > 5. Placing all commands in seperate lines.
>
> s/seperate/separate/
>
> > Also, I have tested the scripts and set up travis CI[2].
>
> Nice!
>
> Thanks,
> Christian.
Thanks and Regards,
Charvi
^ permalink raw reply [relevance 0%]
* Re: [PATCH 0/5][Outreachy] modernizing the test scripts
2020-10-15 17:57 5% [PATCH 0/5][Outreachy] modernizing the test scripts charvi-077
@ 2020-10-16 12:54 0% ` Christian Couder
2020-10-17 8:27 0% ` Charvi Mendiratta
0 siblings, 1 reply; 200+ results
From: Christian Couder @ 2020-10-16 12:54 UTC (permalink / raw)
To: charvi-077; +Cc: git, phillip.wood123, Eric Sunshine
On Thu, Oct 15, 2020 at 7:57 PM charvi-077 <charvi077@gmail.com> wrote:
>
> This is my first patch series to the GIT mailing list. I followed the
> link[1] and t7001 patches to modernize and clean up the test scripts.
Thanks for getting started contributing!
> This patch series :
> -modernize the three test scripts : t7101, t7201 and t102.
s/t102/t7102/
On https://git.github.io/Outreachy-21-Microprojects/ we say:
"Find one test script that needs some of the same changes and make them."
So working only one test script, for example only t7101, would have
been better than working on 3 test scripts. Now that you started
working on 3 test scripts, it's ok to finish modernizing all these 3
test scripts though.
> - cleans up with 5 types of changes in all the three scripts.
> 1. Converting the old old style test format to new one
s/old old/old/
> 2. Removing blankspaces in test bodies
> 3. Removing whitespaces after the redirect operator, according to
> Codingguidelines .
s/Codingguidelines/CodingGuidelines/
> 4. Using git -C instead of cd
> 5. Placing all commands in seperate lines.
s/seperate/separate/
> Also, I have tested the scripts and set up travis CI[2].
Nice!
Thanks,
Christian.
^ permalink raw reply [relevance 0%]
* Re: [Outreachy] Introduction
@ 2020-10-16 8:46 5% ` Christian Couder
0 siblings, 0 replies; 200+ results
From: Christian Couder @ 2020-10-16 8:46 UTC (permalink / raw)
To: Zodwa Phakathi; +Cc: Kaartic Sivaraam, git
Hi Zodwa,
On Fri, Oct 16, 2020 at 10:28 AM Zodwa Phakathi <phakathizc@gmail.com> wrote:
>
> Good day,
>
> I hope this email finds you well. My name is Zodwa Phakathi from South Africa.
> I am one of the Outreach applicants.
Thanks for your interest in Git and welcome to the Git mailing list
and the Git project!
> I would like to participate in
> the following project by the title of Rename detection and the
> "range-diff" command in Git. I would like some advice on which
> microproject I can participate in. I am interested in the Modernize a
> test script microproject, Kindly advise if it is still available to
> work on it and how to set up the project.
The "Modernize a test script microproject" is still available but some
people have already started modernizing the t7001, t7101, t7102 and
t7201 test script, so you will need to find a different test script
that needs to be modernized.
If you find such a test script, please let us know before starting to
work on it, so that we can validate that it's worth modernizing and so
that we can avoid someone else possibly working on the same script.
Best,
Christian.
^ permalink raw reply [relevance 5%]
* Re: [Outreachy] Introduction
[not found] ` <CAPSFM5cXN57z56Cvq-NX1H4raS7d8=qXEFDQqpypJfoYzbxcyA@mail.gmail.com>
@ 2020-10-15 18:56 0% ` Charvi Mendiratta
0 siblings, 0 replies; 200+ results
From: Charvi Mendiratta @ 2020-10-15 18:56 UTC (permalink / raw)
To: Christian Couder; +Cc: git, phillip.wood123
Thank you Christian and also I apologise, since I forgot to cc the
mailing list on last reply .
I have submitted the patch[1] for the microproject "modernizing the
test scripts" and would be glad to have reviews from the community and
will work on updates required .
While working on the same , I got familiar with the mailing list ,
guidelines , workflow and also learned more about the git commands.
Next , I would also like to know how to proceed further and learn more
about code base.
[1]https://lore.kernel.org/git/20201015175709.20121-1-charvi077@gmail.com/
Thanks ,
Charvi
On Fri, 16 Oct 2020 at 00:15, Charvi Mendiratta <charvi077@gmail.com> wrote:
>
> Thank you Christian and also I apologise, since I forgot to cc the mailing list on last reply .
>
> I have submitted the patch[1] for the microproject "modernizing the test scripts" and would be glad to have reviews from the community and will work on updates required .
>
> While working on the same , I got familiar with the mailing list , guidelines , workflow and also learned more about the git commands. Next , I would also like to know how to proceed further and learn more about code base.
>
> [1]https://lore.kernel.org/git/20201015175709.20121-1-charvi077@gmail.com/
>
> Thanks ,
> Charvi
>
>
>
>
> On Sun, 11 Oct 2020 at 13:39, Christian Couder <christian.couder@gmail.com> wrote:
>>
>> Hi Charvi,
>>
>> On Sun, Oct 11, 2020 at 1:13 AM Charvi Mendiratta <charvi077@gmail.com> wrote:
>> >
>> > Hello everyone !
>> >
>> > I am Charvi Mendiratta, one of the outreachy applicant. I would like
>> > to work on the project "Improve droping and rewording commits in Git
>> > interactive rebase".
>>
>> Welcome to the Git project and its mailing list!
>>
>> > Till now I have installed and built the project and going through the
>> > guidelines of patch submission and project details .
>> >
>> > Also, getting on micro projects
>> > https://git.github.io/Outreachy-21-Microprojects/
>> > Firstly to get familiar and hands on with the patch based submission I
>> > am looking to start with one of the micro projects that is "Modernize
>> > a test script".
>>
>> Great!
>>
>> > These are test scripts t7001,t7101,t7102 ,t7201 that require the same
>> > changes of styling . I would like to once confirm if anyone else is
>> > not working on the same ?
>>
>> Someone recently started working on modernizing t7001. You can see
>> that by searching the mailing list archive:
>>
>> https://public-inbox.org/git/?q=t7001
>>
>> You will find:
>>
>> https://public-inbox.org/git/20200925170256.11490-1-shubhunic@gmail.com/
>>
>> About t7101,t7102 and t7201, yeah, it looks like they could be
>> modernized a bit, and no one is working on that yet. So feel free to
>> do it!
>>
>> Best,
>> Christian.
^ permalink raw reply [relevance 0%]
* [PATCH 0/5][Outreachy] modernizing the test scripts
@ 2020-10-15 17:57 5% charvi-077
2020-10-16 12:54 0% ` Christian Couder
0 siblings, 1 reply; 200+ results
From: charvi-077 @ 2020-10-15 17:57 UTC (permalink / raw)
To: git; +Cc: christian.couder, phillip.wood123, sunshine, charvi-077
This is my first patch series to the GIT mailing list. I followed the
link[1] and t7001 patches to modernize and clean up the test scripts.
This patch series :
-modernize the three test scripts : t7101 , t7201 and t102.
- cleans up with 5 types of changes in all the three scripts.
1. Converting the old old style test format to new one
2. Removing blankspaces in test bodies
3. Removing whitespaces after the redirect operator, according to
Codingguidelines .
4. Using git -C instead of cd
5. Placing all commands in seperate lines.
Also, I have tested the scripts and set up travis CI[2].
[1]https://lore.kernel.org/git/CAPig+cQpUu2UO-+jWn1nTaDykWnxwuEitzVB7PnW2SS_b7V8Hg@mail.gmail.com/
[2]https://travis-ci.org/github/charvi-077/git/branches
charvi-077 (5):
t7101,t7102,t7201: modernize test formatting
t7102,t7201: remove unnecessary blank spaces in test body
t7102,t7201: remove whitespace after redirect operator
t7201: avoid using cd outside of subshells
t7201: place each command in its own line
t/t7101-reset-empty-subdirs.sh | 66 ++++++++++-----------
t/t7102-reset.sh | 63 ++++++++------------
t/t7201-co.sh | 102 +++++++++++++--------------------
3 files changed, 96 insertions(+), 135 deletions(-)
--
2.29.0.rc1
^ permalink raw reply [relevance 5%]
* Re: [Outreachy] Introduction
2020-10-10 11:48 5% [Outreachy] Introduction Charvi Mendiratta
@ 2020-10-11 8:09 6% ` Christian Couder
[not found] ` <CAPSFM5cXN57z56Cvq-NX1H4raS7d8=qXEFDQqpypJfoYzbxcyA@mail.gmail.com>
0 siblings, 1 reply; 200+ results
From: Christian Couder @ 2020-10-11 8:09 UTC (permalink / raw)
To: Charvi Mendiratta; +Cc: git
Hi Charvi,
On Sun, Oct 11, 2020 at 1:13 AM Charvi Mendiratta <charvi077@gmail.com> wrote:
>
> Hello everyone !
>
> I am Charvi Mendiratta, one of the outreachy applicant. I would like
> to work on the project "Improve droping and rewording commits in Git
> interactive rebase".
Welcome to the Git project and its mailing list!
> Till now I have installed and built the project and going through the
> guidelines of patch submission and project details .
>
> Also, getting on micro projects
> https://git.github.io/Outreachy-21-Microprojects/
> Firstly to get familiar and hands on with the patch based submission I
> am looking to start with one of the micro projects that is "Modernize
> a test script".
Great!
> These are test scripts t7001,t7101,t7102 ,t7201 that require the same
> changes of styling . I would like to once confirm if anyone else is
> not working on the same ?
Someone recently started working on modernizing t7001. You can see
that by searching the mailing list archive:
https://public-inbox.org/git/?q=t7001
You will find:
https://public-inbox.org/git/20200925170256.11490-1-shubhunic@gmail.com/
About t7101,t7102 and t7201, yeah, it looks like they could be
modernized a bit, and no one is working on that yet. So feel free to
do it!
Best,
Christian.
^ permalink raw reply [relevance 6%]
* [Outreachy] Introduction
@ 2020-10-10 11:48 5% Charvi Mendiratta
2020-10-11 8:09 6% ` Christian Couder
0 siblings, 1 reply; 200+ results
From: Charvi Mendiratta @ 2020-10-10 11:48 UTC (permalink / raw)
To: git
Hello everyone !
I am Charvi Mendiratta, one of the outreachy applicant. I would like
to work on the project "Improve droping and rewording commits in Git
interactive rebase".
Till now I have installed and built the project and going through the
guidelines of patch submission and project details .
Also, getting on micro projects
https://git.github.io/Outreachy-21-Microprojects/
Firstly to get familiar and hands on with the patch based submission I
am looking to start with one of the micro projects that is "Modernize
a test script".
These are test scripts t7001,t7101,t7102 ,t7201 that require the same
changes of styling . I would like to once confirm if anyone else is
not working on the same ?
Looking for more guidance to contribute in this project .
Thanks and regards,
Charvi
^ permalink raw reply [relevance 5%]
* What's cooking in git.git (Oct 2020, #02; Fri, 9)
@ 2020-10-09 15:59 6% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-10-09 15:59 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'seen' (formerly 'pu'---proposed updates) while
commits prefixed with '+' are in 'next'. The ones marked with '.'
do not appear in any of the integration branches, but I am still
holding onto them.
The first release candidate for this cycle, Git v2.29.0-rc1, has
been tagged. This -rc1 turned out to be a bit more ambitious than
usual in how I handled young-but-small topics. I would have left
them out, saying "their benefit is low and don't have to be in the
upcoming release", in past cycles. But this time, I tried to cram
them in -rc1, with an updated excluse "their scope is so small that
they cannot be so wrong to delay the release even if we later find
problems in them, so there is no point in delaying".
We'll see how well it turns out.
You can find the changes described here in the integration branches of the
repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to 'master']
* dl/makefile-sort (2020-10-08) 1 commit
(merged to 'next' on 2020-10-08 at a303ef6d14)
+ Makefile: ASCII-sort += lists
Makefile clean-up.
* dl/mingw-header-cleanup (2020-10-07) 1 commit
(merged to 'next' on 2020-10-08 at 35516a8b50)
+ compat/mingw.h: drop extern from function declaration
Header clean-up.
* hx/push-atomic-with-cert (2020-10-06) 1 commit
(merged to 'next' on 2020-10-08 at 0729586aa5)
+ t5534: split stdout and stderr redirection
Hotfix to a recently added test script.
* ja/misc-doc-fixes (2020-10-08) 4 commits
(merged to 'next' on 2020-10-08 at 167d6696bc)
+ doc: fix the bnf like style of some commands
+ doc: git-remote fix ups
+ doc: use linkgit macro where needed.
+ git-bisect-lk2009: make continuation of list indented
Doc fixes.
* jk/index-pack-hotfixes (2020-10-07) 3 commits
(merged to 'next' on 2020-10-08 at 46f5340c07)
+ index-pack: make get_base_data() comment clearer
+ index-pack: drop type_cas mutex
+ index-pack: restore "resolving deltas" progress meter
Hotfix and clean-up for the jt/threaded-index-pack topic that has
graduated to v2.29-rc0.
* js/ci-ghwf-dedup-tests (2020-10-08) 2 commits
(merged to 'next' on 2020-10-08 at 83db2c0a89)
+ ci: do not skip tagged revisions in GitHub workflows
+ ci: skip GitHub workflow runs for already-tested commits/trees
The logic to skip testing on the tagged commit and the tag itself
was not quite consistent which led to failure of Windows test
tasks. It has been revamped to consistently skip revisions that
have already been tested, based on the tree object of the revision.
* js/default-branch-name-part-3 (2020-10-08) 2 commits
(merged to 'next' on 2020-10-08 at 1c02be024d)
+ tests: avoid using the branch name `main`
+ t1415: avoid using `main` as ref name
Test preparation for the switch of default branch name continues.
* js/ghwf-setup-msbuild-update (2020-10-07) 1 commit
(merged to 'next' on 2020-10-08 at d4c704f844)
+ GitHub workflow: automatically follow minor updates of setup-msbuild
CI update.
* js/no-builtins-on-disk-option (2020-10-07) 1 commit
(merged to 'next' on 2020-10-08 at 4033181bc4)
+ help: do not expect built-in commands to be hardlinked
Hotfix to breakage introduced in the topic in v2.29-rc0
--------------------------------------------------
[New Topics]
* ag/merge-strategies-in-c (2020-10-06) 11 commits
- sequencer: use the "octopus" merge strategy without forking
- sequencer: use the "resolve" strategy without forking
- merge: use the "octopus" strategy without forking
- merge: use the "resolve" strategy without forking
- merge-octopus: rewrite in C
- merge-recursive: move better_branch_name() to merge.c
- merge-resolve: rewrite in C
- merge-index: don't fork if the requested program is `git-merge-one-file'
- merge-index: libify merge_one_path() and merge_all()
- merge-one-file: rewrite in C
- t6027: modernise tests
The resolve and octopus merge strategy backends have been rewritten
in C.
* jk/symlinked-dotgitx-files (2020-10-06) 8 commits
(merged to 'next' on 2020-10-08 at b9e128a280)
+ fsck: complain when .gitattributes or .gitignore is a symlink
+ verify_path(): disallow symlinks in .gitattributes and .gitignore
+ t0060: test obscured .gitattributes and .gitignore matching
+ t7450: test .gitmodules symlink matching against obscured names
+ t7450: test verify_path() handling of gitmodules
+ t7415: rename to expand scope
+ fsck_tree(): wrap some long lines
+ fsck_tree(): fix shadowed variable
"git fsck" and the corresponding check done during the transport
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
Will cook in 'next'.
* dl/checkout-guess (2020-10-08) 2 commits
(merged to 'next' on 2020-10-08 at c9a6bc9a54)
+ checkout: learn to respect checkout.guess
+ Documentation/config/checkout: replace sq with backticks
"git checkout" learned to use checkout.guess configuration variable
and enable/disable its "--[no-]guess" option accordingly.
Will cook in 'next'.
* dl/checkout-p-merge-base (2020-10-07) 4 commits
(merged to 'next' on 2020-10-08 at 807e047d68)
+ t2016: add a NEEDSWORK about the PERL prerequisite
+ add-patch: add NEEDSWORK about comparing commits
+ Doc: document "A...B" form for <tree-ish> in checkout and switch
+ builtin/checkout: fix `git checkout -p HEAD...` bug
"git checkout -p A...B [-- <path>]" did not work, even though the
same command without "-p" correctly used the merge-base between
commits A and B.
Will cook in 'next'.
* dl/resurrect-update-for-sha256 (2020-10-08) 2 commits
- contrib/git-resurrect.sh: use hash-agnostic OID pattern
- contrib/git-resurrect.sh: indent with tabs
"git resurrect" script (in contrib/) learned that the object names
may be longer than 40-hex depending on the hash function in use.
* ds/commit-graph-merging-fix (2020-10-08) 1 commit
- commit-graph: ignore duplicates when merging layers
When "git commit-graph" detects the same commit recorded more than
once while it is merging the layers, it used to die. The code now
ignores all but one of them and continues.
Shouldn't it make sure all copies match, or discard all of them, to
avoid random corruptions kept in the repository?
* ds/maintenance-commit-graph-auto-fix (2020-10-08) 1 commit
- maintenance: test commit-graph auto condition
Test-coverage enhancement of running commit-graph task "git
maintenance" as needed led to discovery and fix of a bug.
* js/userdiff-php (2020-10-07) 1 commit
(merged to 'next' on 2020-10-08 at 988c7ea068)
+ userdiff: PHP: catch "abstract" and "final" functions
Userdiff for PHP update.
Will cook in 'next'.
* kb/userdiff-rust-macro-rules (2020-10-07) 1 commit
(merged to 'next' on 2020-10-08 at 949063bcae)
+ userdiff: recognize 'macro_rules!' as starting a Rust function block
Userdiff for Rust update.
Will cook in 'next'.
* rk/completion-stash (2020-10-07) 2 commits
(merged to 'next' on 2020-10-08 at ad60933f40)
+ git-completion.bash: stash-show: complete $__git_diff_common_options
+ git-completion.bash: __git_diff_common_options: add --[no-]patch
The command line completion script (in contrib/) learned that "git
stash show" takes the options "git diff" takes.
Will cook in 'next'.
* sd/userdiff-css-update (2020-10-08) 1 commit
(merged to 'next' on 2020-10-08 at 69b7e9df5d)
+ userdiff: expand detected chunk headers for css
Userdiff for CSS update.
Will cook in 'next'.
* ss/submodule-add-in-c (2020-10-07) 3 commits
- t7400: add test to check 'submodule add' for tracked paths
- submodule: port submodule subcommand 'add' from shell to C
- dir: change the scope of function 'directory_exists_in_index()'
"git submodule add" being rewritten in C.
* ak/corrected-commit-date (2020-10-08) 10 commits
- doc: add corrected commit date info
- commit-reach: use corrected commit dates in paint_down_to_common()
- commit-graph: use generation v2 only if entire chain does
- commit-graph: implement generation data chunk
- commit-graph: implement corrected commit date
- commit-graph: add a slab to store topological levels
- commit-graph: return 64-bit generation number
- commit-graph: consolidate fill_commit_graph_info
- revision: parse parent in indegree_walk_step()
- commit-graph: fix regression when computing Bloom filters
The commit-graph learned to use corrected commit dates instead of
the generation number to help topological revision traversal.
--------------------------------------------------
[Stalled]
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-09-08) 1 commit
- rev-parse: add option for absolute or relative path formatting
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
Expecting a reroll.
cf. <20200909222333.GH241078@camp.crustytoothpaste.net>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Cooking]
* mk/diff-ignore-regex (2020-10-01) 2 commits
- t: add -I<regex> tests
- diff: add -I<regex> that ignores matching changes
"git diff" family of commands learned the "-I<regex>" option to
ignore hunks whose changed lines all match the given pattern.
Expecting a reroll.
cf. <20201007194821.GA20549@larwa.hq.kempniu.pl>
* mt/parallel-checkout-part-1 (2020-10-05) 20 commits
(merged to 'next' on 2020-10-05 at 571e16d68a)
+ parallel-checkout: drop unused checkout state parameter
(merged to 'next' on 2020-10-04 at 20438c1143)
+ ci: run test round with parallel-checkout enabled
+ parallel-checkout: add tests related to .gitattributes
+ parallel-checkout: add tests related to clone collisions
+ parallel-checkout: add tests for basic operations
+ checkout-index: add parallel checkout support
+ builtin/checkout.c: complete parallel checkout support
+ make_transient_cache_entry(): optionally alloc from mem_pool
+ parallel-checkout: support progress displaying
+ parallel-checkout: make it truly parallel
+ unpack-trees: add basic support for parallel checkout
+ entry: add checkout_entry_ca() which takes preloaded conv_attrs
+ entry: move conv_attrs lookup up to checkout_entry()
+ entry: extract cache_entry update from write_entry()
+ entry: make fstat_output() and read_blob_entry() public
+ entry: extract a header file for entry.c functions
+ convert: add conv_attrs classification
+ convert: add get_stream_filter_ca() variant
+ convert: add [async_]convert_to_working_tree_ca() variants
+ convert: make convert_attrs() and convert structs public
Parallel checkout.
Will cook in 'next'.
* dl/diff-merge-base (2020-09-21) 10 commits
- contrib/completion: complete `git diff --merge-base`
- builtin/diff-tree: learn --merge-base
- builtin/diff-index: learn --merge-base
- t4068: add --merge-base tests
- diff-lib: define diff_get_merge_base()
- diff-lib: accept option flags in run_diff_index()
- contrib/completion: extract common diff/difftool options
- git-diff.txt: backtick quote command text
- git-diff-index.txt: make --cached description a proper sentence
- t4068: remove unnecessary >tmp
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.
* sb/clone-origin (2020-09-30) 7 commits
(merged to 'next' on 2020-10-06 at 7178c9af9c)
+ clone: allow configurable default for `-o`/`--origin`
+ clone: read new remote name from remote_name instead of option_origin
+ clone: validate --origin option before use
+ refs: consolidate remote name validation
+ remote: add tests for add and rename with invalid names
+ clone: use more conventional config/option layering
+ clone: add tests for --template and some disallowed option pairs
"git clone" learned clone.defaultremotename configuration variable
to customize what nickname to use to call the remote the repository
was cloned from.
Will cook in 'next'.
* sk/force-if-includes (2020-10-03) 4 commits
(merged to 'next' on 2020-10-04 at 09c4c1e088)
+ t, doc: update tests, reference for "--force-if-includes"
+ push: parse and set flag for "--force-if-includes"
+ push: add reflog check for "--force-if-includes"
+ Merge branch 'ds/in-merge-bases-many-optim-bug' into sk/force-if-includes
"git push --force-with-lease[=<ref>]" can easily be misused to lose
commits unless the user takes good care of their own "git fetch".
A new option "--force-if-includes" attempts to ensure that what is
being force-pushed was created after examining the commit at the
tip of the remote ref that is about to be force-replaced.
Will cook in 'next'.
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* ds/maintenance-part-3 (2020-10-05) 7 commits
- maintenance: add troubleshooting guide to docs
- maintenance: use default schedule if not configured
- maintenance: add start/stop subcommands
- maintenance: add [un]register subcommands
- for-each-repo: run subcommands on configured repos
- maintenance: add --schedule option and config
- maintenance: optionally skip --auto process
(this branch uses ds/maintenance-part-2.)
Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.
cf. <20201005195701.14268-1-martin.agren@gmail.com>
* es/config-hooks (2020-09-09) 9 commits
- run_commit_hook: take strvec instead of varargs
- commit: use config-based hooks
- hook: replace run-command.h:find_hook
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: add --porcelain to list command
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting a reroll.
cf. <20201005212751.GH331156@google.com>
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* ds/maintenance-part-2 (2020-09-25) 8 commits
(merged to 'next' on 2020-10-04 at c2a46f390c)
+ maintenance: add incremental-repack auto condition
+ maintenance: auto-size incremental-repack batch
+ maintenance: add incremental-repack task
+ midx: use start_delayed_progress()
+ midx: enable core.multiPackIndex by default
+ maintenance: create auto condition for loose-objects
+ maintenance: add loose-objects task
+ maintenance: add prefetch task
(this branch is used by ds/maintenance-part-3.)
"git maintenance", an extended big brother of "git gc", continues
to evolve.
Will cook in 'next'.
^ permalink raw reply [relevance 6%]
* What's cooking in git.git (Oct 2020, #01; Mon, 5)
@ 2020-10-06 20:11 6% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-10-06 20:11 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The preview release for the upcoming Git 2.29 has been tagged.
You can find the changes described here in the integration branches of the
repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to 'master']
* ab/mediawiki-fixes (2020-09-21) 18 commits
(merged to 'next' on 2020-09-25 at 878693716e)
+ remote-mediawiki: use "sh" to eliminate unquoted commands
+ remote-mediawiki: annotate unquoted uses of run_git()
+ remote-mediawiki: convert to quoted run_git() invocation
+ remote-mediawiki: provide a list form of run_git()
+ remote-mediawiki tests: annotate failing tests
+ remote-mediawiki: fix duplicate revisions being imported
+ remote-mediawiki tests: use CLI installer
+ remote-mediawiki tests: use inline PerlIO for readability
+ remote-mediawiki tests: replace deprecated Perl construct
+ remote-mediawiki tests: use a more idiomatic dispatch table
+ remote-mediawiki tests: use "$dir/" instead of "$dir."
+ remote-mediawiki tests: change `[]` to `test`
+ remote-mediawiki tests: use test_cmp in tests
+ remote-mediawiki tests: use a 10 character password
+ remote-mediawiki tests: use the login/password variables
+ remote-mediawiki doc: don't hardcode Debian PHP versions
+ remote-mediawiki doc: link to MediaWiki's current version
+ remote-mediawiki doc: correct link to GitHub project
Modernization and fixes to MediaWiki remote backend.
* al/ref-filter-merged-and-no-merged (2020-09-26) 1 commit
(merged to 'next' on 2020-09-29 at 748a286753)
+ ref-filter: plug memory leak in reach_filter()
Hotfix.
* au/complete-restore-s (2020-09-26) 2 commits
(merged to 'next' on 2020-09-29 at 7bbf508562)
+ completion: complete refs after 'git restore -s'
+ completion: use "prev" variable instead of introducing "prevword"
The command line completion (in contrib/) learned that "git restore
-s <TAB>" is often followed by a refname.
* cc/bisect-start-fix (2020-09-25) 1 commit
(merged to 'next' on 2020-09-29 at 637011d04a)
+ bisect: don't use invalid oid as rev when starting
"git bisect start X Y", when X and Y are not valid committish
object names, should take X and Y as pathspec, but didn't.
* ds/in-merge-bases-many-optim-bug (2020-10-02) 1 commit
(merged to 'next' on 2020-10-04 at b736873ada)
+ commit-reach: fix in_merge_bases_many bug
(this branch is used by sk/force-if-includes.)
in_merge_bases_many(), a way to see if a commit is reachable from
any commit in a set of commits, was totally broken when the
commit-graph feature was in use, which has been corrected.
* eg/mailinfo-doc-scissors (2020-09-28) 1 commit
(merged to 'next' on 2020-09-29 at 4694f22fe9)
+ Doc: show example scissors line
The explanation of the "scissors line" has been clarified.
* jc/blame-ignore-fix (2020-09-24) 2 commits
(merged to 'next' on 2020-09-29 at 96fbdb57fb)
+ blame: validate and peel the object names on the ignore list
+ t8013: minimum preparatory clean-up
"git blame --ignore-rev/--ignore-revs-file" failed to validate
their input are valid revision, and failed to take into account
that the user may want to give an annotated tag instead of a
commit, which has been corrected.
* jc/fmt-merge-msg-suppress-destination (2020-09-27) 1 commit
(merged to 'next' on 2020-09-29 at 2b1f8ee654)
+ config/fmt-merge-msg.txt: drop space in quote
Docfix.
* jc/sequencer-stopped-sha-simplify (2020-09-25) 1 commit
(merged to 'next' on 2020-09-29 at 9af3360572)
+ sequencer: stop abbreviating stopped-sha file
Code simplification.
* jk/diff-cc-oidfind-fix (2020-09-30) 1 commit
(merged to 'next' on 2020-10-04 at 637072574f)
+ combine-diff: handle --find-object in multitree code path
"log -c --find-object=X" did not work well to find a merge that
involves a change to an object X from only one parent.
* jk/drop-unaligned-loads (2020-09-24) 2 commits
(merged to 'next' on 2020-09-29 at 29c05387a0)
+ Revert "fast-export: use local array to store anonymized oid"
+ bswap.h: drop unaligned loads
Compilation fix around type punning.
* jk/format-auto-base-when-able (2020-10-01) 1 commit
(merged to 'next' on 2020-10-04 at ab8f65b8c5)
+ format-patch: teach format.useAutoBase "whenAble" option
"git format-patch" learns to take "whenAble" as a possible value
for the format.useAutoBase configuration variable to become no-op
when the automatically computed base does not make sense.
* jk/refspecs-negative (2020-09-30) 1 commit
(merged to 'next' on 2020-10-04 at 2948e90fab)
+ refspec: add support for negative refspecs
"git fetch" and "git push" support negative refspecs.
* jk/shortlog-group-by-trailer (2020-09-27) 8 commits
(merged to 'next' on 2020-09-29 at 3706b06db5)
+ shortlog: allow multiple groups to be specified
+ shortlog: parse trailer idents
+ shortlog: rename parse_stdin_ident()
+ shortlog: de-duplicate trailer values
+ shortlog: match commit trailers with --group
+ trailer: add interface for iterating over commit trailers
+ shortlog: add grouping option
+ shortlog: change "author" variables to "ident"
"git shortlog" has been taught to group commits by the contents of
the trailer lines, like "Reviewed-by:", "Coauthored-by:", etc.
* jk/unused (2020-09-30) 10 commits
(merged to 'next' on 2020-10-01 at 440a7a0a7a)
+ dir.c: drop unused "untracked" from treat_path_fast()
+ sequencer: handle ignore_footer when parsing trailers
+ test-advise: check argument count with argc instead of argv
+ sparse-checkout: fill in some options boilerplate
+ sequencer: drop repository argument from run_git_commit()
+ push: drop unused repo argument to do_push()
+ assert PARSE_OPT_NONEG in parse-options callbacks
+ env--helper: write to opt->value in parseopt helper
+ drop unused argc parameters
+ convert: drop unused crlf_action from check_global_conv_flags_eol()
Code cleanup.
* js/cmake-vs (2020-09-30) 10 commits
(merged to 'next' on 2020-10-01 at 40be8c6094)
+ hashmap_for_each_entry(): workaround MSVC's runtime check failure #3
+ cmake (Windows): recommend using Visual Studio's built-in CMake support
+ cmake (Windows): initialize vcpkg/build dependencies automatically
+ cmake (Windows): complain when encountering an unknown compiler
+ cmake (Windows): let the `.dll` files be found when running the tests
+ cmake: quote the path accurately when editing `test-lib.sh`
+ cmake: fall back to using `vcpkg`'s `msgfmt.exe` on Windows
+ cmake: ensure that the `vcpkg` packages are found on Windows
+ cmake: do find Git for Windows' shell interpreter
+ cmake: ignore files generated by CMake as run in Visual Studio
Using the CMake support we added some time ago for real with Visual
Studio build revealed there were lot of usability improvements
possible, which have been carried out.
* js/default-branch-name-part-2 (2020-09-26) 5 commits
(merged to 'next' on 2020-09-30 at 3fb4047ce3)
+ t9902: avoid using the branch name `master`
+ tests: avoid variations of the `master` branch name
+ t3200: avoid variations of the `master` branch name
+ fast-export: avoid using unnecessary language in a code comment
+ t/test-terminal: avoid non-inclusive language
Update the tests to drop word 'master' from them.
* js/no-builtins-on-disk-option (2020-09-21) 3 commits
(merged to 'next' on 2020-09-25 at 6b976da4d2)
+ ci: stop linking built-ins to the dashed versions
+ Optionally skip linking/copying the built-ins
+ msvc: copy the correct `.pdb` files in the Makefile target `install`
The installation procedure learned to optionally omit "git-foo"
executable files for each 'foo' built-in subcommand, which are only
required by old timers that still rely on the age old promise that
prepending "git --exec-path" output to PATH early in their script
will keep the "git-foo" calls they wrote working.
The old attempt to remove these executables from the disk failed in
the 1.6 era; it may be worth attempting again, but I think it is
worth to keep this topic separate from such a policy change to help
it graduate early.
* jt/keep-partial-clone-filter-upon-lazy-fetch (2020-09-28) 2 commits
(merged to 'next' on 2020-10-01 at 77c4c6094c)
+ fetch: do not override partial clone filter
+ promisor-remote: remove unused variable
The lazy fetching done internally to make missing objects available
in a partial clone incorrectly made permanent damage to the partial
clone filter in the repository, which has been corrected.
* ma/worktree-cleanups (2020-09-27) 7 commits
(merged to 'next' on 2020-10-01 at 369dcfb161)
+ worktree: use skip_prefix to parse target
+ worktree: rename copy-pasted variable
+ worktree: update renamed variable in comment
+ worktree: inline `worktree_ref()` into its only caller
+ wt-status: introduce wt_status_state_free_buffers()
+ wt-status: print to s->fp, not stdout
+ wt-status: replace sha1 mentions with oid
Code clean-up.
* mr/bisect-in-c-2 (2020-09-24) 6 commits
(merged to 'next' on 2020-09-29 at a15f1729d2)
+ bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
+ bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
+ bisect--helper: reimplement `bisect_autostart` shell function in C
+ bisect--helper: introduce new `write_in_file()` function
+ bisect--helper: use '-res' in 'cmd_bisect__helper' return
+ bisect--helper: BUG() in cmd_*() on invalid subcommand
Rewrite of the "git bisect" script in C continues.
* mt/delta-base-cache-races (2020-09-28) 2 commits
(merged to 'next' on 2020-09-29 at ee2d60c077)
+ packfile: fix memory leak in add_delta_base_cache()
+ packfile: fix race condition on unpack_entry()
A race that leads to an access to a free'd data was corrected in
the codepath that reads pack files.
* nl/credential-crlf (2020-10-03) 1 commit
(merged to 'next' on 2020-10-04 at 213256c1e6)
+ credential: treat CR/LF as line endings in the credential protocol
Loosen the parser in the receiving end of the credential protocol
to allow credential helper to terminate lines with CRLF line
ending, as well as LF line ending.
* pb/submodule-doc-fix (2020-10-04) 1 commit
(merged to 'next' on 2020-10-04 at c535486479)
+ gitsubmodules doc: invoke 'ls-files' with '--recurse-submodules'
Doc update.
* pm/gitk-update (2020-10-03) 11 commits
(merged to 'next' on 2020-10-04 at fd505ccfc1)
+ Merge remote-tracking branch 'paulus/master' into pm/gitk-update
+ gitk: Resize panes correctly when reducing window size
+ gitk: replace tabs with spaces
+ gitk: fix the context menu not appearing in the presence of submodule diffs
+ gitk: Un-hide selection in areas with non-default background color
+ gitk: add diff lines background colors
+ gitk: be prepared to be run in a bare repository
+ gitk: Preserve window dimensions on exit when not using ttk themes
+ gitk: don't highlight files after submodules as submodules
+ gitk: fix branch name encoding error
+ gitk: rename "commit summary" to "commit reference"
"gitk" update.
* rs/archive-add-file (2020-09-19) 3 commits
(merged to 'next' on 2020-10-04 at fffc088553)
+ Makefile: use git-archive --add-file
+ archive: add --add-file
+ archive: read short blobs in archive.c::write_archive_entry()
"git archive" learns the "--add-file" option to include untracked
files into a snapshot from a tree-ish.
* sn/fast-import-doc (2020-10-04) 1 commit
(merged to 'next' on 2020-10-04 at fdf196b997)
+ fast-import: fix typo in documentation
Doc update.
* so/combine-diff-simplify (2020-09-29) 1 commit
(merged to 'next' on 2020-09-30 at d45e33ebb0)
+ diff: get rid of redundant 'dense' argument
Code simplification.
* tb/upload-pack-filters (2020-09-27) 1 commit
(merged to 'next' on 2020-09-29 at 3dde767170)
+ config/uploadpack.txt: fix typo in `--filter=tree:<n>`
Hotfix.
* td/submodule-update-quiet (2020-10-01) 1 commit
(merged to 'next' on 2020-10-01 at 4ae8bee636)
+ submodule update: silence underlying merge/rebase with "--quiet"
"git submodule update --quiet" did not squelch underlying "rebase"
and "pull" commands.
--------------------------------------------------
[New Topics]
* mk/diff-ignore-regex (2020-10-01) 2 commits
- t: add -I<regex> tests
- diff: add -I<regex> that ignores matching changes
"git diff" family of commands learned the "-I<regex>" option to
ignore hunks whose changed lines all match the given pattern.
Expecting review response.
--------------------------------------------------
[Stalled]
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* bc/rev-parse-path-format (2020-09-08) 1 commit
- rev-parse: add option for absolute or relative path formatting
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
Expecting a reroll.
cf. <20200909222333.GH241078@camp.crustytoothpaste.net>
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Cooking]
* mt/parallel-checkout-part-1 (2020-10-05) 20 commits
(merged to 'next' on 2020-10-05 at 571e16d68a)
+ parallel-checkout: drop unused checkout state parameter
(merged to 'next' on 2020-10-04 at 20438c1143)
+ ci: run test round with parallel-checkout enabled
+ parallel-checkout: add tests related to .gitattributes
+ parallel-checkout: add tests related to clone collisions
+ parallel-checkout: add tests for basic operations
+ checkout-index: add parallel checkout support
+ builtin/checkout.c: complete parallel checkout support
+ make_transient_cache_entry(): optionally alloc from mem_pool
+ parallel-checkout: support progress displaying
+ parallel-checkout: make it truly parallel
+ unpack-trees: add basic support for parallel checkout
+ entry: add checkout_entry_ca() which takes preloaded conv_attrs
+ entry: move conv_attrs lookup up to checkout_entry()
+ entry: extract cache_entry update from write_entry()
+ entry: make fstat_output() and read_blob_entry() public
+ entry: extract a header file for entry.c functions
+ convert: add conv_attrs classification
+ convert: add get_stream_filter_ca() variant
+ convert: add [async_]convert_to_working_tree_ca() variants
+ convert: make convert_attrs() and convert structs public
Parallel checkout.
Will cook in 'next'.
* dl/diff-merge-base (2020-09-21) 10 commits
- contrib/completion: complete `git diff --merge-base`
- builtin/diff-tree: learn --merge-base
- builtin/diff-index: learn --merge-base
- t4068: add --merge-base tests
- diff-lib: define diff_get_merge_base()
- diff-lib: accept option flags in run_diff_index()
- contrib/completion: extract common diff/difftool options
- git-diff.txt: backtick quote command text
- git-diff-index.txt: make --cached description a proper sentence
- t4068: remove unnecessary >tmp
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.
Expecting a reroll.
cf. <xmqqblhyepup.fsf@gitster.c.googlers.com>
* sb/clone-origin (2020-09-30) 7 commits
- clone: allow configurable default for `-o`/`--origin`
- clone: read new remote name from remote_name instead of option_origin
- clone: validate --origin option before use
- refs: consolidate remote name validation
- remote: add tests for add and rename with invalid names
- clone: use more conventional config/option layering
- clone: add tests for --template and some disallowed option pairs
"git clone" learned clone.defaultremotename configuration variable
to customize what nickname to use to call the remote the repository
was cloned from.
Will merge to 'next'.
* sk/force-if-includes (2020-10-03) 4 commits
(merged to 'next' on 2020-10-04 at 09c4c1e088)
+ t, doc: update tests, reference for "--force-if-includes"
+ push: parse and set flag for "--force-if-includes"
+ push: add reflog check for "--force-if-includes"
+ Merge branch 'ds/in-merge-bases-many-optim-bug' into sk/force-if-includes
"git push --force-with-lease[=<ref>]" can easily be misused to lose
commits unless the user takes good care of their own "git fetch".
A new option "--force-if-includes" attempts to ensure that what is
being force-pushed was created after examining the commit at the
tip of the remote ref that is about to be force-replaced.
Will merge to 'master'.
* hn/reftable (2020-10-01) 13 commits
. reftable: "test-tool dump-reftable" command.
. reftable: rest of library
. reftable: file level tests
. reftable: read reftable files
. reftable: write reftable files
. reftable: a generic binary tree implementation
. reftable: reading/writing blocks
. reftable: (de)serialization for the polymorphic record type.
. reftable: utility functions
. reftable: add a barebones unittest framework
. vcxproj: adjust for the reftable changes
. reftable: define the public API
. reftable: add LICENSE
The reftable backend for the refs API.
Expecting a reroll.
Seems not to build for Windows folks.
cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
* ds/maintenance-part-3 (2020-10-05) 7 commits
- maintenance: add troubleshooting guide to docs
- maintenance: use default schedule if not configured
- maintenance: add start/stop subcommands
- maintenance: add [un]register subcommands
- for-each-repo: run subcommands on configured repos
- maintenance: add --schedule option and config
- maintenance: optionally skip --auto process
(this branch uses ds/maintenance-part-2.)
Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.
cf. <20201005195701.14268-1-martin.agren@gmail.com>
* es/config-hooks (2020-09-09) 9 commits
- run_commit_hook: take strvec instead of varargs
- commit: use config-based hooks
- hook: replace run-command.h:find_hook
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: add --porcelain to list command
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
Expecting a reroll.
cf. <20201005212751.GH331156@google.com>
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* ds/maintenance-part-2 (2020-09-25) 8 commits
(merged to 'next' on 2020-10-04 at c2a46f390c)
+ maintenance: add incremental-repack auto condition
+ maintenance: auto-size incremental-repack batch
+ maintenance: add incremental-repack task
+ midx: use start_delayed_progress()
+ midx: enable core.multiPackIndex by default
+ maintenance: create auto condition for loose-objects
+ maintenance: add loose-objects task
+ maintenance: add prefetch task
(this branch is used by ds/maintenance-part-3.)
"git maintenance", an extended big brother of "git gc", continues
to evolve.
Will cook in 'next'.
^ permalink raw reply [relevance 6%]
* Re: [PATCH 00/11] Modernizing the t7001 test script
2020-09-25 17:33 6% ` [PATCH 00/11] Modernizing the t7001 test script Eric Sunshine
@ 2020-10-01 5:42 6% ` Shubham Verma
2020-12-22 19:22 6% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Shubham Verma @ 2020-10-01 5:42 UTC (permalink / raw)
To: Eric Sunshine; +Cc: Git List
On Fri, Sep 25, 2020 at 11:03 PM Eric Sunshine <sunshine@sunshineco.com> wrote:
>
> On Fri, Sep 25, 2020 at 1:03 PM shubham verma <shubhunic@gmail.com> wrote:
> > In this patch series modernize the t7001 test script by changing the
> > style of its tests from an old one to the modern one and by cleaning
> > up the test script.
>
> Thanks for tackling this task. I presume it was prompted by [1] or
> [2], as this series covers many of the items mentioned in [1].
> Overall, the series looks good. I'll leave comments in a few of the
> individual patches.
>
> [1]: https://lore.kernel.org/git/CAPig+cQpUu2UO-+jWn1nTaDykWnxwuEitzVB7PnW2SS_b7V8Hg@mail.gmail.com/
> [2]: https://git.github.io/rev_news/2020/08/27/edition-66/
Eric, Actually I follow the Instruction that you pointed out in [1].
Okay, I improve the commits and make changes according to your comments.
Thank You!
^ permalink raw reply [relevance 6%]
* What's cooking in git.git (Sep 2020, #08; Tue, 29)
@ 2020-09-29 22:06 6% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-09-29 22:06 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
We have a topic on 'seen', sk/force-if-includes, that behaves
differently when the commit-graph feature is in use (a working
in_merge_bases_many() implementation is critical for the topic to
work as expected). Help in debugging it is very much appreciated.
You can find the changes described here in the integration branches of the
repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to 'master']
* ah/pull (2020-09-24) 1 commit
(merged to 'next' on 2020-09-25 at b5ddf0cf8b)
+ pull: don't warn if pull.ff has been set
Earlier we taught "git pull" to warn when the user does not say the
histories need to be merged, rebased or accepts only fast-
forwarding, but the warning triggered for those who have set the
pull.ff configuration variable.
* bc/clone-with-git-default-hash-fix (2020-09-22) 1 commit
(merged to 'next' on 2020-09-22 at 62ea45c20e)
+ builtin/clone: avoid failure with GIT_DEFAULT_HASH
"git clone" that clones from SHA-1 repository, while
GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an
unusable repository that half-claims to be SHA-256 repository
with SHA-1 objects and refs. This has been corrected.
* bc/faq-misc (2020-09-20) 3 commits
(merged to 'next' on 2020-09-22 at a81b728010)
+ docs: explain how to deal with files that are always modified
+ docs: explain why reverts are not always applied on merge
+ docs: explain why squash merges are broken with long-running branches
More FAQ entries.
* dl/zero-oid-in-hooks (2020-09-23) 3 commits
(merged to 'next' on 2020-09-25 at 3c7d03d61a)
+ hooks--update.sample: use hash-agnostic zero OID
+ hooks--pre-push.sample: use hash-agnostic zero OID
+ hooks--pre-push.sample: modernize script
Adjust sample hooks for hash algorithm other than SHA-1.
* jc/t1506-rev-parse-leaves-range-endpoint-unpeeled (2020-09-25) 1 commit
(merged to 'next' on 2020-09-25 at e5233774ba)
+ t1506: rev-parse A..B and A...B
Test update.
* jk/make-protocol-v2-the-default (2020-09-25) 1 commit
(merged to 'next' on 2020-09-25 at 21a5f9e880)
+ protocol: re-enable v2 protocol by default
The transport protocol v2 has become the default again.
* tb/bloom-improvements (2020-09-18) 13 commits
(merged to 'next' on 2020-09-22 at 520d531ad8)
+ commit-graph: introduce 'commitGraph.maxNewFilters'
+ builtin/commit-graph.c: introduce '--max-new-filters=<n>'
+ commit-graph: rename 'split_commit_graph_opts'
+ bloom: encode out-of-bounds filters as non-empty
+ bloom/diff: properly short-circuit on max_changes
+ bloom: use provided 'struct bloom_filter_settings'
+ bloom: split 'get_bloom_filter()' in two
+ commit-graph.c: store maximum changed paths
+ commit-graph: respect 'commitGraph.readChangedPaths'
+ t/helper/test-read-graph.c: prepare repo settings
+ commit-graph: pass a 'struct repository *' in more places
+ t4216: use an '&&'-chain
+ commit-graph: introduce 'get_bloom_filter_settings()'
"git commit-graph write" learned to limit the number of bloom
filters that are computed from scratch with the --max-new-filters
option.
* tg/range-diff-same-file-fix (2020-09-24) 1 commit
(merged to 'next' on 2020-09-25 at c2078e5505)
+ diff: fix modified lines stats with --stat and --numstat
"git range-diff" showed incorrect diffstat, which has been
corrected.
--------------------------------------------------
[New Topics]
* al/ref-filter-merged-and-no-merged (2020-09-26) 1 commit
(merged to 'next' on 2020-09-29 at 748a286753)
+ ref-filter: plug memory leak in reach_filter()
Hotfix.
Will merge to 'master'.
* au/complete-restore-s (2020-09-26) 2 commits
(merged to 'next' on 2020-09-29 at 7bbf508562)
+ completion: complete refs after 'git restore -s'
+ completion: use "prev" variable instead of introducing "prevword"
The command line completion (in contrib/) learned that "git restore
-s <TAB>" is often followed by a refname.
Will merge to 'master'.
* eg/mailinfo-doc-scissors (2020-09-28) 1 commit
(merged to 'next' on 2020-09-29 at 4694f22fe9)
+ Doc: show example scissors line
The explanation of the "scissors line" has been clarified.
Will merge to 'master'.
* jc/fmt-merge-msg-suppress-destination (2020-09-27) 1 commit
(merged to 'next' on 2020-09-29 at 2b1f8ee654)
+ config/fmt-merge-msg.txt: drop space in quote
Docfix.
Will merge to 'master'.
* jk/format-auto-base-when-able (2020-09-26) 1 commit
- format-patch: teach format.useAutoBase "whenAble" option
"git format-patch" learns to take "if-able" as a possible value for
its "--base" option, and "whenAble" as a possible value for the
format.useAutoBase configuration variable to become no-op when the
automatically computed base does not make sense.
* ma/worktree-cleanups (2020-09-27) 7 commits
- worktree: use skip_prefix to parse target
- worktree: rename copy-pasted variable
- worktree: update renamed variable in comment
- worktree: inline `worktree_ref()` into its only caller
- wt-status: introduce wt_status_state_free_buffers()
- wt-status: print to s->fp, not stdout
- wt-status: replace sha1 mentions with oid
Code clean-up.
Will merge to 'next'.
* mt/delta-base-cache-races (2020-09-28) 2 commits
(merged to 'next' on 2020-09-29 at ee2d60c077)
+ packfile: fix memory leak in add_delta_base_cache()
+ packfile: fix race condition on unpack_entry()
A race that leads to an access to a free'd data was corrected in
the codepath that reads pack files.
Will merge to 'master'.
* nl/credential-crlf (2020-09-28) 3 commits
- docs: make notes regarding credential line reading
- credentials: make line reading Windows compatible
- credential.c: fix credential reading with regards to CR/LF
cf. <pull.710.v2.git.git.1601293224.gitgitgadget@gmail.com>
* tb/upload-pack-filters (2020-09-27) 1 commit
(merged to 'next' on 2020-09-29 at 3dde767170)
+ config/uploadpack.txt: fix typo in `--filter=tree:<n>`
Hotfix.
Will merge to 'master'.
* so/combine-diff-simplify (2020-09-29) 1 commit
- diff: get rid of redundant 'dense' argument
--------------------------------------------------
[Stalled]
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Cooking]
* cc/bisect-start-fix (2020-09-25) 1 commit
(merged to 'next' on 2020-09-29 at 637011d04a)
+ bisect: don't use invalid oid as rev when starting
"git bisect start X Y", when X and Y are not valid committish
object names, should take X and Y as pathspec, but didn't.
Will merge to 'master'.
* mt/parallel-checkout-part-1 (2020-09-22) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
* jk/drop-unaligned-loads (2020-09-24) 2 commits
(merged to 'next' on 2020-09-29 at 29c05387a0)
+ Revert "fast-export: use local array to store anonymized oid"
+ bswap.h: drop unaligned loads
Compilation fix around type punning.
Will merge to 'master'.
* jc/blame-ignore-fix (2020-09-24) 2 commits
(merged to 'next' on 2020-09-29 at 96fbdb57fb)
+ blame: validate and peel the object names on the ignore list
+ t8013: minimum preparatory clean-up
"git blame --ignore-rev/--ignore-revs-file" failed to validate
their input are valid revision, and failed to take into account
that the user may want to give an annotated tag instead of a
commit, which has been corrected.
Will merge to 'master'.
* jk/shortlog-group-by-trailer (2020-09-27) 8 commits
(merged to 'next' on 2020-09-29 at 3706b06db5)
+ shortlog: allow multiple groups to be specified
+ shortlog: parse trailer idents
+ shortlog: rename parse_stdin_ident()
+ shortlog: de-duplicate trailer values
+ shortlog: match commit trailers with --group
+ trailer: add interface for iterating over commit trailers
+ shortlog: add grouping option
+ shortlog: change "author" variables to "ident"
"git shortlog" has been taught to group commits by the contents of
the trailer lines, like "Reviewed-by:", "Coauthored-by:", etc.
Will merge to 'master'.
* js/cmake-vs (2020-09-28) 11 commits
- cmake: fix typo in message when `msgfmt` was not found
- hashmap_for_each_entry(): workaround MSVC's runtime check failure #3
- cmake (Windows): recommend using Visual Studio's built-in CMake support
- cmake (Windows): initialize vcpkg/build dependencies automatically
- cmake (Windows): complain when encountering an unknown compiler
- cmake (Windows): let the `.dll` files be found when running the tests
- cmake: quote the path accurately when editing `test-lib.sh`
- cmake: fall back to using `vcpkg`'s `msgfmt.exe` on Windows
- cmake: ensure that the `vcpkg` packages are found on Windows
- cmake: do find Git for Windows' shell interpreter
- cmake: ignore files generated by CMake as run in Visual Studio
Using the CMake support we added some time ago for real with Visual
Studio build revealed there were lot of usability improvements
possible, which have been carried out.
Expecting a (hopefully) final reroll.
cf. <nycvar.QRO.7.76.6.2009291406310.50@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.2009291407130.50@tvgsbejvaqbjf.bet>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* jc/sequencer-stopped-sha-simplify (2020-09-25) 1 commit
(merged to 'next' on 2020-09-29 at 9af3360572)
+ sequencer: stop abbreviating stopped-sha file
Code simplification.
Will merge to 'master'.
* rs/archive-add-file (2020-09-19) 3 commits
- Makefile: use git-archive --add-file
- archive: add --add-file
- archive: read short blobs in archive.c::write_archive_entry()
"git archive" learns the "--add-file" option to include untracked
files into a snapshot from a tree-ish.
* js/default-branch-name-part-2 (2020-09-26) 5 commits
- t9902: avoid using the branch name `master`
- tests: avoid variations of the `master` branch name
- t3200: avoid variations of the `master` branch name
- fast-export: avoid using unnecessary language in a code comment
- t/test-terminal: avoid non-inclusive language
Update the tests to drop word 'master' from them
* jt/keep-partial-clone-filter-upon-lazy-fetch (2020-09-28) 2 commits
- fetch: do not override partial clone filter
- promisor-remote: remove unused variable
The lazy fetching done internally to make missing objects available
in a partial clone incorrectly made permanent damate to the partial
clone filter in the repository, which has been corrected.
* dl/diff-merge-base (2020-09-21) 10 commits
- contrib/completion: complete `git diff --merge-base`
- builtin/diff-tree: learn --merge-base
- builtin/diff-index: learn --merge-base
- t4068: add --merge-base tests
- diff-lib: define diff_get_merge_base()
- diff-lib: accept option flags in run_diff_index()
- contrib/completion: extract common diff/difftool options
- git-diff.txt: backtick quote command text
- git-diff-index.txt: make --cached description a proper sentence
- t4068: remove unnecessary >tmp
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.
Expecting a reroll.
cf. <xmqqblhyepup.fsf@gitster.c.googlers.com>
* sb/clone-origin (2020-09-29) 7 commits
- clone: allow configurable default for `-o`/`--origin`
- clone: read new remote name from remote_name instead of option_origin
- clone: validate --origin option before use
- refs: consolidate remote name validation
- remote: add tests for add and rename with invalid names
- clone: use more conventional config/option layering
- clone: add tests for --template and some disallowed option pairs
"git clone" learned clone.defaultremotename configuration variable
to customize what nickname to use to call the remote the repository
was cloned from.
Expecting an update.
* sk/force-if-includes (2020-09-27) 4 commits
- SQUASH??? name an array in singular and avoid commenting obvious
- t, doc: update tests, reference for "--force-if-includes"
- push: parse and set flag for "--force-if-includes"
- push: add reflog check for "--force-if-includes"
"git push --force-with-lease[=<ref>]" can easily be misused to lose
commits unless the user takes good care of their own "git fetch".
A new option "--force-if-includes" attempts to ensure that what is
being force-pushed was created after examining the commit at the
tip of the remote ref that is about to be force-replaced.
On hold.
Seems to trigger gotchas in the reachability logic in commit-graph.
* ab/mediawiki-fixes (2020-09-21) 18 commits
(merged to 'next' on 2020-09-25 at 878693716e)
+ remote-mediawiki: use "sh" to eliminate unquoted commands
+ remote-mediawiki: annotate unquoted uses of run_git()
+ remote-mediawiki: convert to quoted run_git() invocation
+ remote-mediawiki: provide a list form of run_git()
+ remote-mediawiki tests: annotate failing tests
+ remote-mediawiki: fix duplicate revisions being imported
+ remote-mediawiki tests: use CLI installer
+ remote-mediawiki tests: use inline PerlIO for readability
+ remote-mediawiki tests: replace deprecated Perl construct
+ remote-mediawiki tests: use a more idiomatic dispatch table
+ remote-mediawiki tests: use "$dir/" instead of "$dir."
+ remote-mediawiki tests: change `[]` to `test`
+ remote-mediawiki tests: use test_cmp in tests
+ remote-mediawiki tests: use a 10 character password
+ remote-mediawiki tests: use the login/password variables
+ remote-mediawiki doc: don't hardcode Debian PHP versions
+ remote-mediawiki doc: link to MediaWiki's current version
+ remote-mediawiki doc: correct link to GitHub project
Modernization and fixes to MediaWiki remote backend.
Will merge to 'master'.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* hn/reftable (2020-09-22) 14 commits
- reftable: fix some sparse warnings
- reftable: "test-tool dump-reftable" command.
- reftable: rest of library
- reftable: file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: utility functions
- reftable: add a barebones unittest framework
- vcxproj: adjust for the reftable changes
- reftable: define the public API
- reftable: add LICENSE
* bc/rev-parse-path-format (2020-09-08) 1 commit
- rev-parse: add option for absolute or relative path formatting
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
Expecting a reroll.
cf. <20200909222333.GH241078@camp.crustytoothpaste.net>
* ds/maintenance-part-3 (2020-09-25) 7 commits
- maintenance: add troubleshooting guide to docs
- maintenance: recommended schedule in register/start
- maintenance: add start/stop subcommands
- maintenance: add [un]register subcommands
- for-each-repo: run subcommands on configured repos
- maintenance: add --schedule option and config
- maintenance: optionally skip --auto process
(this branch uses ds/maintenance-part-2.)
Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.
* es/config-hooks (2020-09-09) 9 commits
- run_commit_hook: take strvec instead of varargs
- commit: use config-based hooks
- hook: replace run-command.h:find_hook
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: add --porcelain to list command
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* mr/bisect-in-c-2 (2020-09-24) 6 commits
(merged to 'next' on 2020-09-29 at a15f1729d2)
+ bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
+ bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
+ bisect--helper: reimplement `bisect_autostart` shell function in C
+ bisect--helper: introduce new `write_in_file()` function
+ bisect--helper: use '-res' in 'cmd_bisect__helper' return
+ bisect--helper: BUG() in cmd_*() on invalid subcommand
Rewrite of the "git bisect" script in C continues.
Will merge to 'master'.
* js/no-builtins-on-disk-option (2020-09-21) 3 commits
(merged to 'next' on 2020-09-25 at 6b976da4d2)
+ ci: stop linking built-ins to the dashed versions
+ Optionally skip linking/copying the built-ins
+ msvc: copy the correct `.pdb` files in the Makefile target `install`
The installation procedure learned to optionally omit "git-foo"
executable files for each 'foo' built-in subcommand, which are only
required by old timers that still rely on the age old promise that
prepending "git --exec-path" output to PATH early in their script
will keep the "git-foo" calls they wrote working.
The old attempt to remove these executables from the disk failed in
the 1.6 era; it may be worth attempting again, but I think it is
worth to keep this topic separate from such a policy change to help
it graduate early.
Will merge to 'master'.
* jk/refspecs-negative (2020-09-25) 1 commit
- refspec: add support for negative refspecs
"git fetch" and "git push" support negative refspecs.
* ds/maintenance-part-2 (2020-09-25) 8 commits
- maintenance: add incremental-repack auto condition
- maintenance: auto-size incremental-repack batch
- maintenance: add incremental-repack task
- midx: use start_delayed_progress()
- midx: enable core.multiPackIndex by default
- maintenance: create auto condition for loose-objects
- maintenance: add loose-objects task
- maintenance: add prefetch task
(this branch is used by ds/maintenance-part-3.)
"git maintenance", an extended big brother of "git gc", continues
to evolve.
--------------------------------------------------
[Discarded]
* js/ignore-cmake-build-artifacts (2020-09-23) 1 commit
. cmake: ignore generated files
Running CMake based build with VS (in contrib/) from the top-level
of the working tree leaves extra build crufts behind. Add patterns
to .gitignore
Retracted.
cf. <pull.738.git.1601044118.gitgitgadget@gmail.com>
^ permalink raw reply [relevance 6%]
* What's cooking in git.git (Sep 2020, #07; Fri, 25)
@ 2020-09-25 22:57 6% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-09-25 22:57 UTC (permalink / raw)
To: git
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'seen' (formerly 'pu'---proposed updates) while commits prefixed
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
You can find the changes described here in the integration branches of the
repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to 'master']
* ds/maintenance-part-1 (2020-09-17) 11 commits
(merged to 'next' on 2020-09-18 at 4c367d3cf6)
+ maintenance: add trace2 regions for task execution
+ maintenance: add auto condition for commit-graph task
+ maintenance: use pointers to check --auto
+ maintenance: create maintenance.<task>.enabled config
+ maintenance: take a lock on the objects directory
+ maintenance: add --task option
+ maintenance: add commit-graph task
+ maintenance: initialize task array
+ maintenance: replace run_auto_gc()
+ maintenance: add --quiet option
+ maintenance: create basic maintenance runner
(this branch is used by ds/maintenance-part-2 and ds/maintenance-part-3.)
A "git gc"'s big brother has been introduced to take care of more
repository maintenance tasks, not limited to the object database
cleaning.
* hx/push-atomic-with-cert (2020-09-19) 1 commit
(merged to 'next' on 2020-09-22 at 64561eea5b)
+ send-pack: run GPG after atomic push checking
"git push" that wants to be atomic and wants to send push
certificate learned not to prepare and sign the push certificate
when it fails the local check (hence due to atomicity it is known
that no certificate is needed).
* jk/diff-highlight-blank-match-fix (2020-09-21) 1 commit
(merged to 'next' on 2020-09-22 at 03ac708501)
+ diff-highlight: correctly match blank lines for flush
"diff-highlight" (in contrib/) had a logic to flush its output upon
seeing a blank line but the way it detected a blank line was broken.
* jx/proc-receive-hook (2020-08-27) 10 commits
(merged to 'next' on 2020-09-18 at 344c89be7e)
+ doc: add documentation for the proc-receive hook
+ transport: parse report options for tracking refs
+ t5411: test updates of remote-tracking branches
+ receive-pack: new config receive.procReceiveRefs
+ doc: add document for capability report-status-v2
+ New capability "report-status-v2" for git-push
+ receive-pack: feed report options to post-receive
+ receive-pack: add new proc-receive hook
+ t5411: add basic test cases for proc-receive hook
+ transport: not report a non-head push as a branch
"git receive-pack" that accepts requests by "git push" learned to
outsource most of the ref updates to the new "proc-receive" hook.
* ld/p4-unshelve-fix (2020-09-19) 2 commits
(merged to 'next' on 2020-09-22 at c7709a34ec)
+ git-p4: use HEAD~$n to find parent commit for unshelve
+ git-p4 unshelve: adding a commit breaks git-p4 unshelve
The "unshelve" subcommand of "git p4" used incorrectly used
commit^N where it meant to say commit~N to name the Nth generation
ancestor, which has been corrected.
* rs/misc-cleanups (2020-09-19) 1 commit
(merged to 'next' on 2020-09-22 at d034fbfab0)
+ pack-write: use hashwrite_be32() in write_idx_file()
Code cleanup.
--------------------------------------------------
[New Topics]
* cc/bisect-start-fix (2020-09-25) 1 commit
- bisect: don't use invalid oid as rev when starting
"git bisect start X Y", when X and Y are not valid committish
object names, should take X and Y as pathspec, but didn't.
Will merge to 'next'.
* dl/zero-oid-in-hooks (2020-09-23) 3 commits
(merged to 'next' on 2020-09-25 at 3c7d03d61a)
+ hooks--update.sample: use hash-agnostic zero OID
+ hooks--pre-push.sample: use hash-agnostic zero OID
+ hooks--pre-push.sample: modernize script
Adjust sample hooks for hash algorithm other than SHA-1.
Will merge to 'master'.
* mt/parallel-checkout-part-1 (2020-09-22) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- parallel-checkout: add tests for basic operations
- checkout-index: add parallel checkout support
- builtin/checkout.c: complete parallel checkout support
- make_transient_cache_entry(): optionally alloc from mem_pool
- parallel-checkout: support progress displaying
- parallel-checkout: make it truly parallel
- unpack-trees: add basic support for parallel checkout
- entry: add checkout_entry_ca() which takes preloaded conv_attrs
- entry: move conv_attrs lookup up to checkout_entry()
- entry: extract cache_entry update from write_entry()
- entry: make fstat_output() and read_blob_entry() public
- entry: extract a header file for entry.c functions
- convert: add conv_attrs classification
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
Parallel checkout.
* jk/drop-unaligned-loads (2020-09-24) 2 commits
- Revert "fast-export: use local array to store anonymized oid"
- bswap.h: drop unaligned loads
Compilation fix around type punning.
Will merge to 'next'.
* tg/range-diff-same-file-fix (2020-09-24) 1 commit
(merged to 'next' on 2020-09-25 at c2078e5505)
+ diff: fix modified lines stats with --stat and --numstat
"git range-diff" showed incorrect diffstat, which has been
corrected.
Will merge to 'master'.
* ah/pull (2020-09-24) 1 commit
(merged to 'next' on 2020-09-25 at b5ddf0cf8b)
+ pull: don't warn if pull.ff has been set
Earlier we taught "git pull" to warn when the user does not say the
histories need to be merged, rebased or accepts only fast-
forwarding, but the warning triggered for those who have set the
pull.ff configuration variable.
Will merge to 'master'.
* jc/blame-ignore-fix (2020-09-24) 2 commits
- blame: validate and peel the object names on the ignore list
- t8013: minimum preparatory clean-up
"git blame --ignore-rev/--ignore-revs-file" failed to validate
their input are valid revision, and failed to take into account
that the user may want to give an annotated tag instead of a
commit, which has been corrected.
Will merge to 'next'.
* jk/make-protocol-v2-the-default (2020-09-25) 1 commit
(merged to 'next' on 2020-09-25 at 21a5f9e880)
+ protocol: re-enable v2 protocol by default
The transport protocol v2 has become the default again.
Will merge to 'master'.
* jk/shortlog-group-by-trailer (2020-09-25) 8 commits
- shortlog: allow multiple groups to be specified
- shortlog: parse trailer idents
- shortlog: rename parse_stdin_ident()
- shortlog: de-duplicate trailer values
- shortlog: match commit trailers with --group
- trailer: add interface for iterating over commit trailers
- shortlog: refactor committer/author grouping
- shortlog: change "author" variables to "ident"
"git shortlog" has been taught to group commits by the contents of
the trailer lines, like "Reviewed-by:", "Coauthored-by:", etc.
Will merge to 'next'.
* js/cmake-vs (2020-09-25) 10 commits
- hashmap_for_each_entry(): work around MSVC's run-time check failure #3
- cmake (Windows): recommend using Visual Studio's built-in CMake support
- cmake (Windows): initialize vcpkg/build dependencies automatically
- cmake (Windows): complain when encountering an unknown compiler
- cmake (Windows): let the `.dll` files are found when running the tests
- cmake: quote the path accurately when editing `test-lib.sh`
- cmake: fall back to using `vcpkg`'s `msgfmt.exe` on Windows
- cmake: ensure that the `vcpkg` packages are found on Windows
- cmake: do find Git for Windows' shell interpreter
- cmake: ignore files generated by CMake as run in Visual Studio
Using the CMake support we added some time ago for real with Visual
Studio build revealed there were lot of usability improvements
possible, which have been carried out.
Expecting a reroll.
cf. <CAKiG+9V=BGX4k_dM-5JzYmko0cZfYXuSxEk5-UuHZpAqaWoU_A@mail.gmail.com>
cf. <CAPig+cTPi1yi7WQf_eWa+bFRJEdtULFO3yYqJh3nm=_CtEe6CQ@mail.gmail.com>
cf. <xmqq8scxln10.fsf@gitster.c.googlers.com>
* sv/t7001-modernize (2020-09-25) 11 commits
- t7001: move cleanup code from outside the tests into them
- t7001: use `test` rather than `[`
- t7001: use here-docs instead of echo
- t7001: put each command on a separate line
- t7001: use ': >' rather than 'touch'
- t7001: change (cd <path> && git foo) to (git -C <path> foo)
- t7001: remove whitespace after redirect operators
- t7001: change the style for cd according to subshell
- t7001: remove unnecessary blank lines
- t7001: use TAB instead of spaces
- t7001: convert tests from the old style to the current style
Test script modernization.
Expecting a reroll.
cf. <20200925170256.11490-1-shubhunic@gmail.com>
* jc/sequencer-stopped-sha-simplify (2020-09-25) 1 commit
- sequencer: stop abbreviating stopped-sha file
* jc/t1506-rev-parse-leaves-range-endpoint-unpeeled (2020-09-25) 1 commit
(merged to 'next' on 2020-09-25 at e5233774ba)
+ t1506: rev-parse A..B and A...B
Test update.
Will merge to 'master'.
--------------------------------------------------
[Stalled]
* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- Documentation/git-send-email.txt: Mention less secure app access might need to enable.
Doc update.
Expecting a reroll.
cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
* jc/war-on-dashed-git (2020-08-27) 1 commit
- git: catch an attempt to run "git-foo"
The first step to remove on-disk binaries for built-in subcommands
by soliciting objections.
On hold for now.
* dr/push-remoteref-fix (2020-04-23) 1 commit
- remote.c: fix handling of %(push:remoteref)
The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).
Discard for now.
cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
cf. <20200911214358.acl3hy2e763begoo@feanor>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
--------------------------------------------------
[Cooking]
* rs/archive-add-file (2020-09-19) 3 commits
- Makefile: use git-archive --add-file
- archive: add --add-file
- archive: read short blobs in archive.c::write_archive_entry()
"git archive" learns the "--add-file" option to include untracked
files into a snapshot from a tree-ish.
* js/default-branch-name-part-2 (2020-09-21) 5 commits
- t9902: avoid using the branch name `master`
- tests: avoid variations of the `master` branch name
- t3200: avoid variations of the `master` branch name
- fast-export: avoid using unnecessary language in a code comment
- t/test-terminal: avoid non-inclusive language
Update the tests to drop word 'master' from them
* jt/keep-partial-clone-filter-upon-lazy-fetch (2020-09-21) 2 commits
- fetch: do not override partial clone filter
- promisor-remote: remove unused variable
The lazy fetching done internally to make missing objects available
in a partial clone incorrectly made permanent damate to the partial
clone filter in the repository, which has been corrected.
* dl/diff-merge-base (2020-09-21) 10 commits
- contrib/completion: complete `git diff --merge-base`
- builtin/diff-tree: learn --merge-base
- builtin/diff-index: learn --merge-base
- t4068: add --merge-base tests
- diff-lib: define diff_get_merge_base()
- diff-lib: accept option flags in run_diff_index()
- contrib/completion: extract common diff/difftool options
- git-diff.txt: backtick quote command text
- git-diff-index.txt: make --cached description a proper sentence
- t4068: remove unnecessary >tmp
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.
Expecting a reroll.
cf. <xmqqblhyepup.fsf@gitster.c.googlers.com>
* bc/faq-misc (2020-09-20) 3 commits
(merged to 'next' on 2020-09-22 at a81b728010)
+ docs: explain how to deal with files that are always modified
+ docs: explain why reverts are not always applied on merge
+ docs: explain why squash merges are broken with long-running branches
More FAQ entries.
Will merge to 'master'.
* sb/clone-origin (2020-09-11) 4 commits
- clone: allow configurable default for `-o`/`--origin`
- clone: validate --origin option before use
- clone: call git_config before parse_options
- clone: add tests for --template and some disallowed option pairs
"git clone" learned clone.defaultremotename configuration variable
to customize what nickname to use to call the remote the repository
was cloned from.
Expecting an update.
* sk/force-if-includes (2020-09-23) 3 commits
- t, doc: update tests, reference for "--force-if-includes"
- push: parse and set flag for "--force-if-includes"
- push: add reflog check for "--force-if-includes"
"git push --force-with-lease[=<ref>]" can easily be misused to lose
commits unless the user takes good care of their own "git fetch".
A new option "--force-if-includes" attempts to ensure that what is
being force-pushed was created after examining the commit at the
tip of the remote ref that is about to be force-replaced.
Expecting a reroll.
cf. <20200923112606.GA71705@mail.clickyotomy.dev>
* ab/mediawiki-fixes (2020-09-21) 18 commits
(merged to 'next' on 2020-09-25 at 878693716e)
+ remote-mediawiki: use "sh" to eliminate unquoted commands
+ remote-mediawiki: annotate unquoted uses of run_git()
+ remote-mediawiki: convert to quoted run_git() invocation
+ remote-mediawiki: provide a list form of run_git()
+ remote-mediawiki tests: annotate failing tests
+ remote-mediawiki: fix duplicate revisions being imported
+ remote-mediawiki tests: use CLI installer
+ remote-mediawiki tests: use inline PerlIO for readability
+ remote-mediawiki tests: replace deprecated Perl construct
+ remote-mediawiki tests: use a more idiomatic dispatch table
+ remote-mediawiki tests: use "$dir/" instead of "$dir."
+ remote-mediawiki tests: change `[]` to `test`
+ remote-mediawiki tests: use test_cmp in tests
+ remote-mediawiki tests: use a 10 character password
+ remote-mediawiki tests: use the login/password variables
+ remote-mediawiki doc: don't hardcode Debian PHP versions
+ remote-mediawiki doc: link to MediaWiki's current version
+ remote-mediawiki doc: correct link to GitHub project
Modernization and fixes to MediaWiki remote backend.
Will merge to 'master'.
* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- config: option transfer.ipversion to set transport protocol version for network fetches
Adds transfer.ipversion configuration variable.
Needs more work.
* bc/clone-with-git-default-hash-fix (2020-09-22) 1 commit
(merged to 'next' on 2020-09-22 at 62ea45c20e)
+ builtin/clone: avoid failure with GIT_DEFAULT_HASH
"git clone" that clones from SHA-1 repository, while
GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an
unusable repository that half-claims to be SHA-256 repository
with SHA-1 objects and refs. This has been corrected.
Will merge to 'master'.
* hn/reftable (2020-09-22) 14 commits
- reftable: fix some sparse warnings
- reftable: "test-tool dump-reftable" command.
- reftable: rest of library
- reftable: file level tests
- reftable: read reftable files
- reftable: write reftable files
- reftable: a generic binary tree implementation
- reftable: reading/writing blocks
- reftable: (de)serialization for the polymorphic record type.
- reftable: utility functions
- reftable: add a barebones unittest framework
- vcxproj: adjust for the reftable changes
- reftable: define the public API
- reftable: add LICENSE
* bc/rev-parse-path-format (2020-09-08) 1 commit
- rev-parse: add option for absolute or relative path formatting
"git rev-parse" can be explicitly told to give output as absolute
or relative path.
Expecting a reroll.
cf. <20200909222333.GH241078@camp.crustytoothpaste.net>
* ds/maintenance-part-3 (2020-09-25) 7 commits
- maintenance: add troubleshooting guide to docs
- maintenance: recommended schedule in register/start
- maintenance: add start/stop subcommands
- maintenance: add [un]register subcommands
- for-each-repo: run subcommands on configured repos
- maintenance: add --schedule option and config
- maintenance: optionally skip --auto process
(this branch uses ds/maintenance-part-2.)
Parts of "git maintenance" to ease writing crontab entries (and
other scheduling system configuration) for it.
* tb/bloom-improvements (2020-09-18) 13 commits
(merged to 'next' on 2020-09-22 at 520d531ad8)
+ commit-graph: introduce 'commitGraph.maxNewFilters'
+ builtin/commit-graph.c: introduce '--max-new-filters=<n>'
+ commit-graph: rename 'split_commit_graph_opts'
+ bloom: encode out-of-bounds filters as non-empty
+ bloom/diff: properly short-circuit on max_changes
+ bloom: use provided 'struct bloom_filter_settings'
+ bloom: split 'get_bloom_filter()' in two
+ commit-graph.c: store maximum changed paths
+ commit-graph: respect 'commitGraph.readChangedPaths'
+ t/helper/test-read-graph.c: prepare repo settings
+ commit-graph: pass a 'struct repository *' in more places
+ t4216: use an '&&'-chain
+ commit-graph: introduce 'get_bloom_filter_settings()'
"git commit-graph write" learned to limit the number of bloom
filters that are computed from scratch with the --max-new-filters
option.
Will merge to 'master'.
* es/config-hooks (2020-09-09) 9 commits
- run_commit_hook: take strvec instead of varargs
- commit: use config-based hooks
- hook: replace run-command.h:find_hook
- hook: add 'run' subcommand
- parse-options: parse into strvec
- hook: add --porcelain to list command
- hook: add list command
- hook: scaffolding for git-hook subcommand
- doc: propose hooks managed by the config
The "hooks defined in config" topic.
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
- config: correctly read worktree configs in submodules
- config: make do_git_config_sequence receive a 'struct repository'
- t/helper/test-config: unify exit labels
- t/helper/test-config: diagnose missing arguments
- t/helper/test-config: be consistent with exit codes
- t1308-config-set: avoid false positives when using test-config
- doc: grep: unify info on configuration variables
"git grep" has been tweaked to be limited to the sparse checkout
paths.
* ew/decline-core-abbrev (2020-09-01) 1 commit
- core.abbrev <off|false|no> disables abbreviations
Allow the configuration to specify no abbreviation regardless of
the hash algorithm.
Expecting a reroll. The intent is very good.
* mr/bisect-in-c-2 (2020-09-24) 6 commits
- bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
- bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
- bisect--helper: reimplement `bisect_autostart` shell function in C
- bisect--helper: introduce new `write_in_file()` function
- bisect--helper: use '-res' in 'cmd_bisect__helper' return
- bisect--helper: BUG() in cmd_*() on invalid subcommand
Rewrite of the "git bisect" script in C continues.
Will merge to 'next'.
At v9. Looking good so far.
* js/no-builtins-on-disk-option (2020-09-21) 3 commits
(merged to 'next' on 2020-09-25 at 6b976da4d2)
+ ci: stop linking built-ins to the dashed versions
+ Optionally skip linking/copying the built-ins
+ msvc: copy the correct `.pdb` files in the Makefile target `install`
The installation procedure learned to optionally omit "git-foo"
executable files for each 'foo' built-in subcommand, which are only
required by old timers that still rely on the age old promise that
prepending "git --exec-path" output to PATH early in their script
will keep the "git-foo" calls they wrote working.
The old attempt to remove these executables from the disk failed in
the 1.6 era; it may be worth attempting again, but I think it is
worth to keep this topic separate from such a policy change to help
it graduate early.
Will merge to 'master'.
* jk/refspecs-negative (2020-09-25) 1 commit
- refspec: add support for negative refspecs
"git fetch" and "git push" support negative refspecs.
* ds/maintenance-part-2 (2020-09-25) 8 commits
- maintenance: add incremental-repack auto condition
- maintenance: auto-size incremental-repack batch
- maintenance: add incremental-repack task
- midx: use start_delayed_progress()
- midx: enable core.multiPackIndex by default
- maintenance: create auto condition for loose-objects
- maintenance: add loose-objects task
- maintenance: add prefetch task
(this branch is used by ds/maintenance-part-3.)
"git maintenance", an extended big brother of "git gc", continues
to evolve.
--------------------------------------------------
[Discarded]
* js/ignore-cmake-build-artifacts (2020-09-23) 1 commit
. cmake: ignore generated files
Running CMake based build with VS (in contrib/) from the top-level
of the working tree leaves extra build crufts behind. Add patterns
to .gitignore
Retracted.
cf. <pull.738.git.1601044118.gitgitgadget@gmail.com>
^ permalink raw reply [relevance 6%]
* Re: [PATCH 11/11] t7001: move cleanup code from outside the tests into them
2020-09-25 17:02 15% ` [PATCH 11/11] t7001: move cleanup code from outside the tests into them shubham verma
2020-09-25 19:36 4% ` Eric Sunshine
@ 2020-09-25 20:54 4% ` Junio C Hamano
1 sibling, 0 replies; 200+ results
From: Junio C Hamano @ 2020-09-25 20:54 UTC (permalink / raw)
To: shubham verma; +Cc: git
shubham verma <shubhunic@gmail.com> writes:
> From: Shubham Verma <shubhunic@gmail.com>
>
> Let's use test_when_finished() to include cleanup code inside the tests,
> as it's cleaner and safer to not have any code outside the tests.
>
> Signed-off-by: shubham verma <shubhunic@gmail.com>
> ---
> t/t7001-mv.sh | 25 +++++++++++--------------
> 1 file changed, 11 insertions(+), 14 deletions(-)
>
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> index 7bb4a7b759..b4d04ceaf8 100755
> --- a/t/t7001-mv.sh
> +++ b/t/t7001-mv.sh
> @@ -32,6 +32,7 @@ test_expect_success 'commiting the change' '
> '
>
> test_expect_success 'checking the commit' '
> + test_when_finished "rmdir path1" &&
> git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
> grep "^R100..*path1/COPYING..*path0/COPYING" actual
> '
Sorry, but why in this test? It only runs diff-tree and runs grep,
neither of which changes any state in the repository. Because the
test does *not* create path1, and having or not having path1 on the
filesystem would not affect the outcome of the test, I do not see
how it makes sense to use test_when_finished in here.
If you are saying that path1 will no longer be used after this test
finishes, test_when_finished should be done in the test before this
one that used path1 the last, because this test does not care. It
is probably the one that moves the file out of path1 back to path0
and records the result as a commit with title "move-in" (although if
I were writing this test today, I would merge the "move and commit"
into one step).
> @@ -43,6 +44,7 @@ test_expect_success 'mv --dry-run does not move file' '
> '
>
> test_expect_success 'checking -k on non-existing file' '
> + test_when_finished "rm -f idontexist path0/idontexist" &&
> git mv -k idontexist path0
> '
I do not see the point of "rm -f idontexist" in the
post-test-cleanup at all. Some might see that path0/ideontexist is
worth having there, in case the "mv" command gets so broken that it
creates such a file by mistake, but Personally I'd prefer to use
test_when_finished to clean up the side effects we _expect_ to
cause. We cannot anticipate each and every breakage.
The other side of the coin is that this test DEPENDS ON the fact
that idontexist does *NOT* exist before it runs "git mv -k
idontexist path0", but nobody before us gives us any explicitly
guarantee. This test also depends on the presence of path0
directory the same way. Instead of relying on others that came
before us to have cleaned after themselves for us, we can more
explicitly protect ourselves by making sure the pre-condition we
depend on holds. I.e.
test_expect_success 'mv -k on non-exising file would not fail' '
mkdir -p path0 &&
rm -f idontexist path0/idontexist &&
git mv -k idontexist path0
'
A broken "git mv" may or may not leave path0/idontexist behind, but
as long as the tests that come after us protect themselves with the
same principle of making sure the preconditions they care about do
hold, we do not necessarily have to clean after ourselves. Since we
expect we do not leave any side effect, I'd rather not to use
test_when_finished here.
@@ -55,6 +57,7 @@ test_expect_success 'checking -k on untracked file' '
>
> test_expect_success 'checking -k on multiple untracked files' '
> : > untracked2 &&
> + test_when_finished "rm -f untracked2 path0/untracked2" &&
> git mv -k untracked1 untracked2 path0 &&
> test -f untracked1 &&
> test -f untracked2 &&
An exercise to readers. Explain why
- we want to move test_when_finished _before_ ">untracked2" is created;
- "rm -f untrackd2" in test_when_finished is a good idea;
- "rm -f path0/untracked2" is not a good idea;
- we may want to do
>untracked1 &&
mkdir -p path0 &&
before "git mv -k ..." is tested.
> -# clean up the mess in case bad things happen
> -rm -f idontexist untracked1 untracked2 \
> - path0/idontexist path0/untracked1 path0/untracked2 \
> - .git/index.lock
> -rmdir path1
> -
> test_expect_success 'moving to absent target with trailing slash' '
> test_must_fail git mv path0/COPYING no-such-dir/ &&
> test_must_fail git mv path0/COPYING no-such-dir// &&
It may be a better approach to move the above removals at the
beginning of this test, just before the first test_must_fail line.
> -rm -fr papers partA path?
> -
> test_expect_success "Sergey Vlasov's test case" '
Likewise.
^ permalink raw reply [relevance 4%]
* Re: [PATCH 03/11] t7001: remove unnecessary blank lines
2020-09-25 17:50 6% ` Eric Sunshine
@ 2020-09-25 20:19 6% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-09-25 20:19 UTC (permalink / raw)
To: Eric Sunshine; +Cc: shubham verma, Git List
Eric Sunshine <sunshine@sunshineco.com> writes:
> It is very uncommon style to hide the subshell as these two tests do:
>
> test_expect_success 'title' '(
> ...
> )'
>
> Instead, these should be formatted as:
>
> test_expect_success 'title' '
> (
> ...
> )
> '
>
> Note that the "(" and ")" of the subshell are indented with a TAB, and
> then the body of the subshell is indented again with another TAB in
> order to comply with current style guidelines.
>
> Fixing these might possibly be done in patch [1/11], however, they are
> so unusual and would change indentation of the body lines that they
> might deserve a patch of their own to avoid being lost in the noise of
> [1/11].
I agree that adding that to 01/11 might be too noisy, but 04/11 may
be a good match.
Thanks.
^ permalink raw reply [relevance 6%]
* Re: [PATCH 07/11] t7001: use ': >' rather than 'touch'
2020-09-25 18:57 6% ` Eric Sunshine
@ 2020-09-25 20:21 6% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-09-25 20:21 UTC (permalink / raw)
To: Eric Sunshine; +Cc: shubham verma, Git List
Eric Sunshine <sunshine@sunshineco.com> writes:
> In patch [5/11] you dropped whitespace following the redirection
> operator, however, this patch introduces several new cases of unwanted
> whitespace.
>
> Checking "master", I see that there are 209 instances of `: >` in
> tests, but 1023 instances of `>`, which suggests that we should stick
> with plain `>` rather than `: >` in this patch.
Agreed on both points. Thanks for a careful review.
^ permalink raw reply [relevance 6%]
* Re: [PATCH 09/11] t7001: use here-docs instead of echo
2020-09-25 17:02 19% ` [PATCH 09/11] t7001: use here-docs instead of echo shubham verma
@ 2020-09-25 20:23 6% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2020-09-25 20:23 UTC (permalink / raw)
To: shubham verma; +Cc: git
shubham verma <shubhunic@gmail.com> writes:
> From: Shubham Verma <shubhunic@gmail.com>
>
> Change from old style to current style by taking advantage of
> here-docs instead of echo commands.
>
> Signed-off-by: shubham verma <shubhunic@gmail.com>
> ---
> t/t7001-mv.sh | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> index 94c5b10f8a..30714a8200 100755
> --- a/t/t7001-mv.sh
> +++ b/t/t7001-mv.sh
> @@ -222,7 +222,10 @@ test_expect_success 'git mv to move multiple sources into a directory' '
> git add dir/?.txt &&
> git mv dir/a.txt dir/b.txt other &&
> git ls-files >actual &&
> - { echo other/a.txt; echo other/b.txt; } >expect &&
> + cat >expect <<-\EOF &&
> + other/a.txt
> + other/b.txt
> + EOF
This could be written with test_write_lines but a here-doc would be
a better option in this case, as we will see the expected output from
the tested command in the exact form.
^ permalink raw reply [relevance 6%]
* Re: [PATCH 11/11] t7001: move cleanup code from outside the tests into them
2020-09-25 17:02 15% ` [PATCH 11/11] t7001: move cleanup code from outside the tests into them shubham verma
@ 2020-09-25 19:36 4% ` Eric Sunshine
2020-09-25 20:54 4% ` Junio C Hamano
1 sibling, 0 replies; 200+ results
From: Eric Sunshine @ 2020-09-25 19:36 UTC (permalink / raw)
To: shubham verma; +Cc: Git List
On Fri, Sep 25, 2020 at 1:03 PM shubham verma <shubhunic@gmail.com> wrote:
> Let's use test_when_finished() to include cleanup code inside the tests,
> as it's cleaner and safer to not have any code outside the tests.
>
> Signed-off-by: shubham verma <shubhunic@gmail.com>
> ---
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> @@ -32,6 +32,7 @@ test_expect_success 'commiting the change' '
> test_expect_success 'checking the commit' '
> + test_when_finished "rmdir path1" &&
> git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
> grep "^R100..*path1/COPYING..*path0/COPYING" actual
> '
This one doesn't really pass the smell test. `path1` was created by
the "prepare reference tree" test; it is not created by this test, so
it's not really this test's responsibility to clean it up. But it also
can't be cleaned up by "prepare reference tree" since that is just a
"setup" test, and `path` is used by subsequent tests.
Does anything actually fail if directory `path1` is not removed? I ask
because slightly below the point at which `path1` is removed (outside
of any tests) a different test goes ahead and re-creates `path1`. If
it turns out that removal of `path1` isn't actually necessary, then a
better option might be simply to drop the global `rmdir path1`
altogether, along with the subsequent `mkdir path1` which comes a bit
later.
> @@ -43,6 +44,7 @@ test_expect_success 'mv --dry-run does not move file' '
> test_expect_success 'checking -k on non-existing file' '
> + test_when_finished "rm -f idontexist path0/idontexist" &&
> git mv -k idontexist path0
> '
The paths being removed here shouldn't actually be created by this
test, but if Git is somehow buggy and they do get created, then this
is the appropriate place to clean them up. Good.
> @@ -55,6 +57,7 @@ test_expect_success 'checking -k on untracked file' '
> test_expect_success 'checking -k on multiple untracked files' '
> : > untracked2 &&
> + test_when_finished "rm -f untracked2 path0/untracked2" &&
> git mv -k untracked1 untracked2 path0 &&
> test -f untracked1 &&
> test -f untracked2 &&
> @@ -64,18 +67,14 @@ test_expect_success 'checking -k on multiple untracked files' '
> test_expect_success 'checking -f on untracked file with existing target' '
> : > path0/untracked1 &&
> + test_when_finished "rm -f untracked1 path0/untracked1" &&
> + test_when_finished "rm -f .git/index.lock" &&
> test_must_fail git mv -f untracked1 path0 &&
> test ! -f .git/index.lock &&
> test -f untracked1 &&
> test -f path0/untracked1
> '
This is a big ugly. `untracked1` gets created by an earlier test but
is then cleaned up by this subsequent test. That goes against the idea
of test_when_finished(), which is that tests should clean up after
themselves. Doing it this way also creates a smelly dependency between
the tests. What I would recommend instead is having each test
independently create and cleanup the "untracked" files it needs. This
makes the tests a tiny bit more verbose but makes it much clearer to
the reader that the tests are independent.
> -# clean up the mess in case bad things happen
> -rm -f idontexist untracked1 untracked2 \
> - path0/idontexist path0/untracked1 path0/untracked2 \
> - .git/index.lock
> -rmdir path1
> @@ -149,10 +148,12 @@ test_expect_success 'do not move directory over existing directory' '
> test_expect_success 'move into "."' '
> + test_when_finished "rm -fr path?" &&
> git mv path1/path2/ .
> '
This is another of those cases which doesn't really pass the smell
test. This may indeed be the final test in which the various `path?`
subdirectories are used, but it isn't the test which created them,
thus it isn't "cleaning up after itself".
If the test which might get tripped up by these `path?` directories is
the "Sergey Vlasov's test case" test, then it probably would make more
sense for _that_ test to do `rm -fr path?` as its very first step (not
as a test_when_finished()) in order to prepare things the way it needs
them (just as it already does `rm -fr .git`).
> test_expect_success "Michael Cassar's test case" '
> + test_when_finished "rm -fr papers partA" &&
> rm -fr .git papers partA &&
> git init &&
> mkdir -p papers/unsorted papers/all-papers partA &&
Cleaning these paths here makes sense since they are created and only
used by this test.
> @@ -168,8 +169,6 @@ test_expect_success "Michael Cassar's test case" '
> -rm -fr papers partA path?
> -
> test_expect_success "Sergey Vlasov's test case" '
> rm -fr .git &&
> git init &&
So, given what I said above, the first line of this test might become:
rm -fr .git path? &&
> @@ -230,6 +229,7 @@ test_expect_success 'git mv to move multiple sources into a directory' '
> test_expect_success 'git mv should not change sha1 of moved cache entry' '
> + test_when_finished "rm -f dirty dirty2" &&
> rm -fr .git &&
> git init &&
> echo 1 >dirty &&
> @@ -242,8 +242,6 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
> test "$entry" = "$(git ls-files --stage dirty | cut -f 1)"
> '
>
> -rm -f dirty dirty2
Makes perfect sense.
> @@ -262,6 +260,7 @@ test_expect_success 'git mv error on conflicted file' '
> test_expect_success 'git mv should overwrite symlink to a file' '
> + test_when_finished "rm -f moved symlink" &&
> rm -fr .git &&
> git init &&
> echo 1 >moved &&
> @@ -276,9 +275,8 @@ test_expect_success 'git mv should overwrite symlink to a file' '
> git diff-files --quiet
> '
>
> -rm -f moved symlink
Okay.
> test_expect_success 'git mv should overwrite file with a symlink' '
> + test_when_finished "rm -f symlink" &&
> rm -fr .git &&
> git init &&
> echo 1 >moved &&
This makes sense, but...
> @@ -292,11 +290,10 @@ test_expect_success 'git mv should overwrite file with a symlink' '
> test_expect_success SYMLINKS 'check moved symlink' '
> + test_when_finished "rm -f moved" &&
> test -h moved
> '
... this test only gets run on platforms which support symlinks (see
the SYMLINKS predicate in the test definition), so the `moved` file
won't get cleaned up on platforms which don't support symlinks.
> -rm -f moved symlink
If the `moved` file actually causes subsequent tests to fail, then
this might be one of those rare instances in which you'd introduce a
test merely to clean up state from earlier tests. Perhaps something
like this:
test_expect_success 'cleanup symlink detritus' '
rm -r moved
'
However, if `moved` doesn't cause subsequent tests to fail, then it
might also make sense instead just to leave it alone and not bother
cleaning it up.
^ permalink raw reply [relevance 4%]
* Re: [PATCH 08/11] t7001: put each command on a separate line
2020-09-25 17:02 19% ` [PATCH 08/11] t7001: put each command on a separate line shubham verma
@ 2020-09-25 19:01 6% ` Eric Sunshine
0 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2020-09-25 19:01 UTC (permalink / raw)
To: shubham verma; +Cc: Git List
On Fri, Sep 25, 2020 at 1:03 PM shubham verma <shubhunic@gmail.com> wrote:
> Multiple commands on one line should be split across multiple lines.
Drop the extra whitespace between "line" and "should".
I might have written the commit message with a bit more explanation,
perhaps like this:
Modern practice is to avoid multiple commands per line, and
instead place each command on its own line.
The patch itself looks fine.
> Signed-off-by: shubham verma <shubhunic@gmail.com>
^ permalink raw reply [relevance 6%]
* Re: [PATCH 07/11] t7001: use ': >' rather than 'touch'
2020-09-25 17:02 18% ` [PATCH 07/11] t7001: use ': >' rather than 'touch' shubham verma
@ 2020-09-25 18:57 6% ` Eric Sunshine
2020-09-25 20:21 6% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Eric Sunshine @ 2020-09-25 18:57 UTC (permalink / raw)
To: shubham verma; +Cc: Git List
On Fri, Sep 25, 2020 at 1:03 PM shubham verma <shubhunic@gmail.com> wrote:
> t7001: use ': >' rather than 'touch'
>
> Use `>` rather than `touch` to create an empty file when the
> timestamp isn't relevant to the test.
There is an inconsistency here. In the subject you say ": >" but in
the body just ">".
A couple more comments below...
> Signed-off-by: shubham verma <shubhunic@gmail.com>
> ---
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> @@ -47,14 +47,14 @@ test_expect_success 'checking -k on non-existing file' '
> test_expect_success 'checking -k on untracked file' '
> - touch untracked1 &&
> + : > untracked1 &&
In patch [5/11] you dropped whitespace following the redirection
operator, however, this patch introduces several new cases of unwanted
whitespace.
Checking "master", I see that there are 209 instances of `: >` in
tests, but 1023 instances of `>`, which suggests that we should stick
with plain `>` rather than `: >` in this patch.
^ permalink raw reply [relevance 6%]
* Re: [PATCH 06/11] t7001: change (cd <path> && git foo) to (git -C <path> foo)
2020-09-25 17:02 15% ` [PATCH 06/11] t7001: change (cd <path> && git foo) to (git -C <path> foo) shubham verma
@ 2020-09-25 18:53 11% ` Eric Sunshine
0 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2020-09-25 18:53 UTC (permalink / raw)
To: shubham verma; +Cc: Git List
On Fri, Sep 25, 2020 at 1:03 PM shubham verma <shubhunic@gmail.com> wrote:
> t7001: change (cd <path> && git foo) to (git -C <path> foo)
This is misleading. We don't want the `git -C` form in a subshell, so
it shouldn't be enclosed in parentheses. Perhaps write it like this:
t7001 use `git -C` to avoid `cd` outside of subshells
> Let's avoid the use of `cd` outside subshells by encapsulating them
> inside subshells or by using `git -C <dir> ...`.
This is misleading in two ways. First, none of the changes made by
this patch add subshell encapsulation. Second, many of the changes
drop the subhsell in favor of `git -C`, so describing them as "`cd`
outside of subshells" is wrong.
It's also important for the commit message to explain _why_ this
change is important when `cd` is used outside of a subshell. A
possible rewrite might be:
t7001: avoid using `cd` outside of subshells
Avoid using `cd` outside of subshells since, if the test fails,
there is no guarantee that the current working directory is the
expected one, which may cause subsequent tests to run in the wrong
directory.
While at it, make some other tests more concise by replacing
simple subshells with `git -C`.
In fact, fixing the cases in which `cd` is used outside of a subshell
is much more important than the mere mechanical conversion made to the
other tests by replacing a subshell with `git -C`. As such, I'm
tempted to suggest splitting this patch into two: one which fixes the
cases of `cd` outside of subshell, and another which converts the
simple subshell cases to use `git -C`.
> Signed-off-by: shubham verma <shubhunic@gmail.com>
> ---
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> @@ -11,12 +11,11 @@ test_expect_success 'prepare reference tree' '
> test_expect_success 'moving the file out of subdirectory' '
> - cd path0 && git mv COPYING ../path1/COPYING
> + git -C path0 mv COPYING ../path1/COPYING
> '
>
> -# in path0 currently
> test_expect_success 'commiting the change' '
> - cd .. && git commit -m move-out -a
> + git commit -m move-out -a
> '
This transformation looks fine, as do the following two tests which
get the same transformation.
I do have a very slight hesitation, though, that these changes go
against the grain of the tests. In particular, at the top of this
script, we see:
test_description='git mv in subdirs'
which suggests that the tests really want to test the bare `git mv`
command while actually running in a subdirectory. This would imply
that these test should be rewritten as:
test_expect_success 'title' '
(
cd path0 &&
...
)
'
However, it's such a minor misgiving that it's probably not worth considering.
> @@ -364,16 +356,10 @@ test_expect_success 'git mv moves a submodule with gitfile' '
> - (
> - cd mod &&
> - git mv ../sub/ .
> - ) &&
> + git -C mod mv ../sub/ . &&
Okay. At first glance one might expect you to strip the `../` from the
argument, but indeed `../sub/` is correct since `-C mod` really does
change to the new directory, so the argument is interpreted relative
to `mod`.
^ permalink raw reply [relevance 11%]
* Re: [PATCH 04/11] t7001: change the style for cd according to subshell
2020-09-25 17:02 19% ` [PATCH 04/11] t7001: change the style for cd according to subshell shubham verma
@ 2020-09-25 18:12 11% ` Eric Sunshine
0 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2020-09-25 18:12 UTC (permalink / raw)
To: shubham verma; +Cc: Git List
On Fri, Sep 25, 2020 at 1:03 PM shubham verma <shubhunic@gmail.com> wrote:
> t7001: change the style for cd according to subshell
>
> In some tests there is not a proper spaces after opening paranthesis
> and before cd. So, Lets change the style for cd according to subshell.
Nits:
s/space/newline/
s/paranthesis/parenthesis/
s/So, Lets change/Change/
However, a more significant observation is that this change is
actually specific to the formatting of subshells, and has nothing to
do with placement of `cd`, so calling out `cd` in the commit message
is misleading. I'd probably drop mention of `cd` altogether and write
the commit message something like this:
t7001: modernize subshell formatting
Some test use an old style for formatting subshells:
(command &&
...
Update them to the modern style:
(
command &&
...
The actual patch is fine.
> Signed-off-by: shubham verma <shubhunic@gmail.com>
^ permalink raw reply [relevance 11%]
* Re: [PATCH 03/11] t7001: remove unnecessary blank lines
2020-09-25 17:02 17% ` [PATCH 03/11] t7001: remove unnecessary blank lines shubham verma
@ 2020-09-25 17:50 6% ` Eric Sunshine
2020-09-25 20:19 6% ` Junio C Hamano
0 siblings, 1 reply; 200+ results
From: Eric Sunshine @ 2020-09-25 17:50 UTC (permalink / raw)
To: shubham verma; +Cc: Git List
On Fri, Sep 25, 2020 at 1:03 PM shubham verma <shubhunic@gmail.com> wrote:
> Some tests use a deprecated style in which there are unnecessary
> blank lines after the opening quote of the test body and before the
> closing quote. So we should removed these unnecessary blank lines.
s/So we should removed/Remove/
Otherwise, nice explanatory commit message.
One comment below not related directly to this patch (just something
noticed in the patch conext lines)...
> Signed-off-by: shubham verma <shubhunic@gmail.com>
> ---
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> @@ -182,7 +182,6 @@ test_expect_success "Sergey Vlasov's test case" '
> test_expect_success 'absolute pathname' '(
> ...
> )'
> test_expect_success 'absolute pathname outside should fail' '(
> ...
> )'
It is very uncommon style to hide the subshell as these two tests do:
test_expect_success 'title' '(
...
)'
Instead, these should be formatted as:
test_expect_success 'title' '
(
...
)
'
Note that the "(" and ")" of the subshell are indented with a TAB, and
then the body of the subshell is indented again with another TAB in
order to comply with current style guidelines.
Fixing these might possibly be done in patch [1/11], however, they are
so unusual and would change indentation of the body lines that they
might deserve a patch of their own to avoid being lost in the noise of
[1/11].
^ permalink raw reply [relevance 6%]
* Re: [PATCH 01/11] t7001: convert tests from the old style to the current style
2020-09-25 17:02 13% ` [PATCH 01/11] t7001: convert tests from the old style to the current style shubham verma
@ 2020-09-25 17:40 11% ` Eric Sunshine
0 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2020-09-25 17:40 UTC (permalink / raw)
To: shubham verma; +Cc: Git List
On Fri, Sep 25, 2020 at 1:03 PM shubham verma <shubhunic@gmail.com> wrote:
> t7001: convert tests from the old style to the current style
>
> To modernize the t7001 test script, let's change the style of
> its tests from an old one to the modern one.
This commit message could help reviewers more by giving an example of
how the style is being updated because it's not so easy to pick up the
details from the patch itself since it's so noisy. Perhaps the commit
message could say something like:
t7001: modernize test formatting
Some tests in this script are formatted using a very old style:
test_expect_success \
'title' \
'body line 1 &&
body line 2'
Update the formatting to the modern style:
test_expect_success 'title' '
body line 1 &&
body line 2
'
> Signed-off-by: shubham verma <shubhunic@gmail.com>
^ permalink raw reply [relevance 11%]
* Re: [PATCH 02/11] t7001: use TAB instead of spaces
2020-09-25 17:02 13% ` [PATCH 02/11] t7001: use TAB instead of spaces shubham verma
@ 2020-09-25 17:44 11% ` Eric Sunshine
0 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2020-09-25 17:44 UTC (permalink / raw)
To: shubham verma; +Cc: Git List
On Fri, Sep 25, 2020 at 1:03 PM shubham verma <shubhunic@gmail.com> wrote:
> t7001: use TAB instead of spaces
Nit: "use" is a bit nebulous; I'd probably say:
t7001: indent with TABs instead of spaces
> Change indentation style from spaces to TAB.
...which would also allow you to drop this line altogether.
If you feel that you must write something in the body of the commit
messages, then perhaps say something about how modern style is to
indent test bodies with TABs rather than spaces.
> Signed-off-by: shubham verma <shubhunic@gmail.com>
^ permalink raw reply [relevance 11%]
* Re: [PATCH 00/11] Modernizing the t7001 test script
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
` (10 preceding siblings ...)
2020-09-25 17:02 15% ` [PATCH 11/11] t7001: move cleanup code from outside the tests into them shubham verma
@ 2020-09-25 17:33 6% ` Eric Sunshine
2020-10-01 5:42 6% ` Shubham Verma
11 siblings, 1 reply; 200+ results
From: Eric Sunshine @ 2020-09-25 17:33 UTC (permalink / raw)
To: shubham verma; +Cc: Git List
On Fri, Sep 25, 2020 at 1:03 PM shubham verma <shubhunic@gmail.com> wrote:
> In this patch series modernize the t7001 test script by changing the
> style of its tests from an old one to the modern one and by cleaning
> up the test script.
Thanks for tackling this task. I presume it was prompted by [1] or
[2], as this series covers many of the items mentioned in [1].
Overall, the series looks good. I'll leave comments in a few of the
individual patches.
[1]: https://lore.kernel.org/git/CAPig+cQpUu2UO-+jWn1nTaDykWnxwuEitzVB7PnW2SS_b7V8Hg@mail.gmail.com/
[2]: https://git.github.io/rev_news/2020/08/27/edition-66/
^ permalink raw reply [relevance 6%]
* [PATCH 04/11] t7001: change the style for cd according to subshell
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
` (2 preceding siblings ...)
2020-09-25 17:02 17% ` [PATCH 03/11] t7001: remove unnecessary blank lines shubham verma
@ 2020-09-25 17:02 19% ` shubham verma
2020-09-25 18:12 11% ` Eric Sunshine
2020-09-25 17:02 19% ` [PATCH 05/11] t7001: remove whitespace after redirect operators shubham verma
` (7 subsequent siblings)
11 siblings, 1 reply; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git; +Cc: Shubham Verma
From: Shubham Verma <shubhunic@gmail.com>
In some tests there is not a proper spaces after opening paranthesis
and before cd. So, Lets change the style for cd according to subshell.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index f63802442b..67585b7d94 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -503,14 +503,16 @@ test_expect_success 'moving a submodule in nested directories' '
test_expect_success 'moving nested submodules' '
git commit -am "cleanup commit" &&
mkdir sub_nested_nested &&
- (cd sub_nested_nested &&
+ (
+ cd sub_nested_nested &&
touch nested_level2 &&
git init &&
git add . &&
git commit -m "nested level 2"
) &&
mkdir sub_nested &&
- (cd sub_nested &&
+ (
+ cd sub_nested &&
touch nested_level1 &&
git init &&
git add . &&
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH 08/11] t7001: put each command on a separate line
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
` (6 preceding siblings ...)
2020-09-25 17:02 18% ` [PATCH 07/11] t7001: use ': >' rather than 'touch' shubham verma
@ 2020-09-25 17:02 19% ` shubham verma
2020-09-25 19:01 6% ` Eric Sunshine
2020-09-25 17:02 19% ` [PATCH 09/11] t7001: use here-docs instead of echo shubham verma
` (3 subsequent siblings)
11 siblings, 1 reply; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git; +Cc: Shubham Verma
From: Shubham Verma <shubhunic@gmail.com>
Multiple commands on one line should be split across multiple lines.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 728a937eeb..94c5b10f8a 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -143,7 +143,9 @@ test_expect_success 'checking the commit' '
'
test_expect_success 'do not move directory over existing directory' '
- mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
+ mkdir path0 &&
+ mkdir path0/path2 &&
+ test_must_fail git mv path2 path0
'
test_expect_success 'move into "."' '
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH 09/11] t7001: use here-docs instead of echo
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
` (7 preceding siblings ...)
2020-09-25 17:02 19% ` [PATCH 08/11] t7001: put each command on a separate line shubham verma
@ 2020-09-25 17:02 19% ` shubham verma
2020-09-25 20:23 6% ` Junio C Hamano
2020-09-25 17:02 16% ` [PATCH 10/11] t7001: use `test` rather than `[` shubham verma
` (2 subsequent siblings)
11 siblings, 1 reply; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git; +Cc: Shubham Verma
From: Shubham Verma <shubhunic@gmail.com>
Change from old style to current style by taking advantage of
here-docs instead of echo commands.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 94c5b10f8a..30714a8200 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -222,7 +222,10 @@ test_expect_success 'git mv to move multiple sources into a directory' '
git add dir/?.txt &&
git mv dir/a.txt dir/b.txt other &&
git ls-files >actual &&
- { echo other/a.txt; echo other/b.txt; } >expect &&
+ cat >expect <<-\EOF &&
+ other/a.txt
+ other/b.txt
+ EOF
test_cmp expect actual
'
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH 05/11] t7001: remove whitespace after redirect operators
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
` (3 preceding siblings ...)
2020-09-25 17:02 19% ` [PATCH 04/11] t7001: change the style for cd according to subshell shubham verma
@ 2020-09-25 17:02 19% ` shubham verma
2020-09-25 17:02 15% ` [PATCH 06/11] t7001: change (cd <path> && git foo) to (git -C <path> foo) shubham verma
` (6 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git; +Cc: Shubham Verma
From: Shubham Verma <shubhunic@gmail.com>
According to Documentation/CodingGuidelines, there should be no
whitespace after redirect operators. So, we should remove these
whitespaces after redirect operators.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 67585b7d94..7581e4b407 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -156,9 +156,9 @@ test_expect_success "Michael Cassar's test case" '
rm -fr .git papers partA &&
git init &&
mkdir -p papers/unsorted papers/all-papers partA &&
- echo a > papers/unsorted/Thesis.pdf &&
- echo b > partA/outline.txt &&
- echo c > papers/unsorted/_another &&
+ echo a >papers/unsorted/Thesis.pdf &&
+ echo b >partA/outline.txt &&
+ echo c >papers/unsorted/_another &&
git add papers partA &&
T1=$(git write-tree) &&
--
2.25.1
^ permalink raw reply related [relevance 19%]
* [PATCH 07/11] t7001: use ': >' rather than 'touch'
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
` (5 preceding siblings ...)
2020-09-25 17:02 15% ` [PATCH 06/11] t7001: change (cd <path> && git foo) to (git -C <path> foo) shubham verma
@ 2020-09-25 17:02 18% ` shubham verma
2020-09-25 18:57 6% ` Eric Sunshine
2020-09-25 17:02 19% ` [PATCH 08/11] t7001: put each command on a separate line shubham verma
` (4 subsequent siblings)
11 siblings, 1 reply; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git; +Cc: Shubham Verma
From: Shubham Verma <shubhunic@gmail.com>
Use `>` rather than `touch` to create an empty file when the
timestamp isn't relevant to the test.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 3a3ace6d73..728a937eeb 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -47,14 +47,14 @@ test_expect_success 'checking -k on non-existing file' '
'
test_expect_success 'checking -k on untracked file' '
- touch untracked1 &&
+ : > untracked1 &&
git mv -k untracked1 path0 &&
test -f untracked1 &&
test ! -f path0/untracked1
'
test_expect_success 'checking -k on multiple untracked files' '
- touch untracked2 &&
+ : > untracked2 &&
git mv -k untracked1 untracked2 path0 &&
test -f untracked1 &&
test -f untracked2 &&
@@ -63,7 +63,7 @@ test_expect_success 'checking -k on multiple untracked files' '
'
test_expect_success 'checking -f on untracked file with existing target' '
- touch path0/untracked1 &&
+ : > path0/untracked1 &&
test_must_fail git mv -f untracked1 path0 &&
test ! -f .git/index.lock &&
test -f untracked1 &&
@@ -482,7 +482,7 @@ test_expect_success 'moving nested submodules' '
mkdir sub_nested_nested &&
(
cd sub_nested_nested &&
- touch nested_level2 &&
+ : > nested_level2 &&
git init &&
git add . &&
git commit -m "nested level 2"
@@ -490,7 +490,7 @@ test_expect_success 'moving nested submodules' '
mkdir sub_nested &&
(
cd sub_nested &&
- touch nested_level1 &&
+ : > nested_level1 &&
git init &&
git add . &&
git commit -m "nested level 1" &&
--
2.25.1
^ permalink raw reply related [relevance 18%]
* [PATCH 03/11] t7001: remove unnecessary blank lines
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
2020-09-25 17:02 13% ` [PATCH 01/11] t7001: convert tests from the old style to the current style shubham verma
2020-09-25 17:02 13% ` [PATCH 02/11] t7001: use TAB instead of spaces shubham verma
@ 2020-09-25 17:02 17% ` shubham verma
2020-09-25 17:50 6% ` Eric Sunshine
2020-09-25 17:02 19% ` [PATCH 04/11] t7001: change the style for cd according to subshell shubham verma
` (8 subsequent siblings)
11 siblings, 1 reply; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git; +Cc: Shubham Verma
From: Shubham Verma <shubhunic@gmail.com>
Some tests use a deprecated style in which there are unnecessary
blank lines after the opening quote of the test body and before the
closing quote. So we should removed these unnecessary blank lines.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 7503233814..f63802442b 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -182,7 +182,6 @@ test_expect_success "Sergey Vlasov's test case" '
'
test_expect_success 'absolute pathname' '(
-
rm -fr mine &&
mkdir mine &&
cd mine &&
@@ -196,12 +195,9 @@ test_expect_success 'absolute pathname' '(
! test -d sub &&
test -d in &&
git ls-files --error-unmatch in/file
-
-
)'
test_expect_success 'absolute pathname outside should fail' '(
-
rm -fr mine &&
mkdir mine &&
cd mine &&
@@ -216,7 +212,6 @@ test_expect_success 'absolute pathname outside should fail' '(
test -d sub &&
! test -d ../in &&
git ls-files --error-unmatch sub/file
-
)'
test_expect_success 'git mv to move multiple sources into a directory' '
@@ -232,7 +227,6 @@ test_expect_success 'git mv to move multiple sources into a directory' '
'
test_expect_success 'git mv should not change sha1 of moved cache entry' '
-
rm -fr .git &&
git init &&
echo 1 >dirty &&
@@ -243,7 +237,6 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
echo 2 >dirty2 &&
git mv dirty2 dirty &&
[ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
-
'
rm -f dirty dirty2
@@ -266,7 +259,6 @@ test_expect_success 'git mv error on conflicted file' '
'
test_expect_success 'git mv should overwrite symlink to a file' '
-
rm -fr .git &&
git init &&
echo 1 >moved &&
@@ -279,13 +271,11 @@ test_expect_success 'git mv should overwrite symlink to a file' '
test "$(cat symlink)" = 1 &&
git update-index --refresh &&
git diff-files --quiet
-
'
rm -f moved symlink
test_expect_success 'git mv should overwrite file with a symlink' '
-
rm -fr .git &&
git init &&
echo 1 >moved &&
@@ -296,11 +286,9 @@ test_expect_success 'git mv should overwrite file with a symlink' '
! test -e symlink &&
git update-index --refresh &&
git diff-files --quiet
-
'
test_expect_success SYMLINKS 'check moved symlink' '
-
test -h moved
'
--
2.25.1
^ permalink raw reply related [relevance 17%]
* [PATCH 10/11] t7001: use `test` rather than `[`
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
` (8 preceding siblings ...)
2020-09-25 17:02 19% ` [PATCH 09/11] t7001: use here-docs instead of echo shubham verma
@ 2020-09-25 17:02 16% ` shubham verma
2020-09-25 17:02 15% ` [PATCH 11/11] t7001: move cleanup code from outside the tests into them shubham verma
2020-09-25 17:33 6% ` [PATCH 00/11] Modernizing the t7001 test script Eric Sunshine
11 siblings, 0 replies; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git; +Cc: Shubham Verma
From: Shubham Verma <shubhunic@gmail.com>
According to Documentation/CodingGuidelines, we should use "test"
rather than "[ ... ]" in shell scripts, so let's replace the
"[ ... ]" with "test" in the t7001 test script.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 30714a8200..7bb4a7b759 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -236,10 +236,10 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
git add dirty &&
entry="$(git ls-files --stage dirty | cut -f 1)" &&
git mv dirty dirty2 &&
- [ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" &&
echo 2 >dirty2 &&
git mv dirty2 dirty &&
- [ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
+ test "$entry" = "$(git ls-files --stage dirty | cut -f 1)"
'
rm -f dirty dirty2
@@ -326,7 +326,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
mkdir mod &&
git mv sub mod/sub &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -346,7 +346,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
mkdir mod &&
git mv sub mod/sub &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
@@ -363,7 +363,7 @@ test_expect_success 'git mv moves a submodule with gitfile' '
mkdir mod &&
git -C mod mv ../sub/ . &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
@@ -382,7 +382,7 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -403,7 +403,7 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
@@ -421,7 +421,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
git mv sub mod/sub 2>actual.err &&
test_i18ncmp expect.err actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
--
2.25.1
^ permalink raw reply related [relevance 16%]
* [PATCH 06/11] t7001: change (cd <path> && git foo) to (git -C <path> foo)
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
` (4 preceding siblings ...)
2020-09-25 17:02 19% ` [PATCH 05/11] t7001: remove whitespace after redirect operators shubham verma
@ 2020-09-25 17:02 15% ` shubham verma
2020-09-25 18:53 11% ` Eric Sunshine
2020-09-25 17:02 18% ` [PATCH 07/11] t7001: use ': >' rather than 'touch' shubham verma
` (5 subsequent siblings)
11 siblings, 1 reply; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git; +Cc: Shubham Verma
From: Shubham Verma <shubhunic@gmail.com>
Let's avoid the use of `cd` outside subshells by encapsulating them
inside subshells or by using `git -C <dir> ...`.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 45 +++++++++++----------------------------------
1 file changed, 11 insertions(+), 34 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 7581e4b407..3a3ace6d73 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -11,12 +11,11 @@ test_expect_success 'prepare reference tree' '
'
test_expect_success 'moving the file out of subdirectory' '
- cd path0 && git mv COPYING ../path1/COPYING
+ git -C path0 mv COPYING ../path1/COPYING
'
-# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-out -a
+ git commit -m move-out -a
'
test_expect_success 'checking the commit' '
@@ -25,12 +24,11 @@ test_expect_success 'checking the commit' '
'
test_expect_success 'moving the file back into subdirectory' '
- cd path0 && git mv ../path1/COPYING COPYING
+ git -C path0 mv ../path1/COPYING COPYING
'
-# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-in -a
+ git commit -m move-in -a
'
test_expect_success 'checking the commit' '
@@ -324,10 +322,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
git mv sub mod/sub &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -347,10 +342,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
git mv sub mod/sub &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
test_cmp expected actual &&
@@ -364,16 +356,10 @@ test_expect_success 'git mv moves a submodule with gitfile' '
git submodule update &&
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
- (
- cd mod &&
- git mv ../sub/ .
- ) &&
+ git -C mod mv ../sub/ . &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
test_cmp expected actual &&
@@ -392,10 +378,7 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
test_must_be_empty actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -416,10 +399,7 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
test_must_be_empty actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -437,10 +417,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
test_i18ncmp expect.err actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
--
2.25.1
^ permalink raw reply related [relevance 15%]
* [PATCH 11/11] t7001: move cleanup code from outside the tests into them
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
` (9 preceding siblings ...)
2020-09-25 17:02 16% ` [PATCH 10/11] t7001: use `test` rather than `[` shubham verma
@ 2020-09-25 17:02 15% ` shubham verma
2020-09-25 19:36 4% ` Eric Sunshine
2020-09-25 20:54 4% ` Junio C Hamano
2020-09-25 17:33 6% ` [PATCH 00/11] Modernizing the t7001 test script Eric Sunshine
11 siblings, 2 replies; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git; +Cc: Shubham Verma
From: Shubham Verma <shubhunic@gmail.com>
Let's use test_when_finished() to include cleanup code inside the tests,
as it's cleaner and safer to not have any code outside the tests.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 7bb4a7b759..b4d04ceaf8 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -32,6 +32,7 @@ test_expect_success 'commiting the change' '
'
test_expect_success 'checking the commit' '
+ test_when_finished "rmdir path1" &&
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
grep "^R100..*path1/COPYING..*path0/COPYING" actual
'
@@ -43,6 +44,7 @@ test_expect_success 'mv --dry-run does not move file' '
'
test_expect_success 'checking -k on non-existing file' '
+ test_when_finished "rm -f idontexist path0/idontexist" &&
git mv -k idontexist path0
'
@@ -55,6 +57,7 @@ test_expect_success 'checking -k on untracked file' '
test_expect_success 'checking -k on multiple untracked files' '
: > untracked2 &&
+ test_when_finished "rm -f untracked2 path0/untracked2" &&
git mv -k untracked1 untracked2 path0 &&
test -f untracked1 &&
test -f untracked2 &&
@@ -64,18 +67,14 @@ test_expect_success 'checking -k on multiple untracked files' '
test_expect_success 'checking -f on untracked file with existing target' '
: > path0/untracked1 &&
+ test_when_finished "rm -f untracked1 path0/untracked1" &&
+ test_when_finished "rm -f .git/index.lock" &&
test_must_fail git mv -f untracked1 path0 &&
test ! -f .git/index.lock &&
test -f untracked1 &&
test -f path0/untracked1
'
-# clean up the mess in case bad things happen
-rm -f idontexist untracked1 untracked2 \
- path0/idontexist path0/untracked1 path0/untracked2 \
- .git/index.lock
-rmdir path1
-
test_expect_success 'moving to absent target with trailing slash' '
test_must_fail git mv path0/COPYING no-such-dir/ &&
test_must_fail git mv path0/COPYING no-such-dir// &&
@@ -149,10 +148,12 @@ test_expect_success 'do not move directory over existing directory' '
'
test_expect_success 'move into "."' '
+ test_when_finished "rm -fr path?" &&
git mv path1/path2/ .
'
test_expect_success "Michael Cassar's test case" '
+ test_when_finished "rm -fr papers partA" &&
rm -fr .git papers partA &&
git init &&
mkdir -p papers/unsorted papers/all-papers partA &&
@@ -168,8 +169,6 @@ test_expect_success "Michael Cassar's test case" '
git ls-tree -r $T | verbose grep partA/outline.txt
'
-rm -fr papers partA path?
-
test_expect_success "Sergey Vlasov's test case" '
rm -fr .git &&
git init &&
@@ -230,6 +229,7 @@ test_expect_success 'git mv to move multiple sources into a directory' '
'
test_expect_success 'git mv should not change sha1 of moved cache entry' '
+ test_when_finished "rm -f dirty dirty2" &&
rm -fr .git &&
git init &&
echo 1 >dirty &&
@@ -242,8 +242,6 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
test "$entry" = "$(git ls-files --stage dirty | cut -f 1)"
'
-rm -f dirty dirty2
-
# NB: This test is about the error message
# as well as the failure.
test_expect_success 'git mv error on conflicted file' '
@@ -262,6 +260,7 @@ test_expect_success 'git mv error on conflicted file' '
'
test_expect_success 'git mv should overwrite symlink to a file' '
+ test_when_finished "rm -f moved symlink" &&
rm -fr .git &&
git init &&
echo 1 >moved &&
@@ -276,9 +275,8 @@ test_expect_success 'git mv should overwrite symlink to a file' '
git diff-files --quiet
'
-rm -f moved symlink
-
test_expect_success 'git mv should overwrite file with a symlink' '
+ test_when_finished "rm -f symlink" &&
rm -fr .git &&
git init &&
echo 1 >moved &&
@@ -292,11 +290,10 @@ test_expect_success 'git mv should overwrite file with a symlink' '
'
test_expect_success SYMLINKS 'check moved symlink' '
+ test_when_finished "rm -f moved" &&
test -h moved
'
-rm -f moved symlink
-
test_expect_success 'setup submodule' '
git commit -m initial &&
git reset --hard &&
--
2.25.1
^ permalink raw reply related [relevance 15%]
* [PATCH 00/11] Modernizing the t7001 test script
@ 2020-09-25 17:02 15% shubham verma
2020-09-25 17:02 13% ` [PATCH 01/11] t7001: convert tests from the old style to the current style shubham verma
` (11 more replies)
0 siblings, 12 replies; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git
In this patch series modernize the t7001 test script by changing the
style of its tests from an old one to the modern one and by cleaning
up the test script.
Shubham Verma (11):
t7001: convert tests from the old style to the current style
t7001: use TAB instead of spaces
t7001: remove unnecessary blank lines
t7001: change the style for cd according to subshell
t7001: remove whitespace after redirect operators
t7001: change (cd <path> && git foo) to (git -C <path> foo)
t7001: use ': >' rather than 'touch'
t7001: put each command on a separate line
t7001: use here-docs instead of echo
t7001: use `test` rather than `[`
t7001: move cleanup code from outside the tests into them
t/t7001-mv.sh | 393 +++++++++++++++++++++++---------------------------
1 file changed, 181 insertions(+), 212 deletions(-)
--
2.25.1
^ permalink raw reply [relevance 15%]
* [PATCH 01/11] t7001: convert tests from the old style to the current style
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
@ 2020-09-25 17:02 13% ` shubham verma
2020-09-25 17:40 11% ` Eric Sunshine
2020-09-25 17:02 13% ` [PATCH 02/11] t7001: use TAB instead of spaces shubham verma
` (10 subsequent siblings)
11 siblings, 1 reply; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git; +Cc: Shubham Verma
From: Shubham Verma <shubhunic@gmail.com>
To modernize the t7001 test script, let's change the style of
its tests from an old one to the modern one.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 192 +++++++++++++++++++++++++-------------------------
1 file changed, 96 insertions(+), 96 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 63d5f41a12..4bbb51e578 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -3,74 +3,74 @@
test_description='git mv in subdirs'
. ./test-lib.sh
-test_expect_success \
- 'prepare reference tree' \
- 'mkdir path0 path1 &&
+test_expect_success 'prepare reference tree' '
+ mkdir path0 path1 &&
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
git add path0/COPYING &&
- git commit -m add -a'
+ git commit -m add -a
+'
-test_expect_success \
- 'moving the file out of subdirectory' \
- 'cd path0 && git mv COPYING ../path1/COPYING'
+test_expect_success 'moving the file out of subdirectory' '
+ cd path0 && git mv COPYING ../path1/COPYING
+'
# in path0 currently
-test_expect_success \
- 'commiting the change' \
- 'cd .. && git commit -m move-out -a'
+test_expect_success 'commiting the change' '
+ cd .. && git commit -m move-out -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path1/COPYING" actual'
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path1/COPYING" actual
+'
-test_expect_success \
- 'moving the file back into subdirectory' \
- 'cd path0 && git mv ../path1/COPYING COPYING'
+test_expect_success 'moving the file back into subdirectory' '
+ cd path0 && git mv ../path1/COPYING COPYING
+'
# in path0 currently
-test_expect_success \
- 'commiting the change' \
- 'cd .. && git commit -m move-in -a'
-
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path1/COPYING..*path0/COPYING" actual'
-
-test_expect_success \
- 'mv --dry-run does not move file' \
- 'git mv -n path0/COPYING MOVED &&
+test_expect_success 'commiting the change' '
+ cd .. && git commit -m move-in -a
+'
+
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path1/COPYING..*path0/COPYING" actual
+'
+
+test_expect_success 'mv --dry-run does not move file' '
+ git mv -n path0/COPYING MOVED &&
test -f path0/COPYING &&
- test ! -f MOVED'
+ test ! -f MOVED
+'
-test_expect_success \
- 'checking -k on non-existing file' \
- 'git mv -k idontexist path0'
+test_expect_success 'checking -k on non-existing file' '
+ git mv -k idontexist path0
+'
-test_expect_success \
- 'checking -k on untracked file' \
- 'touch untracked1 &&
+test_expect_success 'checking -k on untracked file' '
+ touch untracked1 &&
git mv -k untracked1 path0 &&
test -f untracked1 &&
- test ! -f path0/untracked1'
+ test ! -f path0/untracked1
+'
-test_expect_success \
- 'checking -k on multiple untracked files' \
- 'touch untracked2 &&
+test_expect_success 'checking -k on multiple untracked files' '
+ touch untracked2 &&
git mv -k untracked1 untracked2 path0 &&
test -f untracked1 &&
test -f untracked2 &&
test ! -f path0/untracked1 &&
- test ! -f path0/untracked2'
+ test ! -f path0/untracked2
+'
-test_expect_success \
- 'checking -f on untracked file with existing target' \
- 'touch path0/untracked1 &&
+test_expect_success 'checking -f on untracked file with existing target' '
+ touch path0/untracked1 &&
test_must_fail git mv -f untracked1 path0 &&
test ! -f .git/index.lock &&
test -f untracked1 &&
- test -f path0/untracked1'
+ test -f path0/untracked1
+'
# clean up the mess in case bad things happen
rm -f idontexist untracked1 untracked2 \
@@ -78,79 +78,79 @@ rm -f idontexist untracked1 untracked2 \
.git/index.lock
rmdir path1
-test_expect_success \
- 'moving to absent target with trailing slash' \
- 'test_must_fail git mv path0/COPYING no-such-dir/ &&
+test_expect_success 'moving to absent target with trailing slash' '
+ test_must_fail git mv path0/COPYING no-such-dir/ &&
test_must_fail git mv path0/COPYING no-such-dir// &&
git mv path0/ no-such-dir/ &&
- test_path_is_dir no-such-dir'
+ test_path_is_dir no-such-dir
+'
-test_expect_success \
- 'clean up' \
- 'git reset --hard'
+test_expect_success 'clean up' '
+ git reset --hard
+'
-test_expect_success \
- 'moving to existing untracked target with trailing slash' \
- 'mkdir path1 &&
+test_expect_success 'moving to existing untracked target with trailing slash' '
+ mkdir path1 &&
git mv path0/ path1/ &&
- test_path_is_dir path1/path0/'
+ test_path_is_dir path1/path0/
+'
-test_expect_success \
- 'moving to existing tracked target with trailing slash' \
- 'mkdir path2 &&
+test_expect_success 'moving to existing tracked target with trailing slash' '
+ mkdir path2 &&
>path2/file && git add path2/file &&
git mv path1/path0/ path2/ &&
- test_path_is_dir path2/path0/'
+ test_path_is_dir path2/path0/
+'
-test_expect_success \
- 'clean up' \
- 'git reset --hard'
+test_expect_success 'clean up' '
+ git reset --hard
+'
-test_expect_success \
- 'adding another file' \
- 'cp "$TEST_DIRECTORY"/../README.md path0/README &&
+test_expect_success 'adding another file' '
+ cp "$TEST_DIRECTORY"/../README.md path0/README &&
git add path0/README &&
- git commit -m add2 -a'
+ git commit -m add2 -a
+'
-test_expect_success \
- 'moving whole subdirectory' \
- 'git mv path0 path2'
+test_expect_success 'moving whole subdirectory' '
+ git mv path0 path2
+'
-test_expect_success \
- 'commiting the change' \
- 'git commit -m dir-move -a'
+test_expect_success 'commiting the change' '
+ git commit -m dir-move -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
- grep "^R100..*path0/README..*path2/README" actual'
+ grep "^R100..*path0/README..*path2/README" actual
+'
-test_expect_success \
- 'succeed when source is a prefix of destination' \
- 'git mv path2/COPYING path2/COPYING-renamed'
+test_expect_success 'succeed when source is a prefix of destination' '
+ git mv path2/COPYING path2/COPYING-renamed
+'
-test_expect_success \
- 'moving whole subdirectory into subdirectory' \
- 'git mv path2 path1'
+test_expect_success 'moving whole subdirectory into subdirectory' '
+ git mv path2 path1
+'
-test_expect_success \
- 'commiting the change' \
- 'git commit -m dir-move -a'
+test_expect_success 'commiting the change' '
+ git commit -m dir-move -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
- grep "^R100..*path2/README..*path1/path2/README" actual'
+ grep "^R100..*path2/README..*path1/path2/README" actual
+'
-test_expect_success \
- 'do not move directory over existing directory' \
- 'mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0'
+test_expect_success 'do not move directory over existing directory' '
+ mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
+'
-test_expect_success \
- 'move into "."' \
- 'git mv path1/path2/ .'
+test_expect_success 'move into "."' '
+ git mv path1/path2/ .
+'
test_expect_success "Michael Cassar's test case" '
rm -fr .git papers partA &&
--
2.25.1
^ permalink raw reply related [relevance 13%]
* [PATCH 02/11] t7001: use TAB instead of spaces
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
2020-09-25 17:02 13% ` [PATCH 01/11] t7001: convert tests from the old style to the current style shubham verma
@ 2020-09-25 17:02 13% ` shubham verma
2020-09-25 17:44 11% ` Eric Sunshine
2020-09-25 17:02 17% ` [PATCH 03/11] t7001: remove unnecessary blank lines shubham verma
` (9 subsequent siblings)
11 siblings, 1 reply; 200+ results
From: shubham verma @ 2020-09-25 17:02 UTC (permalink / raw)
To: git; +Cc: Shubham Verma
From: Shubham Verma <shubhunic@gmail.com>
Change indentation style from spaces to TAB.
Signed-off-by: shubham verma <shubhunic@gmail.com>
---
t/t7001-mv.sh | 120 +++++++++++++++++++++++++-------------------------
1 file changed, 60 insertions(+), 60 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 4bbb51e578..7503233814 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -4,72 +4,72 @@ test_description='git mv in subdirs'
. ./test-lib.sh
test_expect_success 'prepare reference tree' '
- mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
- git add path0/COPYING &&
- git commit -m add -a
+ mkdir path0 path1 &&
+ cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ git add path0/COPYING &&
+ git commit -m add -a
'
test_expect_success 'moving the file out of subdirectory' '
- cd path0 && git mv COPYING ../path1/COPYING
+ cd path0 && git mv COPYING ../path1/COPYING
'
# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-out -a
+ cd .. && git commit -m move-out -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path1/COPYING" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path1/COPYING" actual
'
test_expect_success 'moving the file back into subdirectory' '
- cd path0 && git mv ../path1/COPYING COPYING
+ cd path0 && git mv ../path1/COPYING COPYING
'
# in path0 currently
test_expect_success 'commiting the change' '
- cd .. && git commit -m move-in -a
+ cd .. && git commit -m move-in -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path1/COPYING..*path0/COPYING" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path1/COPYING..*path0/COPYING" actual
'
test_expect_success 'mv --dry-run does not move file' '
- git mv -n path0/COPYING MOVED &&
- test -f path0/COPYING &&
- test ! -f MOVED
+ git mv -n path0/COPYING MOVED &&
+ test -f path0/COPYING &&
+ test ! -f MOVED
'
test_expect_success 'checking -k on non-existing file' '
- git mv -k idontexist path0
+ git mv -k idontexist path0
'
test_expect_success 'checking -k on untracked file' '
- touch untracked1 &&
- git mv -k untracked1 path0 &&
- test -f untracked1 &&
- test ! -f path0/untracked1
+ touch untracked1 &&
+ git mv -k untracked1 path0 &&
+ test -f untracked1 &&
+ test ! -f path0/untracked1
'
test_expect_success 'checking -k on multiple untracked files' '
- touch untracked2 &&
- git mv -k untracked1 untracked2 path0 &&
- test -f untracked1 &&
- test -f untracked2 &&
- test ! -f path0/untracked1 &&
- test ! -f path0/untracked2
+ touch untracked2 &&
+ git mv -k untracked1 untracked2 path0 &&
+ test -f untracked1 &&
+ test -f untracked2 &&
+ test ! -f path0/untracked1 &&
+ test ! -f path0/untracked2
'
test_expect_success 'checking -f on untracked file with existing target' '
- touch path0/untracked1 &&
- test_must_fail git mv -f untracked1 path0 &&
- test ! -f .git/index.lock &&
- test -f untracked1 &&
- test -f path0/untracked1
+ touch path0/untracked1 &&
+ test_must_fail git mv -f untracked1 path0 &&
+ test ! -f .git/index.lock &&
+ test -f untracked1 &&
+ test -f path0/untracked1
'
# clean up the mess in case bad things happen
@@ -79,77 +79,77 @@ rm -f idontexist untracked1 untracked2 \
rmdir path1
test_expect_success 'moving to absent target with trailing slash' '
- test_must_fail git mv path0/COPYING no-such-dir/ &&
- test_must_fail git mv path0/COPYING no-such-dir// &&
- git mv path0/ no-such-dir/ &&
- test_path_is_dir no-such-dir
+ test_must_fail git mv path0/COPYING no-such-dir/ &&
+ test_must_fail git mv path0/COPYING no-such-dir// &&
+ git mv path0/ no-such-dir/ &&
+ test_path_is_dir no-such-dir
'
test_expect_success 'clean up' '
- git reset --hard
+ git reset --hard
'
test_expect_success 'moving to existing untracked target with trailing slash' '
- mkdir path1 &&
- git mv path0/ path1/ &&
- test_path_is_dir path1/path0/
+ mkdir path1 &&
+ git mv path0/ path1/ &&
+ test_path_is_dir path1/path0/
'
test_expect_success 'moving to existing tracked target with trailing slash' '
- mkdir path2 &&
- >path2/file && git add path2/file &&
- git mv path1/path0/ path2/ &&
- test_path_is_dir path2/path0/
+ mkdir path2 &&
+ >path2/file && git add path2/file &&
+ git mv path1/path0/ path2/ &&
+ test_path_is_dir path2/path0/
'
test_expect_success 'clean up' '
- git reset --hard
+ git reset --hard
'
test_expect_success 'adding another file' '
- cp "$TEST_DIRECTORY"/../README.md path0/README &&
- git add path0/README &&
- git commit -m add2 -a
+ cp "$TEST_DIRECTORY"/../README.md path0/README &&
+ git add path0/README &&
+ git commit -m add2 -a
'
test_expect_success 'moving whole subdirectory' '
- git mv path0 path2
+ git mv path0 path2
'
test_expect_success 'commiting the change' '
- git commit -m dir-move -a
+ git commit -m dir-move -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
- grep "^R100..*path0/README..*path2/README" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
+ grep "^R100..*path0/README..*path2/README" actual
'
test_expect_success 'succeed when source is a prefix of destination' '
- git mv path2/COPYING path2/COPYING-renamed
+ git mv path2/COPYING path2/COPYING-renamed
'
test_expect_success 'moving whole subdirectory into subdirectory' '
- git mv path2 path1
+ git mv path2 path1
'
test_expect_success 'commiting the change' '
- git commit -m dir-move -a
+ git commit -m dir-move -a
'
test_expect_success 'checking the commit' '
- git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
- grep "^R100..*path2/README..*path1/path2/README" actual
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
+ grep "^R100..*path2/README..*path1/path2/README" actual
'
test_expect_success 'do not move directory over existing directory' '
- mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
+ mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
'
test_expect_success 'move into "."' '
- git mv path1/path2/ .
+ git mv path1/path2/ .
'
test_expect_success "Michael Cassar's test case" '
--
2.25.1
^ permalink raw reply related [relevance 13%]
* Re: Git in Outreachy?
@ 2020-09-16 6:42 5% ` Christian Couder
0 siblings, 0 replies; 200+ results
From: Christian Couder @ 2020-09-16 6:42 UTC (permalink / raw)
To: Jeff King; +Cc: git, Christian Couder, Johannes Schindelin
On Mon, Aug 31, 2020 at 8:55 AM Christian Couder
<christian.couder@gmail.com> wrote:
>
> On Fri, Aug 28, 2020 at 8:56 AM Jeff King <peff@peff.net> wrote:
> > - updates to our applicant materials (proposed projects, but also
> > microproject / patch suggestions)
>
> It looks like many micro-project ideas from GSoC 2020 are still valid,
> and I have a few new ones, so I am ok to create a micro-project page.
Here is a new page with micro-project ideas for Outreachy applicants:
https://git.github.io/Outreachy-21-Microprojects/
I added only one new idea about modernizing test scripts, though I
know someone is already working on modernizing t7001. But I think it
can be applied to other test scripts.
While at it I also removed the GSoC 2020 material from the home page
and made a few cosmetic changes related to historical materials.
^ permalink raw reply [relevance 5%]
* [PATCH v2 1/2] t: don't spuriously close and reopen quotes
2020-08-06 20:08 3% ` [PATCH v2 0/2] t: don't spuriously close and reopen quotes Martin Ågren
@ 2020-08-06 20:08 6% ` Martin Ågren
0 siblings, 0 replies; 200+ results
From: Martin Ågren @ 2020-08-06 20:08 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Eric Sunshine, Chris Torek
In the test scripts, the recommended style is, e.g.:
test_expect_success 'name' '
do-something somehow &&
do-some-more testing
'
When using this style, any single quote in the multi-line test section
is actually closing the lone single quotes that surround it.
It can be a non-issue in practice:
test_expect_success 'sed a little' '
sed -e 's/hi/lo/' in >out # "ok": no whitespace in s/hi/lo/
'
Or it can be a bug in the test, e.g., because variable interpolation
happens before the test even begins executing:
v=abc
test_expect_success 'variable interpolation' '
v=def &&
echo '"$v"' # abc
'
Change several such in-test single quotes to use double quotes instead
or, in a few cases, drop them altogether. These were identified using
some crude grepping. We're not fixing any test bugs here, but we're
hopefully making these tests slightly easier to grok and to maintain.
There are legitimate use cases for closing a quote and opening a new
one, e.g., both '\'' and '"'"' can be used to produce a literal single
quote. I'm not touching any of those here.
In t9401, tuck the redirecting ">" to the filename while we're touching
those lines.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
t/t1400-update-ref.sh | 2 +-
t/t3501-revert-cherry-pick.sh | 4 ++--
t/t3507-cherry-pick-conflict.sh | 4 ++--
t/t4005-diff-rename-2.sh | 4 ++--
t/t4034-diff-words.sh | 2 +-
t/t4150-am.sh | 8 ++++----
t/t4200-rerere.sh | 2 +-
t/t5302-pack-index.sh | 2 +-
t/t5510-fetch.sh | 4 ++--
t/t5553-set-upstream.sh | 6 +++---
t/t6026-merge-attr.sh | 4 ++--
t/t7001-mv.sh | 2 +-
t/t7600-merge.sh | 6 +++---
t/t9001-send-email.sh | 10 +++++-----
t/t9100-git-svn-basic.sh | 6 +++---
t/t9401-git-cvsserver-crlf.sh | 8 ++++----
t/t9402-git-cvsserver-refs.sh | 2 +-
17 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 27171f8261..d0d36750bc 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -324,7 +324,7 @@ test_expect_success "create $m (logged by config)" '
test_expect_success "update $m (logged by config)" '
test_config core.logAllRefUpdates true &&
GIT_COMMITTER_DATE="2005-05-26 23:33" \
- git update-ref HEAD'" $B $A "'-m "Switch" &&
+ git update-ref HEAD $B $A -m "Switch" &&
test $B = $(git show-ref -s --verify $m)
'
test_expect_success "set $m (logged by config)" '
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 7c1da21df1..3669dfb1be 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -47,7 +47,7 @@ test_expect_success 'cherry-pick --nonsense' '
git diff --exit-code HEAD &&
test_must_fail git cherry-pick --nonsense 2>msg &&
git diff --exit-code HEAD "$pos" &&
- test_i18ngrep '[Uu]sage:' msg
+ test_i18ngrep "[Uu]sage:" msg
'
test_expect_success 'revert --nonsense' '
@@ -56,7 +56,7 @@ test_expect_success 'revert --nonsense' '
git diff --exit-code HEAD &&
test_must_fail git revert --nonsense 2>msg &&
git diff --exit-code HEAD "$pos" &&
- test_i18ngrep '[Uu]sage:' msg
+ test_i18ngrep "[Uu]sage:" msg
'
test_expect_success 'cherry-pick after renaming branch' '
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 752bc43487..f107622a9e 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -512,7 +512,7 @@ test_expect_success 'commit after failed cherry-pick adds -s at the right place'
Signed-off-by: C O Mitter <committer@example.com>
# Conflicts:
EOF
- grep -e "^# Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual &&
+ grep -e "^# Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual &&
test_cmp expect actual &&
cat <<-\EOF >expected &&
@@ -541,7 +541,7 @@ test_expect_success 'commit --amend -s places the sign-off at the right place' '
Signed-off-by: C O Mitter <committer@example.com>
Conflicts:
EOF
- grep -e "^Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual &&
+ grep -e "^Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual &&
test_cmp expect actual
'
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
index f542d2929d..d18a80493c 100755
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh
@@ -14,8 +14,8 @@ test_expect_success 'setup reference tree' '
git update-index --add COPYING rezrov &&
tree=$(git write-tree) &&
echo $tree &&
- sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 &&
- sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 &&
+ sed -e "s/HOWEVER/However/" <COPYING >COPYING.1 &&
+ sed -e "s/GPL/G.P.L/g" <COPYING >COPYING.2 &&
origoid=$(git hash-object COPYING) &&
oid1=$(git hash-object COPYING.1) &&
oid2=$(git hash-object COPYING.2)
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index fb145aa173..0c8fb39ced 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -102,7 +102,7 @@ test_expect_success 'word diff with runs of whitespace' '
'
test_expect_success '--word-diff=porcelain' '
- sed 's/#.*$//' >expect <<-EOF &&
+ sed "s/#.*$//" >expect <<-EOF &&
diff --git a/pre b/post
index $pre..$post 100644
--- a/pre
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index bda4586a79..855ed11b32 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -989,7 +989,7 @@ test_expect_success 'am -s unexpected trailer block' '
Signed-off-by: J C H <j@c.h>
EOF
git commit -F msg &&
- git cat-file commit HEAD | sed -e '1,/^$/d' >original &&
+ git cat-file commit HEAD | sed -e "1,/^$/d" >original &&
git format-patch --stdout -1 >patch &&
git reset --hard HEAD^ &&
@@ -998,7 +998,7 @@ test_expect_success 'am -s unexpected trailer block' '
cat original &&
echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
) >expect &&
- git cat-file commit HEAD | sed -e '1,/^$/d' >actual &&
+ git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
test_cmp expect actual &&
cat >msg <<-\EOF &&
@@ -1009,7 +1009,7 @@ test_expect_success 'am -s unexpected trailer block' '
EOF
git reset HEAD^ &&
git commit -F msg file &&
- git cat-file commit HEAD | sed -e '1,/^$/d' >original &&
+ git cat-file commit HEAD | sed -e "1,/^$/d" >original &&
git format-patch --stdout -1 >patch &&
git reset --hard HEAD^ &&
@@ -1020,7 +1020,7 @@ test_expect_success 'am -s unexpected trailer block' '
echo &&
echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
) >expect &&
- git cat-file commit HEAD | sed -e '1,/^$/d' >actual &&
+ git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
test_cmp expect actual
'
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 831d424c47..f99385c191 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -364,7 +364,7 @@ test_expect_success 'set up an unresolved merge' '
git reset --hard &&
git checkout version2 &&
fifth=$(git rev-parse fifth) &&
- echo "$fifth branch 'fifth' of ." |
+ echo "$fifth branch fifth of ." |
git fmt-merge-msg >msg &&
ancestor=$(git merge-base version2 fifth) &&
test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index 8981c9b90e..d1a6a3c37a 100755
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -15,7 +15,7 @@ test_expect_success 'setup' '
i=1 &&
while test $i -le 100
do
- iii=$(printf '%03i' $i)
+ iii=$(printf "%03i" $i)
test-tool genrandom "bar" 200 > wide_delta_$iii &&
test-tool genrandom "baz $iii" 50 >> wide_delta_$iii &&
test-tool genrandom "foo"$i 100 > deep_delta_$iii &&
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index a66dbe0bde..6cb954e2f0 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -213,7 +213,7 @@ test_expect_success 'fetch tags when there is no tags' '
test_expect_success 'fetch following tags' '
cd "$D" &&
- git tag -a -m 'annotated' anno HEAD &&
+ git tag -a -m "annotated" anno HEAD &&
git tag light HEAD &&
mkdir four &&
@@ -331,7 +331,7 @@ test_expect_success 'bundle does not prerequisite objects' '
test_expect_success 'bundle should be able to create a full history' '
cd "$D" &&
- git tag -a -m '1.0' v1.0 master &&
+ git tag -a -m "1.0" v1.0 master &&
git bundle create bundle4 v1.0
'
diff --git a/t/t5553-set-upstream.sh b/t/t5553-set-upstream.sh
index 81975ad8f9..7622981cbf 100755
--- a/t/t5553-set-upstream.sh
+++ b/t/t5553-set-upstream.sh
@@ -81,7 +81,7 @@ test_expect_success 'fetch --set-upstream http://nosuchdomain.example.com fails
test_expect_success 'fetch --set-upstream with valid URL sets upstream to URL' '
clear_config other other2 &&
- url="file://'"$PWD"'" &&
+ url="file://$PWD" &&
git fetch --set-upstream "$url" &&
check_config master "$url" HEAD &&
check_config_missing other &&
@@ -158,7 +158,7 @@ test_expect_success 'pull --set-upstream upstream with more than one branch does
test_expect_success 'pull --set-upstream with valid URL sets upstream to URL' '
clear_config master other other2 &&
git checkout master &&
- url="file://'"$PWD"'" &&
+ url="file://$PWD" &&
git pull --set-upstream "$url" &&
check_config master "$url" HEAD &&
check_config_missing other &&
@@ -168,7 +168,7 @@ test_expect_success 'pull --set-upstream with valid URL sets upstream to URL' '
test_expect_success 'pull --set-upstream with valid URL and branch sets branch' '
clear_config master other other2 &&
git checkout master &&
- url="file://'"$PWD"'" &&
+ url="file://$PWD" &&
git pull --set-upstream "$url" master &&
check_config master "$url" refs/heads/master &&
check_config_missing other &&
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index 5900358ce9..76a55f838c 100755
--- a/t/t6026-merge-attr.sh
+++ b/t/t6026-merge-attr.sh
@@ -122,7 +122,7 @@ test_expect_success 'custom merge backend' '
o=$(git unpack-file master^:text) &&
a=$(git unpack-file side^:text) &&
b=$(git unpack-file master:text) &&
- sh -c "./custom-merge $o $a $b 0 'text'" &&
+ sh -c "./custom-merge $o $a $b 0 text" &&
sed -e 1,3d $a >check-2 &&
cmp check-1 check-2 &&
rm -f $o $a $b
@@ -149,7 +149,7 @@ test_expect_success 'custom merge backend' '
o=$(git unpack-file master^:text) &&
a=$(git unpack-file anchor:text) &&
b=$(git unpack-file master:text) &&
- sh -c "./custom-merge $o $a $b 0 'text'" &&
+ sh -c "./custom-merge $o $a $b 0 text" &&
sed -e 1,3d $a >check-2 &&
cmp check-1 check-2 &&
sed -e 1,3d -e 4q $a >check-3 &&
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 36b50d0b4c..b64b736d2f 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -177,7 +177,7 @@ test_expect_success "Sergey Vlasov's test case" '
date >ab.c &&
date >ab/d &&
git add ab.c ab &&
- git commit -m 'initial' &&
+ git commit -m "initial" &&
git mv ab a
'
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 1d45f9a4ed..dffcf053db 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -246,7 +246,7 @@ test_expect_success 'merge --squash c3 with c7' '
# file
EOF
git cat-file commit HEAD >raw &&
- sed -e '1,/^$/d' raw >actual &&
+ sed -e "1,/^$/d" raw >actual &&
test_cmp expect actual
'
@@ -268,7 +268,7 @@ test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
# file
EOF
git cat-file commit HEAD >raw &&
- sed -e '1,/^$/d' raw >actual &&
+ sed -e "1,/^$/d" raw >actual &&
test_i18ncmp expect actual
'
@@ -292,7 +292,7 @@ test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' '
# file
EOF
git cat-file commit HEAD >raw &&
- sed -e '1,/^$/d' raw >actual &&
+ sed -e "1,/^$/d" raw >actual &&
test_i18ncmp expect actual
'
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index ec261085ec..3d68570450 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1551,7 +1551,7 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=quoted-printab
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
+ sed "1,/^$/d" msgtxt1 >actual &&
test_cmp expected actual
'
@@ -1568,7 +1568,7 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=base64' '
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
+ sed "1,/^$/d" msgtxt1 >actual &&
test_cmp expected actual
'
@@ -1594,7 +1594,7 @@ test_expect_success $PREREQ 'convert from quoted-printable to base64' '
--smtp-server="$(pwd)/fake.sendmail" \
email-using-qp \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
+ sed "1,/^$/d" msgtxt1 >actual &&
test_cmp expected actual
'
@@ -1624,7 +1624,7 @@ test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=quoted-printabl
--smtp-server="$(pwd)/fake.sendmail" \
email-using-crlf \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
+ sed "1,/^$/d" msgtxt1 >actual &&
test_cmp expected actual
'
@@ -1641,7 +1641,7 @@ test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=base64' '
--smtp-server="$(pwd)/fake.sendmail" \
email-using-crlf \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
+ sed "1,/^$/d" msgtxt1 >actual &&
test_cmp expected actual
'
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 9f2d19ecc4..e9c575c359 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -63,16 +63,16 @@ test_expect_success "$name" '
name='detect node change from file to directory #1'
-test_expect_success "$name" "
+test_expect_success "$name" '
mkdir dir/new_file &&
mv dir/file dir/new_file/file &&
mv dir/new_file dir/file &&
git update-index --remove dir/file &&
git update-index --add dir/file/file &&
- git commit -m '$name' &&
+ git commit -m "$name" &&
test_must_fail git svn set-tree --find-copies-harder --rmdir \
remotes/git-svn..mybranch
-"
+'
name='detect node change from directory to file #1'
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index 84787eee9a..c7a0dd84a4 100755
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -167,10 +167,10 @@ test_expect_success 'adding files' '
test_expect_success 'updating' '
git pull gitcvs.git &&
- echo 'hi' > subdir/newfile.bin &&
- echo 'junk' > subdir/file.h &&
- echo 'hi' > subdir/newfile.c &&
- echo 'hello' >> binfile.bin &&
+ echo "hi" >subdir/newfile.bin &&
+ echo "junk" >subdir/file.h &&
+ echo "hi" >subdir/newfile.c &&
+ echo "hello" >>binfile.bin &&
git add subdir/newfile.bin subdir/file.h subdir/newfile.c binfile.bin &&
git commit -q -m "Add and change some files" &&
git push gitcvs.git >/dev/null &&
diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh
index cf31ace667..6436c91a3c 100755
--- a/t/t9402-git-cvsserver-refs.sh
+++ b/t/t9402-git-cvsserver-refs.sh
@@ -178,7 +178,7 @@ test_expect_success 'setup v1.2 on b1' '
mkdir cdir &&
echo "cdir/cfile" >cdir/cfile &&
git add -A cdir adir t3 t2 &&
- git commit -q -m 'v1.2' &&
+ git commit -q -m "v1.2" &&
git tag v1.2 &&
git push --tags gitcvs.git b1:b1
'
--
2.28.0.199.g4234a9100e
^ permalink raw reply related [relevance 6%]
* [PATCH v2 0/2] t: don't spuriously close and reopen quotes
2020-08-02 14:30 5% ` Martin Ågren
2020-08-02 17:22 0% ` Eric Sunshine
@ 2020-08-06 20:08 3% ` Martin Ågren
2020-08-06 20:08 6% ` [PATCH v2 1/2] " Martin Ågren
1 sibling, 1 reply; 200+ results
From: Martin Ågren @ 2020-08-06 20:08 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Eric Sunshine, Chris Torek
This is an updated version of the patch I posted inline in [1]. I've
tweaked the end result a bit and pulled out the modifications to t4104
to their own patch. t4104 is also where most of the interdiff is spent.
I've updated the commit message of the main patch based on the
discussion in the earlier thread.
[1] https://lore.kernel.org/git/20200802143018.5501-1-martin.agren@gmail.com/
Martin Ågren (2):
t: don't spuriously close and reopen quotes
t4104: modernize and simplify quoting
t/t1400-update-ref.sh | 2 +-
t/t3501-revert-cherry-pick.sh | 4 +--
t/t3507-cherry-pick-conflict.sh | 4 +--
t/t4005-diff-rename-2.sh | 4 +--
t/t4034-diff-words.sh | 2 +-
t/t4104-apply-boundary.sh | 57 +++++++++------------------------
t/t4150-am.sh | 8 ++---
t/t4200-rerere.sh | 2 +-
t/t5302-pack-index.sh | 2 +-
t/t5510-fetch.sh | 4 +--
t/t5553-set-upstream.sh | 6 ++--
t/t6026-merge-attr.sh | 4 +--
t/t7001-mv.sh | 2 +-
t/t7600-merge.sh | 6 ++--
t/t9001-send-email.sh | 10 +++---
t/t9100-git-svn-basic.sh | 6 ++--
t/t9401-git-cvsserver-crlf.sh | 8 ++---
t/t9402-git-cvsserver-refs.sh | 2 +-
18 files changed, 53 insertions(+), 80 deletions(-)
Interdiff against v1:
diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh
index 19f08d9ccd..71ef4132d1 100755
--- a/t/t4104-apply-boundary.sh
+++ b/t/t4104-apply-boundary.sh
@@ -3,80 +3,55 @@
# Copyright (c) 2005 Junio C Hamano
#
-test_description='git apply boundary tests
+test_description='git apply boundary tests'
-'
. ./test-lib.sh
L="c d e f g h i j k l m n o p q r s t u v w x"
test_expect_success setup '
- for i in b $L y
- do
- echo $i
- done >victim &&
+ test_write_lines b $L y >victim &&
cat victim >original &&
git update-index --add victim &&
# add to the head
- for i in a b $L y
- do
- echo $i
- done >victim &&
+ test_write_lines a b $L y >victim &&
cat victim >add-a-expect &&
git diff victim >add-a-patch.with &&
git diff --unified=0 >add-a-patch.without &&
# insert at line two
- for i in b a $L y
- do
- echo $i
- done >victim &&
+ test_write_lines b a $L y >victim &&
cat victim >insert-a-expect &&
git diff victim >insert-a-patch.with &&
git diff --unified=0 >insert-a-patch.without &&
# modify at the head
- for i in a $L y
- do
- echo $i
- done >victim &&
+ test_write_lines a $L y >victim &&
cat victim >mod-a-expect &&
git diff victim >mod-a-patch.with &&
git diff --unified=0 >mod-a-patch.without &&
# remove from the head
- for i in $L y
- do
- echo $i
- done >victim &&
+ test_write_lines $L y >victim &&
cat victim >del-a-expect &&
git diff victim >del-a-patch.with &&
git diff --unified=0 >del-a-patch.without &&
# add to the tail
- for i in b $L y z
- do
- echo $i
- done >victim &&
+ test_write_lines b $L y z >victim &&
cat victim >add-z-expect &&
git diff victim >add-z-patch.with &&
git diff --unified=0 >add-z-patch.without &&
# modify at the tail
- for i in b $L z
- do
- echo $i
- done >victim &&
+ test_write_lines b $L z >victim &&
cat victim >mod-z-expect &&
git diff victim >mod-z-patch.with &&
git diff --unified=0 >mod-z-patch.without &&
# remove from the tail
- for i in b $L
- do
- echo $i
- done >victim &&
+ test_write_lines b $L >victim &&
cat victim >del-z-expect &&
git diff victim >del-z-patch.with &&
git diff --unified=0 >del-z-patch.without
@@ -88,15 +63,15 @@ for with in with without
do
case "$with" in
with) u= ;;
- without) u='--unidiff-zero ' ;;
+ without) u=--unidiff-zero ;;
esac
for kind in add-a add-z insert-a mod-a mod-z del-a del-z
do
test_expect_success "apply $kind-patch $with context" '
cat original >victim &&
git update-index victim &&
- git apply --index $u$kind-patch.$with &&
- test_cmp $kind-expect victim
+ git apply --index $u "$kind-patch.$with" &&
+ test_cmp "$kind-expect" victim
'
done
done
@@ -110,13 +85,12 @@ do
test_expect_success "apply non-git $kind-patch without context" '
cat original >victim &&
git update-index victim &&
- git apply --unidiff-zero --index $kind-ng.without &&
- test_cmp $kind-expect victim
+ git apply --unidiff-zero --index "$kind-ng.without" &&
+ test_cmp "$kind-expect" victim
'
done
test_expect_success 'two lines' '
-
>file &&
git add file &&
echo aaa >file &&
@@ -125,11 +99,10 @@ test_expect_success 'two lines' '
echo bbb >file &&
git add file &&
test_must_fail git apply --check patch
-
'
test_expect_success 'apply patch with 3 context lines matching at end' '
- { echo a; echo b; echo c; echo d; } >file &&
+ test_write_lines a b c d >file &&
git add file &&
echo e >>file &&
git diff >patch &&
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 1f9d13819f..e9c575c359 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -63,7 +63,7 @@ test_expect_success "$name" '
name='detect node change from file to directory #1'
-test_expect_success "$name" "
+test_expect_success "$name" '
mkdir dir/new_file &&
mv dir/file dir/new_file/file &&
mv dir/new_file dir/file &&
@@ -72,7 +72,7 @@ test_expect_success "$name" "
git commit -m "$name" &&
test_must_fail git svn set-tree --find-copies-harder --rmdir \
remotes/git-svn..mybranch
-"
+'
name='detect node change from directory to file #1'
--
2.28.0.199.g4234a9100e
^ permalink raw reply related [relevance 3%]
* Re: [PATCH] t1450: fix quoting of NUL byte when corrupting pack
2020-08-02 14:30 5% ` Martin Ågren
@ 2020-08-02 17:22 0% ` Eric Sunshine
2020-08-06 20:08 3% ` [PATCH v2 0/2] t: don't spuriously close and reopen quotes Martin Ågren
1 sibling, 0 replies; 200+ results
From: Eric Sunshine @ 2020-08-02 17:22 UTC (permalink / raw)
To: Martin Ågren; +Cc: Junio C Hamano, Git List, Jonathan Tan
On Sun, Aug 2, 2020 at 10:30 AM Martin Ågren <martin.agren@gmail.com> wrote:
> Subject: [PATCH] t: don't spuriously close & open quotes
> [...]
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>
> ---
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> @@ -177,7 +177,7 @@ test_expect_success "Sergey Vlasov's test case" '
> git add ab.c ab &&
> - git commit -m 'initial' &&
> + git commit -m "initial" &&
> git mv ab a
> '
This was discovered[1] independently a couple weeks ago; glad to see
it was picked up by your grep'ing, as well.
[1]: https://lore.kernel.org/git/CAPig+cQpUu2UO-+jWn1nTaDykWnxwuEitzVB7PnW2SS_b7V8Hg@mail.gmail.com/
^ permalink raw reply [relevance 0%]
* Re: [PATCH] t1450: fix quoting of NUL byte when corrupting pack
@ 2020-08-02 14:30 5% ` Martin Ågren
2020-08-02 17:22 0% ` Eric Sunshine
2020-08-06 20:08 3% ` [PATCH v2 0/2] t: don't spuriously close and reopen quotes Martin Ågren
0 siblings, 2 replies; 200+ results
From: Martin Ågren @ 2020-08-02 14:30 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Jonathan Tan
On Sun, 2 Aug 2020 at 02:45, Junio C Hamano <gitster@pobox.com> wrote:
>
> I wonder if it is an easy way to find similar problems without too
> much hand-parsing of the test scripts. Inside a modern test_expect_*
> that begins and ends the test body with a single quote, any line
> that has a single quote that is not quoted could be suspect, but
> that would probably give us too many false positive.
I did some very crude hand-parsing and identified a few spots that
looked needlessly complicated and where I could change or drop the
quoting so that the code we see is the code we also execute. Patch
below.
Some of those sites made me go "what is actually going on here?" which
would be an argument for simplifying them. Others are more "maybe we
should avoid those quote marks, but the test is obviously correct
anyway".
So I didn't spot any other bugs (like the 0x30/NUL thing in my original
patch), which is good, but also makes me not very motivated to invest in
more advanced parsing.
Martin
-- >8 --
Subject: [PATCH] t: don't spuriously close & open quotes
If we write something like
test_expect_success 'sed a little' '
sed -e 's/hi/lo/' in >out
'
the human readers do not see what the shell eventually sees:
sed -e s/hi/lo/ in >out
In this example, this makes no real difference. But this can be confusing
and can make the reader wonder whether we actually rely on that whole
"close the quote, do some stuff, then start quoting again" and what is
actually going on. It could potentially also be a bug in the test.
Change several such single quotes to use double quotes instead or, in a
few cases, drop them altogether. These were identified using some crude
grepping. We're not fixing any test bugs here, but we're hopefully
making these tests slightly easier to grok and to maintain.
(There are legitimate use cases for closing a quote and opening a new
one, e.g., both '\'' and '"'"' can be used to produce a literal single
quote. I'm not touching any of those here.)
In t9401, tuck the redirecting ">" to the filename while we're touching
those lines.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
t/t1400-update-ref.sh | 2 +-
t/t3501-revert-cherry-pick.sh | 4 ++--
t/t3507-cherry-pick-conflict.sh | 4 ++--
t/t4005-diff-rename-2.sh | 4 ++--
t/t4034-diff-words.sh | 2 +-
t/t4104-apply-boundary.sh | 24 ++++++++++++------------
t/t4150-am.sh | 8 ++++----
t/t4200-rerere.sh | 2 +-
t/t5302-pack-index.sh | 2 +-
t/t5510-fetch.sh | 4 ++--
t/t5553-set-upstream.sh | 6 +++---
t/t6026-merge-attr.sh | 4 ++--
t/t7001-mv.sh | 2 +-
t/t7600-merge.sh | 6 +++---
t/t9001-send-email.sh | 10 +++++-----
t/t9100-git-svn-basic.sh | 2 +-
t/t9401-git-cvsserver-crlf.sh | 8 ++++----
t/t9402-git-cvsserver-refs.sh | 2 +-
18 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 27171f8261..d0d36750bc 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -324,7 +324,7 @@ test_expect_success "create $m (logged by config)" '
test_expect_success "update $m (logged by config)" '
test_config core.logAllRefUpdates true &&
GIT_COMMITTER_DATE="2005-05-26 23:33" \
- git update-ref HEAD'" $B $A "'-m "Switch" &&
+ git update-ref HEAD $B $A -m "Switch" &&
test $B = $(git show-ref -s --verify $m)
'
test_expect_success "set $m (logged by config)" '
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 7c1da21df1..3669dfb1be 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -47,7 +47,7 @@ test_expect_success 'cherry-pick --nonsense' '
git diff --exit-code HEAD &&
test_must_fail git cherry-pick --nonsense 2>msg &&
git diff --exit-code HEAD "$pos" &&
- test_i18ngrep '[Uu]sage:' msg
+ test_i18ngrep "[Uu]sage:" msg
'
test_expect_success 'revert --nonsense' '
@@ -56,7 +56,7 @@ test_expect_success 'revert --nonsense' '
git diff --exit-code HEAD &&
test_must_fail git revert --nonsense 2>msg &&
git diff --exit-code HEAD "$pos" &&
- test_i18ngrep '[Uu]sage:' msg
+ test_i18ngrep "[Uu]sage:" msg
'
test_expect_success 'cherry-pick after renaming branch' '
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 752bc43487..f107622a9e 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -512,7 +512,7 @@ test_expect_success 'commit after failed cherry-pick adds -s at the right place'
Signed-off-by: C O Mitter <committer@example.com>
# Conflicts:
EOF
- grep -e "^# Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual &&
+ grep -e "^# Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual &&
test_cmp expect actual &&
cat <<-\EOF >expected &&
@@ -541,7 +541,7 @@ test_expect_success 'commit --amend -s places the sign-off at the right place' '
Signed-off-by: C O Mitter <committer@example.com>
Conflicts:
EOF
- grep -e "^Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual &&
+ grep -e "^Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual &&
test_cmp expect actual
'
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
index f542d2929d..d18a80493c 100755
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh
@@ -14,8 +14,8 @@ test_expect_success 'setup reference tree' '
git update-index --add COPYING rezrov &&
tree=$(git write-tree) &&
echo $tree &&
- sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 &&
- sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 &&
+ sed -e "s/HOWEVER/However/" <COPYING >COPYING.1 &&
+ sed -e "s/GPL/G.P.L/g" <COPYING >COPYING.2 &&
origoid=$(git hash-object COPYING) &&
oid1=$(git hash-object COPYING.1) &&
oid2=$(git hash-object COPYING.2)
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index fb145aa173..0c8fb39ced 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -102,7 +102,7 @@ test_expect_success 'word diff with runs of whitespace' '
'
test_expect_success '--word-diff=porcelain' '
- sed 's/#.*$//' >expect <<-EOF &&
+ sed "s/#.*$//" >expect <<-EOF &&
diff --git a/pre b/post
index $pre..$post 100644
--- a/pre
diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh
index 32e3b0ee0b..19f08d9ccd 100755
--- a/t/t4104-apply-boundary.sh
+++ b/t/t4104-apply-boundary.sh
@@ -11,7 +11,7 @@ test_description='git apply boundary tests
L="c d e f g h i j k l m n o p q r s t u v w x"
test_expect_success setup '
- for i in b '"$L"' y
+ for i in b $L y
do
echo $i
done >victim &&
@@ -19,7 +19,7 @@ test_expect_success setup '
git update-index --add victim &&
# add to the head
- for i in a b '"$L"' y
+ for i in a b $L y
do
echo $i
done >victim &&
@@ -28,7 +28,7 @@ test_expect_success setup '
git diff --unified=0 >add-a-patch.without &&
# insert at line two
- for i in b a '"$L"' y
+ for i in b a $L y
do
echo $i
done >victim &&
@@ -37,7 +37,7 @@ test_expect_success setup '
git diff --unified=0 >insert-a-patch.without &&
# modify at the head
- for i in a '"$L"' y
+ for i in a $L y
do
echo $i
done >victim &&
@@ -46,7 +46,7 @@ test_expect_success setup '
git diff --unified=0 >mod-a-patch.without &&
# remove from the head
- for i in '"$L"' y
+ for i in $L y
do
echo $i
done >victim &&
@@ -55,7 +55,7 @@ test_expect_success setup '
git diff --unified=0 >del-a-patch.without &&
# add to the tail
- for i in b '"$L"' y z
+ for i in b $L y z
do
echo $i
done >victim &&
@@ -64,7 +64,7 @@ test_expect_success setup '
git diff --unified=0 >add-z-patch.without &&
# modify at the tail
- for i in b '"$L"' z
+ for i in b $L z
do
echo $i
done >victim &&
@@ -73,7 +73,7 @@ test_expect_success setup '
git diff --unified=0 >mod-z-patch.without &&
# remove from the tail
- for i in b '"$L"'
+ for i in b $L
do
echo $i
done >victim &&
@@ -95,8 +95,8 @@ do
test_expect_success "apply $kind-patch $with context" '
cat original >victim &&
git update-index victim &&
- git apply --index '"$u$kind-patch.$with"' &&
- test_cmp '"$kind"'-expect victim
+ git apply --index $u$kind-patch.$with &&
+ test_cmp $kind-expect victim
'
done
done
@@ -110,8 +110,8 @@ do
test_expect_success "apply non-git $kind-patch without context" '
cat original >victim &&
git update-index victim &&
- git apply --unidiff-zero --index '"$kind-ng.without"' &&
- test_cmp '"$kind"'-expect victim
+ git apply --unidiff-zero --index $kind-ng.without &&
+ test_cmp $kind-expect victim
'
done
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index bda4586a79..855ed11b32 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -989,7 +989,7 @@ test_expect_success 'am -s unexpected trailer block' '
Signed-off-by: J C H <j@c.h>
EOF
git commit -F msg &&
- git cat-file commit HEAD | sed -e '1,/^$/d' >original &&
+ git cat-file commit HEAD | sed -e "1,/^$/d" >original &&
git format-patch --stdout -1 >patch &&
git reset --hard HEAD^ &&
@@ -998,7 +998,7 @@ test_expect_success 'am -s unexpected trailer block' '
cat original &&
echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
) >expect &&
- git cat-file commit HEAD | sed -e '1,/^$/d' >actual &&
+ git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
test_cmp expect actual &&
cat >msg <<-\EOF &&
@@ -1009,7 +1009,7 @@ test_expect_success 'am -s unexpected trailer block' '
EOF
git reset HEAD^ &&
git commit -F msg file &&
- git cat-file commit HEAD | sed -e '1,/^$/d' >original &&
+ git cat-file commit HEAD | sed -e "1,/^$/d" >original &&
git format-patch --stdout -1 >patch &&
git reset --hard HEAD^ &&
@@ -1020,7 +1020,7 @@ test_expect_success 'am -s unexpected trailer block' '
echo &&
echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
) >expect &&
- git cat-file commit HEAD | sed -e '1,/^$/d' >actual &&
+ git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
test_cmp expect actual
'
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 831d424c47..f99385c191 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -364,7 +364,7 @@ test_expect_success 'set up an unresolved merge' '
git reset --hard &&
git checkout version2 &&
fifth=$(git rev-parse fifth) &&
- echo "$fifth branch 'fifth' of ." |
+ echo "$fifth branch fifth of ." |
git fmt-merge-msg >msg &&
ancestor=$(git merge-base version2 fifth) &&
test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index 8981c9b90e..d1a6a3c37a 100755
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -15,7 +15,7 @@ test_expect_success 'setup' '
i=1 &&
while test $i -le 100
do
- iii=$(printf '%03i' $i)
+ iii=$(printf "%03i" $i)
test-tool genrandom "bar" 200 > wide_delta_$iii &&
test-tool genrandom "baz $iii" 50 >> wide_delta_$iii &&
test-tool genrandom "foo"$i 100 > deep_delta_$iii &&
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 7456c567cd..6a6a760f5f 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -213,7 +213,7 @@ test_expect_success 'fetch tags when there is no tags' '
test_expect_success 'fetch following tags' '
cd "$D" &&
- git tag -a -m 'annotated' anno HEAD &&
+ git tag -a -m "annotated" anno HEAD &&
git tag light HEAD &&
mkdir four &&
@@ -331,7 +331,7 @@ test_expect_success 'bundle does not prerequisite objects' '
test_expect_success 'bundle should be able to create a full history' '
cd "$D" &&
- git tag -a -m '1.0' v1.0 master &&
+ git tag -a -m "1.0" v1.0 master &&
git bundle create bundle4 v1.0
'
diff --git a/t/t5553-set-upstream.sh b/t/t5553-set-upstream.sh
index 81975ad8f9..7622981cbf 100755
--- a/t/t5553-set-upstream.sh
+++ b/t/t5553-set-upstream.sh
@@ -81,7 +81,7 @@ test_expect_success 'fetch --set-upstream http://nosuchdomain.example.com fails
test_expect_success 'fetch --set-upstream with valid URL sets upstream to URL' '
clear_config other other2 &&
- url="file://'"$PWD"'" &&
+ url="file://$PWD" &&
git fetch --set-upstream "$url" &&
check_config master "$url" HEAD &&
check_config_missing other &&
@@ -158,7 +158,7 @@ test_expect_success 'pull --set-upstream upstream with more than one branch does
test_expect_success 'pull --set-upstream with valid URL sets upstream to URL' '
clear_config master other other2 &&
git checkout master &&
- url="file://'"$PWD"'" &&
+ url="file://$PWD" &&
git pull --set-upstream "$url" &&
check_config master "$url" HEAD &&
check_config_missing other &&
@@ -168,7 +168,7 @@ test_expect_success 'pull --set-upstream with valid URL sets upstream to URL' '
test_expect_success 'pull --set-upstream with valid URL and branch sets branch' '
clear_config master other other2 &&
git checkout master &&
- url="file://'"$PWD"'" &&
+ url="file://$PWD" &&
git pull --set-upstream "$url" master &&
check_config master "$url" refs/heads/master &&
check_config_missing other &&
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index 5900358ce9..76a55f838c 100755
--- a/t/t6026-merge-attr.sh
+++ b/t/t6026-merge-attr.sh
@@ -122,7 +122,7 @@ test_expect_success 'custom merge backend' '
o=$(git unpack-file master^:text) &&
a=$(git unpack-file side^:text) &&
b=$(git unpack-file master:text) &&
- sh -c "./custom-merge $o $a $b 0 'text'" &&
+ sh -c "./custom-merge $o $a $b 0 text" &&
sed -e 1,3d $a >check-2 &&
cmp check-1 check-2 &&
rm -f $o $a $b
@@ -149,7 +149,7 @@ test_expect_success 'custom merge backend' '
o=$(git unpack-file master^:text) &&
a=$(git unpack-file anchor:text) &&
b=$(git unpack-file master:text) &&
- sh -c "./custom-merge $o $a $b 0 'text'" &&
+ sh -c "./custom-merge $o $a $b 0 text" &&
sed -e 1,3d $a >check-2 &&
cmp check-1 check-2 &&
sed -e 1,3d -e 4q $a >check-3 &&
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index c978b6dee4..63d5f41a12 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -177,7 +177,7 @@ test_expect_success "Sergey Vlasov's test case" '
date >ab.c &&
date >ab/d &&
git add ab.c ab &&
- git commit -m 'initial' &&
+ git commit -m "initial" &&
git mv ab a
'
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 1d45f9a4ed..dffcf053db 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -246,7 +246,7 @@ test_expect_success 'merge --squash c3 with c7' '
# file
EOF
git cat-file commit HEAD >raw &&
- sed -e '1,/^$/d' raw >actual &&
+ sed -e "1,/^$/d" raw >actual &&
test_cmp expect actual
'
@@ -268,7 +268,7 @@ test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
# file
EOF
git cat-file commit HEAD >raw &&
- sed -e '1,/^$/d' raw >actual &&
+ sed -e "1,/^$/d" raw >actual &&
test_i18ncmp expect actual
'
@@ -292,7 +292,7 @@ test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' '
# file
EOF
git cat-file commit HEAD >raw &&
- sed -e '1,/^$/d' raw >actual &&
+ sed -e "1,/^$/d" raw >actual &&
test_i18ncmp expect actual
'
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index ec261085ec..3d68570450 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1551,7 +1551,7 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=quoted-printab
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
+ sed "1,/^$/d" msgtxt1 >actual &&
test_cmp expected actual
'
@@ -1568,7 +1568,7 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=base64' '
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
+ sed "1,/^$/d" msgtxt1 >actual &&
test_cmp expected actual
'
@@ -1594,7 +1594,7 @@ test_expect_success $PREREQ 'convert from quoted-printable to base64' '
--smtp-server="$(pwd)/fake.sendmail" \
email-using-qp \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
+ sed "1,/^$/d" msgtxt1 >actual &&
test_cmp expected actual
'
@@ -1624,7 +1624,7 @@ test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=quoted-printabl
--smtp-server="$(pwd)/fake.sendmail" \
email-using-crlf \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
+ sed "1,/^$/d" msgtxt1 >actual &&
test_cmp expected actual
'
@@ -1641,7 +1641,7 @@ test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=base64' '
--smtp-server="$(pwd)/fake.sendmail" \
email-using-crlf \
2>errors >out &&
- sed '1,/^$/d' msgtxt1 >actual &&
+ sed "1,/^$/d" msgtxt1 >actual &&
test_cmp expected actual
'
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 3055943a22..30172664ac 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -69,7 +69,7 @@ test_expect_success "$name" "
mv dir/new_file dir/file &&
git update-index --remove dir/file &&
git update-index --add dir/file/file &&
- git commit -m '$name' &&
+ git commit -m "$name" &&
test_must_fail git svn set-tree --find-copies-harder --rmdir \
remotes/git-svn..mybranch
"
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index 84787eee9a..c7a0dd84a4 100755
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -167,10 +167,10 @@ test_expect_success 'adding files' '
test_expect_success 'updating' '
git pull gitcvs.git &&
- echo 'hi' > subdir/newfile.bin &&
- echo 'junk' > subdir/file.h &&
- echo 'hi' > subdir/newfile.c &&
- echo 'hello' >> binfile.bin &&
+ echo "hi" >subdir/newfile.bin &&
+ echo "junk" >subdir/file.h &&
+ echo "hi" >subdir/newfile.c &&
+ echo "hello" >>binfile.bin &&
git add subdir/newfile.bin subdir/file.h subdir/newfile.c binfile.bin &&
git commit -q -m "Add and change some files" &&
git push gitcvs.git >/dev/null &&
diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh
index cf31ace667..6436c91a3c 100755
--- a/t/t9402-git-cvsserver-refs.sh
+++ b/t/t9402-git-cvsserver-refs.sh
@@ -178,7 +178,7 @@ test_expect_success 'setup v1.2 on b1' '
mkdir cdir &&
echo "cdir/cfile" >cdir/cfile &&
git add -A cdir adir t3 t2 &&
- git commit -q -m 'v1.2' &&
+ git commit -q -m "v1.2" &&
git tag v1.2 &&
git push --tags gitcvs.git b1:b1
'
--
2.28.0.81.ge8ab941b67
^ permalink raw reply related [relevance 5%]
* [PATCH v2] git-mv: improve error message for conflicted file
2020-07-17 23:24 10% [PATCH] git-mv: improve error message for conflicted file Chris Torek via GitGitGadget
2020-07-17 23:47 0% ` Eric Sunshine
@ 2020-07-20 6:17 10% ` Chris Torek via GitGitGadget
1 sibling, 0 replies; 200+ results
From: Chris Torek via GitGitGadget @ 2020-07-20 6:17 UTC (permalink / raw)
To: git; +Cc: Chris Torek, Chris Torek
From: Chris Torek <chris.torek@gmail.com>
'git mv' has always complained about renaming a conflicted
file, as it cannot handle multiple index entries for one file.
However, the error message it uses has been the same as the
one for an untracked file:
fatal: not under version control, src=...
which is patently wrong. Distinguish the two cases and
add a test to make sure we produce the correct message.
Signed-off-by: Chris Torek <chris.torek@gmail.com>
---
git-mv: improve error message for conflicted file
'git mv' has always complained about renaming a conflicted file, as it
cannot handle multiple index entries for one file. However, the error
message it uses has been the same as the one for an untracked file:
fatal: not under version control, src=...
which is patently wrong. Distinguish the two cases and add a test to
make sure we produce the correct message.
Signed-off-by: Chris Torek chris.torek@gmail.com [chris.torek@gmail.com]
------------------------------------------------------------------------
Tests updated, and took Junio's suggestion to reduce the cache lookup to
one call.
I put in the shortened "conflicted" here but did not shorten the
existing "not under version control" message (to minimize the visible
and translations-required changes).
I like the idea of renaming all stages and keeping them at their current
stages, but that's too much for this patch.
I'll be traveling next week and not sure if I will get to any followups
for a while.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-678%2Fchris3torek%2Fgit-mv-message-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-678/chris3torek/git-mv-message-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/678
Range-diff vs v1:
1: 0b617e74f7 ! 1: f2e251a7ea git-mv: improve error message for conflicted file
@@ Commit message
Signed-off-by: Chris Torek <chris.torek@gmail.com>
## builtin/mv.c ##
+@@ builtin/mv.c: int cmd_mv(int argc, const char **argv, const char *prefix)
+ struct stat st;
+ struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
+ struct lock_file lock_file = LOCK_INIT;
++ struct cache_entry *ce;
+
+ git_config(git_default_config, NULL);
+
@@ builtin/mv.c: int cmd_mv(int argc, const char **argv, const char *prefix)
}
argc += last - first;
}
- } else if (cache_name_pos(src, length) < 0)
-- bad = _("not under version control");
++ } else if (!(ce = cache_file_exists(src, length, ignore_case))) {
+ bad = _("not under version control");
- else if (lstat(dst, &st) == 0 &&
-+ } else if (cache_name_pos(src, length) < 0) {
-+ /*
-+ * This occurs for both untracked files *and*
-+ * files that are in merge-conflict state, so
-+ * let's distinguish between those two.
-+ */
-+ struct cache_entry *ce = cache_file_exists(src, length, ignore_case);
-+ if (ce == NULL)
-+ bad = _("not under version control");
-+ else
-+ bad = _("must resolve merge conflict first");
++ } else if (ce_stage(ce)) {
++ bad = _("conflicted");
+ } else if (lstat(dst, &st) == 0 &&
(!ignore_case || strcasecmp(src, dst))) {
bad = _("destination exists");
@@ t/t7001-mv.sh: test_expect_success 'git mv should not change sha1 of moved cache
+test_expect_success 'git mv error on conflicted file' '
+ rm -fr .git &&
+ git init &&
-+ touch conflicted &&
-+ cfhash=$(git hash-object -w conflicted) &&
-+ git update-index --index-info <<-EOF &&
-+ $(printf "0 $cfhash 0\tconflicted\n")
-+ $(printf "100644 $cfhash 1\tconflicted\n")
++ >conflict &&
++ test_when_finished "rm -f conflict" &&
++ cfhash=$(git hash-object -w conflict) &&
++ q_to_tab <<-EOF | git update-index --index-info &&
++ 0 $cfhash 0Qconflict
++ 100644 $cfhash 1Qconflict
+ EOF
+
-+ test_must_fail git mv conflicted newname 2>actual &&
-+ test_i18ngrep "merge.conflict" actual
++ test_must_fail git mv conflict newname 2>actual &&
++ test_i18ngrep "conflicted" actual
+'
-+
-+rm -f conflicted
+
test_expect_success 'git mv should overwrite symlink to a file' '
builtin/mv.c | 7 +++++--
t/t7001-mv.sh | 17 +++++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index be15ba7044..7dac714af9 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -132,6 +132,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
struct stat st;
struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
struct lock_file lock_file = LOCK_INIT;
+ struct cache_entry *ce;
git_config(git_default_config, NULL);
@@ -220,9 +221,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
}
argc += last - first;
}
- } else if (cache_name_pos(src, length) < 0)
+ } else if (!(ce = cache_file_exists(src, length, ignore_case))) {
bad = _("not under version control");
- else if (lstat(dst, &st) == 0 &&
+ } else if (ce_stage(ce)) {
+ bad = _("conflicted");
+ } else if (lstat(dst, &st) == 0 &&
(!ignore_case || strcasecmp(src, dst))) {
bad = _("destination exists");
if (force) {
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 36b50d0b4c..c978b6dee4 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -248,6 +248,23 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
rm -f dirty dirty2
+# NB: This test is about the error message
+# as well as the failure.
+test_expect_success 'git mv error on conflicted file' '
+ rm -fr .git &&
+ git init &&
+ >conflict &&
+ test_when_finished "rm -f conflict" &&
+ cfhash=$(git hash-object -w conflict) &&
+ q_to_tab <<-EOF | git update-index --index-info &&
+ 0 $cfhash 0Qconflict
+ 100644 $cfhash 1Qconflict
+ EOF
+
+ test_must_fail git mv conflict newname 2>actual &&
+ test_i18ngrep "conflicted" actual
+'
+
test_expect_success 'git mv should overwrite symlink to a file' '
rm -fr .git &&
base-commit: ae46588be0cd730430dded4491246dfb4eac5557
--
gitgitgadget
^ permalink raw reply related [relevance 10%]
* Re: [PATCH] git-mv: improve error message for conflicted file
@ 2020-07-18 6:55 3% ` Eric Sunshine
0 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2020-07-18 6:55 UTC (permalink / raw)
To: Chris Torek; +Cc: Chris Torek via GitGitGadget, Git List
On Fri, Jul 17, 2020 at 9:35 PM Chris Torek <chris.torek@gmail.com> wrote:
> On Fri, Jul 17, 2020 at 4:47 PM Eric Sunshine <sunshine@sunshineco.com> wrote:
> > ... use literal TABs and let the here-doc provide the newlines.
>
> I personally hate depending on literal tabs, as they're really
> hard to see. If q_to_tab() is OK I'll use that.
q_to_tab() is a good choice.
> > I realize that this test script is already filled with this sort of
> > thing where actions are performed outside of tests, however, these
> > days we frown upon that, and there really isn't a good reason to avoid
> > taking care of this clean up via the modern idiom of using
> > test_when_finished(), which you would call immediately after creating
> > the file in the test. So:
>
> Indeed, that's where I copied it from.
>
> Should I clean up other instances of separated-out `rm -f`s
> in this file in a separate commit?
In general, as a reviewer, I don't mind seeing a patch or two cleaning
up style and other violations, however, the magnitude of the fixes
this script needs is quite significant and would end up requiring a
fair number of patches. As such, I'm not particularly eager to see the
improvement made by this patch -- which is nicely standalone --
weighed down by a lengthy series of patches which aren't really
related to it.
If cleaning up the t7001 test script is something you might be
interested in doing, then making it a separate patch series would be
more palatable. A scan of the script reveals the following problems,
though there may be others:
* old style:
test_expect_success \
'title' \
'body line 1 &&
body line 2'
should become:
test_expect_success 'title' '
body line 1 &&
body line 2
'
* test bodies should be indented with TAB, not spaces
* some tests use a deprecated style in which there are unnecessary
blank lines after the opening quote of the test body and before the
closing quote; these blanks lines should be removed
* style for `cd` in subshell is:
(
cd foo &&
...
) &&
not:
(cd foo &&
...
) &&
* there should be no whitespace after redirect operators, so:
foo > actual &&
should become:
foo >actual &&
* tests 'cd' around and expect other tests to know the current
directory and 'cd' relative to that; instead, any test which uses
'cd' should do so in a subshell to ensure the current directory is
restored by the time the test ends:
test_expect_success 'title' '
something &&
(
cd somewhere &&
something-else
)
'
Alternately, it may be possible to take advantage of `-C` if
`something-else` is a `git` command:
test_expect_success 'title' '
something &&
git -C somewhere foo
'
* use `>` rather than `touch` to create an empty file when the
timestamp isn't relevant to the test
* cleanup code outside of tests should be moved into the test and
scheduled for execution via test_when_finished()
* there are several standalone "clean up" tests which invoke `git
reset --hard` which should be folded into the tests for which they
are cleaning up
* multiple commands on one line:
mkdir foo && >foo/bar && git add foo/bar &&
should be split across multiple lines:
mkdir foo &&
>foo/bar &&
git add foo/bar &&
* at least one test incorrectly uses single quotes within the body of
the test which itself is contained within single quotes; when
quoting is needed inside a test body, it should be using double
quotes instead; however, in this case, the quotes aren't even
needed, so:
git commit -m 'initial' &&
can just become:
git commit -m initial &&
* take advantage of here-docs, so:
{ echo other/a.txt; echo other/b.txt; } >expect &&
can be expressed more cleanly as:
cat >expect <<-\EOF &&
other/a.txt
other/b.txt
EOF
* use `test` rather than `[`
* optional: rename the setup test 'prepare reference tree' to 'setup'
* optional modernization: use test_path_exists() and cousins instead
of `test -f`, etc.
* optional: avoid `git` command upstream of a pipe since the pipe will
swallow its exit code, thus a crash won't necessarily be noticed
* optional: it's unusual for tests to blast the test's ".git"
directory and recreate it with `git init`, however, a number of
tests in this script do so; for tests which really require a new
repository, the more common approach is to use test_create_repo() to
create a new repository into which the test can `cd` (in a subshell)
without disturbing the repository used by the other tests in the
script
A few of the above fixes can probably be combined into a single patch,
in particular, the style fixes in the first four bullet points. Each
remaining bullet point, however, probably deserves its own patch
(including the one about removing whitespace after a redirect
operator).
^ permalink raw reply [relevance 3%]
* Re: [PATCH] git-mv: improve error message for conflicted file
2020-07-17 23:24 10% [PATCH] git-mv: improve error message for conflicted file Chris Torek via GitGitGadget
@ 2020-07-17 23:47 0% ` Eric Sunshine
2020-07-20 6:17 10% ` [PATCH v2] " Chris Torek via GitGitGadget
1 sibling, 1 reply; 200+ results
From: Eric Sunshine @ 2020-07-17 23:47 UTC (permalink / raw)
To: Chris Torek via GitGitGadget; +Cc: Git List, Chris Torek
On Fri, Jul 17, 2020 at 7:25 PM Chris Torek via GitGitGadget
<gitgitgadget@gmail.com> wrote:
> 'git mv' has always complained about renaming a conflicted
> file, as it cannot handle multiple index entries for one file.
> However, the error message it uses has been the same as the
> one for an untracked file:
>
> fatal: not under version control, src=...
>
> which is patently wrong. Distinguish the two cases and
> add a test to make sure we produce the correct message.
>
> Signed-off-by: Chris Torek <chris.torek@gmail.com>
> ---
A few nits below...
> diff --git a/builtin/mv.c b/builtin/mv.c
> @@ -220,9 +220,18 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
> + } else if (cache_name_pos(src, length) < 0) {
> + /*
> + * This occurs for both untracked files *and*
> + * files that are in merge-conflict state, so
> + * let's distinguish between those two.
> + */
> + struct cache_entry *ce = cache_file_exists(src, length, ignore_case);
> + if (ce == NULL)
> + bad = _("not under version control");
> + else
> + bad = _("must resolve merge conflict first");
Style: write `!ce` rather than `ce == NULL`:
if (!ce)
bad = _("not under version control");
else
bad = _("must resolve merge conflict first");
or reverse the arms and skip the `!` altogether:
if (ce)
bad = _("must resolve merge conflict first");
else
bad = _("not under version control");
Or even:
bad = ce ? _("must resolve merge conflict first") : _("not under
version control");
though it's subjective whether that is more readable.
As for bikeshedding the message itself, perhaps:
_("conflicted");
Though, perhaps that's too succinct.
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> @@ -248,6 +248,24 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
> +test_expect_success 'git mv error on conflicted file' '
> + rm -fr .git &&
> + git init &&
> + touch conflicted &&
If the timestamp of the file is not relevant to the test -- as is the
case here -- then we avoid using `touch`. Instead:
>conflicted &&
> + cfhash=$(git hash-object -w conflicted) &&
> + git update-index --index-info <<-EOF &&
> + $(printf "0 $cfhash 0\tconflicted\n")
> + $(printf "100644 $cfhash 1\tconflicted\n")
> + EOF
This can probably be written more easily and clearly like this:
git update-index --index-info <<-EOF &&
0 $cfhash 0 conflicted
100644 $cfhash 1 conflicted
EOF
That is, use literal TABs and let the here-doc provide the newlines.
Alternately, you could take advantage of the q_to_tab() function to
convert literal "Q" to TAB:
q_to_tab <<-EOF | git update-index --index-info &&
0 $cfhash 0Qconflicted
100644 $cfhash 1Qconflicted
EOF
> + test_must_fail git mv conflicted newname 2>actual &&
> + test_i18ngrep "merge.conflict" actual
> +'
> +
> +rm -f conflicted
I realize that this test script is already filled with this sort of
thing where actions are performed outside of tests, however, these
days we frown upon that, and there really isn't a good reason to avoid
taking care of this clean up via the modern idiom of using
test_when_finished(), which you would call immediately after creating
the file in the test. So:
...
>conflicted &&
test_when_finished "rm -f conflicted" &&
...
^ permalink raw reply [relevance 0%]
* [PATCH] git-mv: improve error message for conflicted file
@ 2020-07-17 23:24 10% Chris Torek via GitGitGadget
2020-07-17 23:47 0% ` Eric Sunshine
2020-07-20 6:17 10% ` [PATCH v2] " Chris Torek via GitGitGadget
0 siblings, 2 replies; 200+ results
From: Chris Torek via GitGitGadget @ 2020-07-17 23:24 UTC (permalink / raw)
To: git; +Cc: Chris Torek, Chris Torek
From: Chris Torek <chris.torek@gmail.com>
'git mv' has always complained about renaming a conflicted
file, as it cannot handle multiple index entries for one file.
However, the error message it uses has been the same as the
one for an untracked file:
fatal: not under version control, src=...
which is patently wrong. Distinguish the two cases and
add a test to make sure we produce the correct message.
Signed-off-by: Chris Torek <chris.torek@gmail.com>
---
git-mv: improve error message for conflicted file
'git mv' has always complained about renaming a conflicted file, as it
cannot handle multiple index entries for one file. However, the error
message it uses has been the same as the one for an untracked file:
fatal: not under version control, src=...
which is patently wrong. Distinguish the two cases and add a test to
make sure we produce the correct message.
Signed-off-by: Chris Torek chris.torek@gmail.com [chris.torek@gmail.com]
------------------------------------------------------------------------
A small note on the test: I originally had a different message text, so
the grep is slightly more general than necessary here. This leaves room
for a better message, though; I'm not sure mine is that great.
The error messages in general from 'git mv' could probably stand a lot
of cleanup. This is just a minimal fix for some particularly bad
behavior.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-678%2Fchris3torek%2Fgit-mv-message-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-678/chris3torek/git-mv-message-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/678
builtin/mv.c | 15 ++++++++++++---
t/t7001-mv.sh | 18 ++++++++++++++++++
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index be15ba7044..7dff121629 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -220,9 +220,18 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
}
argc += last - first;
}
- } else if (cache_name_pos(src, length) < 0)
- bad = _("not under version control");
- else if (lstat(dst, &st) == 0 &&
+ } else if (cache_name_pos(src, length) < 0) {
+ /*
+ * This occurs for both untracked files *and*
+ * files that are in merge-conflict state, so
+ * let's distinguish between those two.
+ */
+ struct cache_entry *ce = cache_file_exists(src, length, ignore_case);
+ if (ce == NULL)
+ bad = _("not under version control");
+ else
+ bad = _("must resolve merge conflict first");
+ } else if (lstat(dst, &st) == 0 &&
(!ignore_case || strcasecmp(src, dst))) {
bad = _("destination exists");
if (force) {
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 36b50d0b4c..b4974f9385 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -248,6 +248,24 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
rm -f dirty dirty2
+# NB: This test is about the error message
+# as well as the failure.
+test_expect_success 'git mv error on conflicted file' '
+ rm -fr .git &&
+ git init &&
+ touch conflicted &&
+ cfhash=$(git hash-object -w conflicted) &&
+ git update-index --index-info <<-EOF &&
+ $(printf "0 $cfhash 0\tconflicted\n")
+ $(printf "100644 $cfhash 1\tconflicted\n")
+ EOF
+
+ test_must_fail git mv conflicted newname 2>actual &&
+ test_i18ngrep "merge.conflict" actual
+'
+
+rm -f conflicted
+
test_expect_success 'git mv should overwrite symlink to a file' '
rm -fr .git &&
base-commit: b6a658bd00c9c29e07f833cabfc0ef12224e277a
--
gitgitgadget
^ permalink raw reply related [relevance 10%]
* Re: [PATCH 1/3] t7001: reformat to newer style
2018-09-24 18:51 5% ` Stefan Beller
@ 2018-09-25 20:36 6% ` Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2018-09-25 20:36 UTC (permalink / raw)
To: Stefan Beller; +Cc: Derrick Stolee, git
Stefan Beller <sbeller@google.com> writes:
> Heh, thanks for calling that out. So we're looking at a full formatter
> instead of a partial formatter that helps moving in the right direction now. :-/
The parts left out of these patches (e.g. use subshell when working
in a subdirectory) need human decision and a bit of good taste, and
I think it was a good design decision to keep these three patches
all mechanical. There do need a follow-up [PATCH {4,5,6}/3] that
cannot be done mechanically, though, before the result can be called
"this script has been cleaned up and new people are encouraged to
mimick the way it does things".
That way, we can keep the mechanically good bits that are early in
the series while polishing the later bits that need human judgement.
^ permalink raw reply [relevance 6%]
* Re: [PATCH 1/3] t7001: reformat to newer style
2018-09-24 13:31 6% ` Derrick Stolee
2018-09-24 16:09 5% ` Junio C Hamano
@ 2018-09-24 18:51 5% ` Stefan Beller
2018-09-25 20:36 6% ` Junio C Hamano
1 sibling, 1 reply; 200+ results
From: Stefan Beller @ 2018-09-24 18:51 UTC (permalink / raw)
To: Derrick Stolee; +Cc: git
On Mon, Sep 24, 2018 at 6:31 AM Derrick Stolee <stolee@gmail.com> wrote:
>
> On 9/21/2018 7:58 PM, Stefan Beller wrote:
> > The old formatting style is a real hindrance of getting people up to speed
> > contributing as they use existing code as an example and follow that style.
> > So let's get rid of the old style and reformat it in our current style.
> I was suspicious of your automated approach catching everything, so I
> looked carefully at this patch. There are still a lot of things
> happening that we would not recommend doing in new tests.
Heh, thanks for calling that out. So we're looking at a full formatter
instead of a partial formatter that helps moving in the right direction now. :-/
I would prefer to use automation as much as possible for these tasks
to keep it easy to apply it at scale once a file is not touched by
master..pu any more.
When applying styles manually, there is sometimes a judgement call,
which would like to the inevitable bikeshedding that I'd prefer to avoid.
> > +test_expect_success 'moving the file out of subdirectory' '
> > + cd path0 && git mv COPYING ../path1/COPYING
> > +'
> Perhaps split this line on the &&?
In real modern testing, this could also be
git -C path0 mv ...
which would also fix the cd.. below and not needing
a subshell there either (using -C again).
Looking at this from a higher level, nowadays I would write
tests that have more lines in them, instead of having
one git command per test.
> > +test_expect_success 'moving to existing tracked target with trailing slash' '
> > + mkdir path2 &&
> > + >path2/file && git add path2/file &&
> This line in particular looks a bit strange. What is this doing? At
> least we should split the &&.
Yes.
> > +test_expect_success 'do not move directory over existing directory' '
> > + mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
> > +'
>
> Split this line.
Okay, I'll go manually over these tests to adapt to new style.
Thanks for looking over the patch!
Stefan
^ permalink raw reply [relevance 5%]
* Re: [PATCH 1/3] t7001: reformat to newer style
2018-09-24 13:31 6% ` Derrick Stolee
@ 2018-09-24 16:09 5% ` Junio C Hamano
2018-09-24 18:51 5% ` Stefan Beller
1 sibling, 0 replies; 200+ results
From: Junio C Hamano @ 2018-09-24 16:09 UTC (permalink / raw)
To: Derrick Stolee; +Cc: Stefan Beller, git
Derrick Stolee <stolee@gmail.com> writes:
>> +test_expect_success 'moving the file back into subdirectory' '
>> + cd path0 && git mv ../path1/COPYING COPYING
>> +'
>
> Split at &&, use subshell?
Yes, I was almost going to point out the same, saying "'reformat to
newer style' is much larger than only changing how the test body is
formatted", but was debating myself, as a good "modernization patch"
needs both mechanical changes and manual/semantic clean-ups, and it
is very clear that these three patches deliberately limit themselves
to the former for easier verification.
It is relatively rare that files are not touched by any in-flight
topic in the codebase, which is a good opportunity to apply this
kind of wholesale clean-up, so I tend to agree that it is a shame
not to do the non-mechanical clean up in the same series. Perhaps
the best way would be to keep these three mechanical steps as they
are, and then follow-up with non-mechanical clean-up like you
suggested.
>> +test_expect_success 'commiting the change' '
>> + cd .. && git commit -m move-in -a
>> +'
>
> Drop "cd .." (and the comments about being in path0)
... when the previous step moves to "git -C path0 mv ..." or
preferrably "(cd path0 && git mv ...)".
> [big snip]
>
>> +test_expect_success 'moving to existing tracked target with trailing slash' '
>> + mkdir path2 &&
>> + >path2/file && git add path2/file &&
> This line in particular looks a bit strange. What is this doing? At
> least we should split the &&.
Create an empty file by redirecting the output from a no-op into it,
and then adding the result. I agree with you that this would be
easier to read on two lines.
>> + git mv path1/path0/ path2/ &&
>> + test_path_is_dir path2/path0/
>> +'
^ permalink raw reply [relevance 5%]
* Re: [PATCH 1/3] t7001: reformat to newer style
2018-09-21 23:58 11% ` [PATCH 1/3] t7001: reformat " Stefan Beller
@ 2018-09-24 13:31 6% ` Derrick Stolee
2018-09-24 16:09 5% ` Junio C Hamano
2018-09-24 18:51 5% ` Stefan Beller
0 siblings, 2 replies; 200+ results
From: Derrick Stolee @ 2018-09-24 13:31 UTC (permalink / raw)
To: Stefan Beller, git
On 9/21/2018 7:58 PM, Stefan Beller wrote:
> The old formatting style is a real hindrance of getting people up to speed
> contributing as they use existing code as an example and follow that style.
> So let's get rid of the old style and reformat it in our current style.
I was suspicious of your automated approach catching everything, so I
looked carefully at this patch. There are still a lot of things
happening that we would not recommend doing in new tests.
>
> Reported-by: Derrick Stolee <stolee@gmail.com>
> Reported-by: Jeff Hostetler <git@jeffhostetler.com>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> t/t7001-mv.sh | 268 +++++++++++++++++++++++++-------------------------
> 1 file changed, 134 insertions(+), 134 deletions(-)
>
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> index 36b50d0b4c1..2251d24735c 100755
> --- a/t/t7001-mv.sh
> +++ b/t/t7001-mv.sh
> @@ -3,74 +3,74 @@
> test_description='git mv in subdirs'
> . ./test-lib.sh
>
> -test_expect_success \
> - 'prepare reference tree' \
> - 'mkdir path0 path1 &&
> - cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
> - git add path0/COPYING &&
> - git commit -m add -a'
> +test_expect_success 'prepare reference tree' '
> + mkdir path0 path1 &&
> + cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
> + git add path0/COPYING &&
> + git commit -m add -a
> +'
>
> -test_expect_success \
> - 'moving the file out of subdirectory' \
> - 'cd path0 && git mv COPYING ../path1/COPYING'
> +test_expect_success 'moving the file out of subdirectory' '
> + cd path0 && git mv COPYING ../path1/COPYING
> +'
Perhaps split this line on the &&?
>
> # in path0 currently
> -test_expect_success \
> - 'commiting the change' \
> - 'cd .. && git commit -m move-out -a'
> +test_expect_success 'commiting the change' '
> + cd .. && git commit -m move-out -a
> +'
This "cd .." should probably be removed and use a subshell in the test
above where we "cd path0".
>
> -test_expect_success \
> - 'checking the commit' \
> - 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
> - grep "^R100..*path0/COPYING..*path1/COPYING" actual'
> +test_expect_success 'checking the commit' '
> + git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
> + grep "^R100..*path0/COPYING..*path1/COPYING" actual
> +'
>
> -test_expect_success \
> - 'moving the file back into subdirectory' \
> - 'cd path0 && git mv ../path1/COPYING COPYING'
> +test_expect_success 'moving the file back into subdirectory' '
> + cd path0 && git mv ../path1/COPYING COPYING
> +'
Split at &&, use subshell?
> +test_expect_success 'commiting the change' '
> + cd .. && git commit -m move-in -a
> +'
Drop "cd .." (and the comments about being in path0)
[big snip]
> +test_expect_success 'moving to existing tracked target with trailing slash' '
> + mkdir path2 &&
> + >path2/file && git add path2/file &&
This line in particular looks a bit strange. What is this doing? At
least we should split the &&.
> + git mv path1/path0/ path2/ &&
> + test_path_is_dir path2/path0/
> +'
> +
> +test_expect_success 'clean up' '
> + git reset --hard
> +'
> +
> +test_expect_success 'adding another file' '
> + cp "$TEST_DIRECTORY"/../README.md path0/README &&
> + git add path0/README &&
> + git commit -m add2 -a
> +'
> +
> +test_expect_success 'moving whole subdirectory' '
> + git mv path0 path2
> +'
> +
> +test_expect_success 'commiting the change' '
> + git commit -m dir-move -a
> +'
> +
> +test_expect_success 'checking the commit' '
> + git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
> + grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
> + grep "^R100..*path0/README..*path2/README" actual
> +'
> +
> +test_expect_success 'succeed when source is a prefix of destination' '
> + git mv path2/COPYING path2/COPYING-renamed
> +'
> +
> +test_expect_success 'moving whole subdirectory into subdirectory' '
> + git mv path2 path1
> +'
> +
> +test_expect_success 'commiting the change' '
> + git commit -m dir-move -a
> +'
> +
> +test_expect_success 'checking the commit' '
> + git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
> + grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
> + grep "^R100..*path2/README..*path1/path2/README" actual
> +'
> +
> +test_expect_success 'do not move directory over existing directory' '
> + mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
> +'
Split this line.
Thanks,
-Stolee
^ permalink raw reply [relevance 6%]
* [PATCH 1/3] t7001: reformat to newer style
2018-09-21 23:58 6% [PATCH 0/3] bring some tests to newer style Stefan Beller
@ 2018-09-21 23:58 11% ` Stefan Beller
2018-09-24 13:31 6% ` Derrick Stolee
0 siblings, 1 reply; 200+ results
From: Stefan Beller @ 2018-09-21 23:58 UTC (permalink / raw)
To: git; +Cc: Stefan Beller
The old formatting style is a real hindrance of getting people up to speed
contributing as they use existing code as an example and follow that style.
So let's get rid of the old style and reformat it in our current style.
Reported-by: Derrick Stolee <stolee@gmail.com>
Reported-by: Jeff Hostetler <git@jeffhostetler.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
t/t7001-mv.sh | 268 +++++++++++++++++++++++++-------------------------
1 file changed, 134 insertions(+), 134 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 36b50d0b4c1..2251d24735c 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -3,74 +3,74 @@
test_description='git mv in subdirs'
. ./test-lib.sh
-test_expect_success \
- 'prepare reference tree' \
- 'mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
- git add path0/COPYING &&
- git commit -m add -a'
+test_expect_success 'prepare reference tree' '
+ mkdir path0 path1 &&
+ cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ git add path0/COPYING &&
+ git commit -m add -a
+'
-test_expect_success \
- 'moving the file out of subdirectory' \
- 'cd path0 && git mv COPYING ../path1/COPYING'
+test_expect_success 'moving the file out of subdirectory' '
+ cd path0 && git mv COPYING ../path1/COPYING
+'
# in path0 currently
-test_expect_success \
- 'commiting the change' \
- 'cd .. && git commit -m move-out -a'
+test_expect_success 'commiting the change' '
+ cd .. && git commit -m move-out -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path1/COPYING" actual'
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path1/COPYING" actual
+'
-test_expect_success \
- 'moving the file back into subdirectory' \
- 'cd path0 && git mv ../path1/COPYING COPYING'
+test_expect_success 'moving the file back into subdirectory' '
+ cd path0 && git mv ../path1/COPYING COPYING
+'
# in path0 currently
-test_expect_success \
- 'commiting the change' \
- 'cd .. && git commit -m move-in -a'
-
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path1/COPYING..*path0/COPYING" actual'
-
-test_expect_success \
- 'mv --dry-run does not move file' \
- 'git mv -n path0/COPYING MOVED &&
- test -f path0/COPYING &&
- test ! -f MOVED'
-
-test_expect_success \
- 'checking -k on non-existing file' \
- 'git mv -k idontexist path0'
-
-test_expect_success \
- 'checking -k on untracked file' \
- 'touch untracked1 &&
- git mv -k untracked1 path0 &&
- test -f untracked1 &&
- test ! -f path0/untracked1'
-
-test_expect_success \
- 'checking -k on multiple untracked files' \
- 'touch untracked2 &&
- git mv -k untracked1 untracked2 path0 &&
- test -f untracked1 &&
- test -f untracked2 &&
- test ! -f path0/untracked1 &&
- test ! -f path0/untracked2'
-
-test_expect_success \
- 'checking -f on untracked file with existing target' \
- 'touch path0/untracked1 &&
- test_must_fail git mv -f untracked1 path0 &&
- test ! -f .git/index.lock &&
- test -f untracked1 &&
- test -f path0/untracked1'
+test_expect_success 'commiting the change' '
+ cd .. && git commit -m move-in -a
+'
+
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path1/COPYING..*path0/COPYING" actual
+'
+
+test_expect_success 'mv --dry-run does not move file' '
+ git mv -n path0/COPYING MOVED &&
+ test -f path0/COPYING &&
+ test ! -f MOVED
+'
+
+test_expect_success 'checking -k on non-existing file' '
+ git mv -k idontexist path0
+'
+
+test_expect_success 'checking -k on untracked file' '
+ touch untracked1 &&
+ git mv -k untracked1 path0 &&
+ test -f untracked1 &&
+ test ! -f path0/untracked1
+'
+
+test_expect_success 'checking -k on multiple untracked files' '
+ touch untracked2 &&
+ git mv -k untracked1 untracked2 path0 &&
+ test -f untracked1 &&
+ test -f untracked2 &&
+ test ! -f path0/untracked1 &&
+ test ! -f path0/untracked2
+'
+
+test_expect_success 'checking -f on untracked file with existing target' '
+ touch path0/untracked1 &&
+ test_must_fail git mv -f untracked1 path0 &&
+ test ! -f .git/index.lock &&
+ test -f untracked1 &&
+ test -f path0/untracked1
+'
# clean up the mess in case bad things happen
rm -f idontexist untracked1 untracked2 \
@@ -78,79 +78,79 @@ rm -f idontexist untracked1 untracked2 \
.git/index.lock
rmdir path1
-test_expect_success \
- 'moving to absent target with trailing slash' \
- 'test_must_fail git mv path0/COPYING no-such-dir/ &&
- test_must_fail git mv path0/COPYING no-such-dir// &&
- git mv path0/ no-such-dir/ &&
- test_path_is_dir no-such-dir'
-
-test_expect_success \
- 'clean up' \
- 'git reset --hard'
-
-test_expect_success \
- 'moving to existing untracked target with trailing slash' \
- 'mkdir path1 &&
- git mv path0/ path1/ &&
- test_path_is_dir path1/path0/'
-
-test_expect_success \
- 'moving to existing tracked target with trailing slash' \
- 'mkdir path2 &&
- >path2/file && git add path2/file &&
- git mv path1/path0/ path2/ &&
- test_path_is_dir path2/path0/'
-
-test_expect_success \
- 'clean up' \
- 'git reset --hard'
-
-test_expect_success \
- 'adding another file' \
- 'cp "$TEST_DIRECTORY"/../README.md path0/README &&
- git add path0/README &&
- git commit -m add2 -a'
-
-test_expect_success \
- 'moving whole subdirectory' \
- 'git mv path0 path2'
-
-test_expect_success \
- 'commiting the change' \
- 'git commit -m dir-move -a'
-
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
- grep "^R100..*path0/README..*path2/README" actual'
-
-test_expect_success \
- 'succeed when source is a prefix of destination' \
- 'git mv path2/COPYING path2/COPYING-renamed'
-
-test_expect_success \
- 'moving whole subdirectory into subdirectory' \
- 'git mv path2 path1'
-
-test_expect_success \
- 'commiting the change' \
- 'git commit -m dir-move -a'
-
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
- grep "^R100..*path2/README..*path1/path2/README" actual'
-
-test_expect_success \
- 'do not move directory over existing directory' \
- 'mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0'
-
-test_expect_success \
- 'move into "."' \
- 'git mv path1/path2/ .'
+test_expect_success 'moving to absent target with trailing slash' '
+ test_must_fail git mv path0/COPYING no-such-dir/ &&
+ test_must_fail git mv path0/COPYING no-such-dir// &&
+ git mv path0/ no-such-dir/ &&
+ test_path_is_dir no-such-dir
+'
+
+test_expect_success 'clean up' '
+ git reset --hard
+'
+
+test_expect_success 'moving to existing untracked target with trailing slash' '
+ mkdir path1 &&
+ git mv path0/ path1/ &&
+ test_path_is_dir path1/path0/
+'
+
+test_expect_success 'moving to existing tracked target with trailing slash' '
+ mkdir path2 &&
+ >path2/file && git add path2/file &&
+ git mv path1/path0/ path2/ &&
+ test_path_is_dir path2/path0/
+'
+
+test_expect_success 'clean up' '
+ git reset --hard
+'
+
+test_expect_success 'adding another file' '
+ cp "$TEST_DIRECTORY"/../README.md path0/README &&
+ git add path0/README &&
+ git commit -m add2 -a
+'
+
+test_expect_success 'moving whole subdirectory' '
+ git mv path0 path2
+'
+
+test_expect_success 'commiting the change' '
+ git commit -m dir-move -a
+'
+
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
+ grep "^R100..*path0/README..*path2/README" actual
+'
+
+test_expect_success 'succeed when source is a prefix of destination' '
+ git mv path2/COPYING path2/COPYING-renamed
+'
+
+test_expect_success 'moving whole subdirectory into subdirectory' '
+ git mv path2 path1
+'
+
+test_expect_success 'commiting the change' '
+ git commit -m dir-move -a
+'
+
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
+ grep "^R100..*path2/README..*path1/path2/README" actual
+'
+
+test_expect_success 'do not move directory over existing directory' '
+ mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0
+'
+
+test_expect_success 'move into "."' '
+ git mv path1/path2/ .
+'
test_expect_success "Michael Cassar's test case" '
rm -fr .git papers partA &&
--
2.19.0.444.g18242da7ef-goog
^ permalink raw reply related [relevance 11%]
* [PATCH 0/3] bring some tests to newer style.
@ 2018-09-21 23:58 6% Stefan Beller
2018-09-21 23:58 11% ` [PATCH 1/3] t7001: reformat " Stefan Beller
0 siblings, 1 reply; 200+ results
From: Stefan Beller @ 2018-09-21 23:58 UTC (permalink / raw)
To: git; +Cc: Stefan Beller
The old formatting style is a real hindrance of getting people up to speed
contributing as they use existing code as an example and follow that style.
So let's get rid of the old style and reformat it in our current style.
This was reported off list by Derrick and Jeff as both of them followed
outdated formatting style for their first patches only to have a long
discussion on the mailing list on style.
The tests changed are not modified in origin/master..origin/pu,
and they were changed using a hacky script:
--8<--
#!/usr/bin/python
import sys
def applyformat(fname):
with open(fname, 'r') as f:
lines = f.readlines()
state = "lookingforstart"
outlines = []
for line in lines:
if state == "lookingforstart":
if line == "test_expect_success \\\n":
print "AHA!"
state = "firstlinefound"
else:
outlines += [line]
elif state == "firstlinefound":
l = line.strip()
must_strip = False
if l.endswith("\\"):
l = l[:-1]
must_strip=True
if l.endswith("'"):
l = l[:-1].strip()
if l.startswith("'"):
line = "test_expect_success " + l + " '\n"
outlines += [line]
state = "re-indent-until-done"
else:
print "what?"
exit(1)
elif state == "re-indent-until-done":
l = line.strip()
if must_strip:
if l.startswith("'"):
l = l[1:]
must_strip = False
else:
print "what 1?"
exit(1)
if l.endswith("'"):
l = l[:-1]
state = "lookingforstart"
if len(l):
line = " " + l + "\n"
outlines += [line]
elif state == "lookingforstart":
# skip an empty line before test is done
pass
else:
outlines += ["\n"]
if state == "lookingforstart":
outlines += ["'\n"]
else:
print "what?"
exit(1)
with open(fname, 'w') as f:
f.write(''.join(outlines))
for n in sys.argv[1:]:
print n
applyformat(n)
--8<--
Thanks,
Stefan
Stefan Beller (3):
t7001: reformat to newer style
t7004: reformat style
t0030: reformat style
t/t0030-stripspace.sh | 525 ++++++++++++++++++++----------------------
t/t7001-mv.sh | 268 ++++++++++-----------
t/t7004-tag.sh | 149 +++++-------
3 files changed, 444 insertions(+), 498 deletions(-)
--
2.19.0.444.g18242da7ef-goog
^ permalink raw reply [relevance 6%]
* [PATCH 1/4] tests: use 'test_must_be_empty' instead of '! test -s'
2018-08-19 21:57 3% [PATCH 0/4] tests: make more use of 'test_must_be_empty' SZEDER Gábor
@ 2018-08-19 21:57 4% ` SZEDER Gábor
0 siblings, 0 replies; 200+ results
From: SZEDER Gábor @ 2018-08-19 21:57 UTC (permalink / raw)
To: Junio C Hamano
Cc: git, Andrei Rybak, Ævar Arnfjörð Bjarmason,
SZEDER Gábor
Using 'test_must_be_empty' is preferable to '! test -s', because it
gives a helpful error message if the given file is unexpectedly not
empty, while the latter remains completely silent. Furthermore, it
also catches cases when the given file unexpectedly does not exist at
all.
This patch was basically created by:
sed -i -e 's/! test -s/test_must_be_empty/' t[0-9]*.sh
with the following notable exceptions:
- The '! test -s' check in '.gitmodules ignore=dirty suppresses
submodules with untracked content' in 't7508-status.sh' is left
as-is, because it's bogus and, therefore, it's subject of a
dedicated patch.
- The '! test -s' checks in 't9131-git-svn-empty-symlink.sh' and
't9135-git-svn-moved-branch-empty-file.sh' are immediately
preceeded by a 'test -f' to ensure that the files exist in the
first place. 'test_must_be_empty' ensures that as well, so those
'test -f' commands are removed as well.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
---
That dedicated patch to t7508 can be found at:
https://public-inbox.org/git/20180818175606.24108-1-szeder.dev@gmail.com/
t/t0000-basic.sh | 2 +-
t/t0090-cache-tree.sh | 2 +-
t/t0203-gettext-setlocale-sanity.sh | 4 +-
t/t1501-work-tree.sh | 2 +-
t/t1510-repo-setup.sh | 24 +++++------
t/t2013-checkout-submodule.sh | 6 +--
t/t2204-add-ignored.sh | 8 ++--
t/t3600-rm.sh | 6 +--
t/t4011-diff-symlink.sh | 2 +-
t/t4019-diff-wserror.sh | 2 +-
t/t4027-diff-submodule.sh | 26 ++++++------
t/t4041-diff-submodule-option.sh | 14 +++----
t/t4060-diff-submodule-option-diff-format.sh | 14 +++----
t/t4124-apply-ws-rule.sh | 2 +-
t/t4150-am.sh | 4 +-
t/t5401-update-hooks.sh | 10 ++---
t/t5500-fetch-pack.sh | 2 +-
t/t5526-fetch-submodules.sh | 42 ++++++++++----------
t/t5570-git-daemon.sh | 2 +-
t/t7001-mv.sh | 6 +--
t/t7201-co.sh | 4 +-
t/t7406-submodule-update.sh | 2 +-
t/t7810-grep.sh | 2 +-
t/t9131-git-svn-empty-symlink.sh | 6 +--
t/t9135-git-svn-moved-branch-empty-file.sh | 3 +-
25 files changed, 98 insertions(+), 99 deletions(-)
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index af61d083b4..4e588eda09 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -116,7 +116,7 @@ check_sub_test_lib_test () {
name="$1" # stdin is the expected output from the test
(
cd "$name" &&
- ! test -s err &&
+ test_must_be_empty err &&
sed -e 's/^> //' -e 's/Z$//' >expect &&
test_cmp expect out
)
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index 0c61268fd2..9e88a56d61 100755
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -239,7 +239,7 @@ test_expect_success 'no phantom error when switching trees' '
>newdir/one &&
git add newdir/one &&
git checkout 2>errors &&
- ! test -s errors
+ test_must_be_empty errors
'
test_expect_success 'switching trees does not invalidate shared index' '
diff --git a/t/t0203-gettext-setlocale-sanity.sh b/t/t0203-gettext-setlocale-sanity.sh
index 71b0d74b4d..0ce1f22eff 100755
--- a/t/t0203-gettext-setlocale-sanity.sh
+++ b/t/t0203-gettext-setlocale-sanity.sh
@@ -11,7 +11,7 @@ test_expect_success 'git show a ISO-8859-1 commit under C locale' '
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
test_commit "iso-c-commit" iso-under-c &&
git show >out 2>err &&
- ! test -s err &&
+ test_must_be_empty err &&
grep -q "iso-c-commit" out
'
@@ -19,7 +19,7 @@ test_expect_success GETTEXT_LOCALE 'git show a ISO-8859-1 commit under a UTF-8 l
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
test_commit "iso-utf8-commit" iso-under-utf8 &&
LANGUAGE=is LC_ALL="$is_IS_locale" git show >out 2>err &&
- ! test -s err &&
+ test_must_be_empty err &&
grep -q "iso-utf8-commit" out
'
diff --git a/t/t1501-work-tree.sh b/t/t1501-work-tree.sh
index afcdfafe45..3498d3d55e 100755
--- a/t/t1501-work-tree.sh
+++ b/t/t1501-work-tree.sh
@@ -41,7 +41,7 @@ test_expect_success 'setup: helper for testing rev-parse' '
# rev-parse --show-prefix should output
# a single newline when at the top of the work tree,
# but we test for that separately.
- test -z "$4" && ! test -s actual.prefix ||
+ test -z "$4" && test_must_be_empty actual.prefix ||
test_cmp expected.prefix actual.prefix
fi
}
diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh
index 972bd9c785..9974457f56 100755
--- a/t/t1510-repo-setup.sh
+++ b/t/t1510-repo-setup.sh
@@ -234,14 +234,14 @@ test_expect_success '#0: nonbare repo, no explicit configuration' '
try_repo 0 unset unset unset "" unset \
.git "$here/0" "$here/0" "(null)" \
.git "$here/0" "$here/0" sub/ 2>message &&
- ! test -s message
+ test_must_be_empty message
'
test_expect_success '#1: GIT_WORK_TREE without explicit GIT_DIR is accepted' '
try_repo 1 "$here" unset unset "" unset \
"$here/1/.git" "$here" "$here" 1/ \
"$here/1/.git" "$here" "$here" 1/sub/ 2>message &&
- ! test -s message
+ test_must_be_empty message
'
test_expect_success '#2: worktree defaults to cwd with explicit GIT_DIR' '
@@ -268,7 +268,7 @@ test_expect_success '#4: core.worktree without GIT_DIR set is accepted' '
try_case 4 unset unset \
.git "$here/4/sub" "$here/4" "(null)" \
"$here/4/.git" "$here/4/sub" "$here/4/sub" "(null)" 2>message &&
- ! test -s message
+ test_must_be_empty message
'
test_expect_success '#5: core.worktree + GIT_WORK_TREE is accepted' '
@@ -279,7 +279,7 @@ test_expect_success '#5: core.worktree + GIT_WORK_TREE is accepted' '
try_repo 5a .. unset "$here/5a" "" unset \
"$here/5a/.git" "$here" "$here" 5a/ \
"$here/5a/.git" "$here/5a" "$here/5a" sub/ &&
- ! test -s message
+ test_must_be_empty message
'
test_expect_success '#6: setting GIT_DIR brings core.worktree to life' '
@@ -376,7 +376,7 @@ test_expect_success '#9: GIT_WORK_TREE accepted with gitfile' '
try_repo 9 wt unset unset gitfile unset \
"$here/9.git" "$here/9/wt" "$here/9" "(null)" \
"$here/9.git" "$here/9/sub/wt" "$here/9/sub" "(null)" 2>message &&
- ! test -s message
+ test_must_be_empty message
'
test_expect_success '#10: GIT_DIR can point to gitfile' '
@@ -402,7 +402,7 @@ test_expect_success '#12: core.worktree with gitfile is accepted' '
try_repo 12 unset unset "$here/12" gitfile unset \
"$here/12.git" "$here/12" "$here/12" "(null)" \
"$here/12.git" "$here/12" "$here/12" sub/ 2>message &&
- ! test -s message
+ test_must_be_empty message
'
test_expect_success '#13: core.worktree+GIT_WORK_TREE accepted (with gitfile)' '
@@ -410,7 +410,7 @@ test_expect_success '#13: core.worktree+GIT_WORK_TREE accepted (with gitfile)' '
try_repo 13 non-existent-too unset non-existent gitfile unset \
"$here/13.git" "$here/13/non-existent-too" "$here/13" "(null)" \
"$here/13.git" "$here/13/sub/non-existent-too" "$here/13/sub" "(null)" 2>message &&
- ! test -s message
+ test_must_be_empty message
'
# case #14.
@@ -565,7 +565,7 @@ test_expect_success '#17: GIT_WORK_TREE without explicit GIT_DIR is accepted (ba
try_repo 17c "$here/17c" unset unset "" true \
.git "$here/17c" "$here/17c" "(null)" \
"$here/17c/.git" "$here/17c" "$here/17c" sub/ 2>message &&
- ! test -s message
+ test_must_be_empty message
'
test_expect_success '#18: bare .git named by GIT_DIR has no worktree' '
@@ -594,7 +594,7 @@ test_expect_success '#20a: core.worktree without GIT_DIR accepted (inside .git)'
"$here/20a/.git" "$here/20a" "$here/20a" .git/wt/ &&
try_case 20a/.git/wt/sub unset unset \
"$here/20a/.git" "$here/20a" "$here/20a" .git/wt/sub/ &&
- ! test -s message
+ test_must_be_empty message
'
test_expect_success '#20b/c: core.worktree and core.bare conflict' '
@@ -626,7 +626,7 @@ test_expect_success '#21: setup, core.worktree warns before overriding core.bare
export GIT_WORK_TREE &&
git status >/dev/null
) 2>message &&
- ! test -s message
+ test_must_be_empty message
'
run_wt_tests 21
@@ -742,7 +742,7 @@ test_expect_success '#25: GIT_WORK_TREE accepted if GIT_DIR unset (bare gitfile
try_repo 25 "$here/25" unset unset gitfile true \
"$here/25.git" "$here/25" "$here/25" "(null)" \
"$here/25.git" "$here/25" "$here/25" "sub/" 2>message &&
- ! test -s message
+ test_must_be_empty message
'
test_expect_success '#26: bare repo has no worktree (GIT_DIR -> gitfile case)' '
@@ -780,7 +780,7 @@ test_expect_success '#29: setup' '
export GIT_WORK_TREE &&
git status
) 2>message &&
- ! test -s message
+ test_must_be_empty message
'
run_wt_tests 29 gitfile
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
index 6ef15738e4..8f86b5f4b2 100755
--- a/t/t2013-checkout-submodule.sh
+++ b/t/t2013-checkout-submodule.sh
@@ -44,7 +44,7 @@ test_expect_success '"checkout <submodule>" honors diff.ignoreSubmodules' '
git config diff.ignoreSubmodules dirty &&
echo x> submodule/untracked &&
git checkout HEAD >actual 2>&1 &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .gitmodules' '
@@ -52,7 +52,7 @@ test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .gitm
git config -f .gitmodules submodule.submodule.path submodule &&
git config -f .gitmodules submodule.submodule.ignore untracked &&
git checkout HEAD >actual 2>&1 &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .git/config' '
@@ -60,7 +60,7 @@ test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .git/
git config submodule.submodule.path submodule &&
git config submodule.submodule.ignore all &&
git checkout HEAD >actual 2>&1 &&
- ! test -s actual
+ test_must_be_empty actual
'
KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
diff --git a/t/t2204-add-ignored.sh b/t/t2204-add-ignored.sh
index 8340ac2f07..2e07365bbb 100755
--- a/t/t2204-add-ignored.sh
+++ b/t/t2204-add-ignored.sh
@@ -31,7 +31,7 @@ do
rm -f .git/index &&
test_must_fail git add "$i" 2>err &&
git ls-files "$i" >out &&
- ! test -s out
+ test_must_be_empty out
'
test_expect_success "complaints for ignored $i output" '
@@ -42,7 +42,7 @@ do
rm -f .git/index &&
test_must_fail git add "$i" file 2>err &&
git ls-files "$i" >out &&
- ! test -s out
+ test_must_be_empty out
'
test_expect_success "complaints for ignored $i with unignored file output" '
test_i18ngrep -e "Use -f if" err
@@ -57,7 +57,7 @@ do
cd dir &&
test_must_fail git add "$i" 2>err &&
git ls-files "$i" >out &&
- ! test -s out
+ test_must_be_empty out
)
'
@@ -77,7 +77,7 @@ do
cd sub &&
test_must_fail git add "$i" 2>err &&
git ls-files "$i" >out &&
- ! test -s out
+ test_must_be_empty out
)
'
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index b8fbdefcdc..b178a376c4 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -382,7 +382,7 @@ test_expect_success 'rm does not complain when no .gitmodules file is found' '
git submodule update &&
git rm .gitmodules &&
git rm submod >actual 2>actual.err &&
- ! test -s actual.err &&
+ test_must_be_empty actual.err &&
! test -d submod &&
! test -f submod/.git &&
git status -s -uno >actual &&
@@ -400,7 +400,7 @@ test_expect_success 'rm will error out on a modified .gitmodules file unless sta
git diff-files --quiet -- submod &&
git add .gitmodules &&
git rm submod >actual 2>actual.err &&
- ! test -s actual.err &&
+ test_must_be_empty actual.err &&
! test -d submod &&
! test -f submod/.git &&
git status -s -uno >actual &&
@@ -694,7 +694,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual
test_cmp expected actual &&
rm -rf submod &&
git status -s -uno --ignore-submodules=none >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'rm of d/f when d has become a non-directory' '
diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh
index 108c012a3a..5ae19b987d 100755
--- a/t/t4011-diff-symlink.sh
+++ b/t/t4011-diff-symlink.sh
@@ -126,7 +126,7 @@ test_expect_success SYMLINKS 'diff symlinks with non-existing targets' '
ln -s take\ over brain &&
test_must_fail git diff --no-index pinky brain >output 2>output.err &&
grep narf output &&
- ! test -s output.err
+ test_must_be_empty output.err
'
test_expect_success SYMLINKS 'setup symlinks with attributes' '
diff --git a/t/t4019-diff-wserror.sh b/t/t4019-diff-wserror.sh
index a5019759bc..c6135c7548 100755
--- a/t/t4019-diff-wserror.sh
+++ b/t/t4019-diff-wserror.sh
@@ -260,7 +260,7 @@ test_expect_success 'trailing empty lines (2)' '
echo "F -whitespace" >.gitattributes &&
git diff --check >output &&
- ! test -s output
+ test_must_be_empty output
'
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 6304130ad4..e5f9eb7a11 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -104,19 +104,19 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)'
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual.body &&
git diff --ignore-submodules HEAD >actual2 &&
- ! test -s actual2 &&
+ test_must_be_empty actual2 &&
git diff --ignore-submodules=untracked HEAD >actual3 &&
sed -e "1,/^@@/d" actual3 >actual3.body &&
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual3.body &&
git diff --ignore-submodules=dirty HEAD >actual4 &&
- ! test -s actual4
+ test_must_be_empty actual4
'
test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]' '
git config diff.ignoreSubmodules dirty &&
git diff HEAD >actual &&
- ! test -s actual &&
+ test_must_be_empty actual &&
git config --add -f .gitmodules submodule.subname.ignore none &&
git config --add -f .gitmodules submodule.subname.path sub &&
git diff HEAD >actual &&
@@ -126,7 +126,7 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)
git config -f .gitmodules submodule.subname.ignore all &&
git config -f .gitmodules submodule.subname.path sub &&
git diff HEAD >actual2 &&
- ! test -s actual2 &&
+ test_must_be_empty actual2 &&
git config -f .gitmodules submodule.subname.ignore untracked &&
git diff HEAD >actual3 &&
sed -e "1,/^@@/d" actual3 >actual3.body &&
@@ -134,7 +134,7 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)
test_cmp expect.body actual3.body &&
git config -f .gitmodules submodule.subname.ignore dirty &&
git diff HEAD >actual4 &&
- ! test -s actual4 &&
+ test_must_be_empty actual4 &&
git config submodule.subname.ignore none &&
git config submodule.subname.path sub &&
git diff HEAD >actual &&
@@ -172,24 +172,24 @@ test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)'
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual.body &&
git diff --ignore-submodules=all HEAD >actual2 &&
- ! test -s actual2 &&
+ test_must_be_empty actual2 &&
git diff --ignore-submodules=untracked HEAD >actual3 &&
- ! test -s actual3 &&
+ test_must_be_empty actual3 &&
git diff --ignore-submodules=dirty HEAD >actual4 &&
- ! test -s actual4
+ test_must_be_empty actual4
'
test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]' '
git config --add -f .gitmodules submodule.subname.ignore all &&
git config --add -f .gitmodules submodule.subname.path sub &&
git diff HEAD >actual2 &&
- ! test -s actual2 &&
+ test_must_be_empty actual2 &&
git config -f .gitmodules submodule.subname.ignore untracked &&
git diff HEAD >actual3 &&
- ! test -s actual3 &&
+ test_must_be_empty actual3 &&
git config -f .gitmodules submodule.subname.ignore dirty &&
git diff HEAD >actual4 &&
- ! test -s actual4 &&
+ test_must_be_empty actual4 &&
git config submodule.subname.ignore none &&
git config submodule.subname.path sub &&
git diff HEAD >actual &&
@@ -211,7 +211,7 @@ test_expect_success 'git diff between submodule commits' '
expect_from_to >expect.body $subtip $subprev &&
test_cmp expect.body actual.body &&
git diff --ignore-submodules HEAD^..HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'git diff between submodule commits [.gitmodules]' '
@@ -227,7 +227,7 @@ test_expect_success 'git diff between submodule commits [.gitmodules]' '
test_cmp expect.body actual.body &&
git config -f .gitmodules submodule.subname.ignore all &&
git diff HEAD^..HEAD >actual &&
- ! test -s actual &&
+ test_must_be_empty actual &&
git config submodule.subname.ignore dirty &&
git config submodule.subname.path sub &&
git diff HEAD^..HEAD >actual &&
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index 058ee0829d..302f2166a9 100755
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -273,17 +273,17 @@ test_expect_success 'submodule contains untracked content' '
test_expect_success 'submodule contains untracked content (untracked ignored)' '
git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'submodule contains untracked content (dirty ignored)' '
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'submodule contains untracked content (all ignored)' '
git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'submodule contains untracked and modifed content' '
@@ -308,13 +308,13 @@ test_expect_success 'submodule contains untracked and modifed content (untracked
test_expect_success 'submodule contains untracked and modifed content (dirty ignored)' '
echo new > sm1/foo6 &&
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'submodule contains untracked and modifed content (all ignored)' '
echo new > sm1/foo6 &&
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'submodule contains modifed content' '
@@ -368,7 +368,7 @@ test_expect_success 'modified submodule contains untracked content (dirty ignore
test_expect_success 'modified submodule contains untracked content (all ignored)' '
git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'modified submodule contains untracked and modifed content' '
@@ -407,7 +407,7 @@ test_expect_success 'modified submodule contains untracked and modifed content (
test_expect_success 'modified submodule contains untracked and modifed content (all ignored)' '
echo modification >> sm1/foo6 &&
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'modified submodule contains modifed content' '
diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh
index 4b168d0ed7..6fc3da8bd2 100755
--- a/t/t4060-diff-submodule-option-diff-format.sh
+++ b/t/t4060-diff-submodule-option-diff-format.sh
@@ -408,17 +408,17 @@ test_expect_success 'submodule contains untracked content' '
test_expect_success 'submodule contains untracked content (untracked ignored)' '
git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'submodule contains untracked content (dirty ignored)' '
git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'submodule contains untracked content (all ignored)' '
git diff-index -p --ignore-submodules=all --submodule=diff HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'submodule contains untracked and modified content' '
@@ -458,13 +458,13 @@ test_expect_success 'submodule contains untracked and modified content (untracke
test_expect_success 'submodule contains untracked and modified content (dirty ignored)' '
echo new > sm1/foo6 &&
git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'submodule contains untracked and modified content (all ignored)' '
echo new > sm1/foo6 &&
git diff-index -p --ignore-submodules --submodule=diff HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'submodule contains modified content' '
@@ -549,7 +549,7 @@ test_expect_success 'modified submodule contains untracked content (dirty ignore
test_expect_success 'modified submodule contains untracked content (all ignored)' '
git diff-index -p --ignore-submodules=all --submodule=diff HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'modified submodule contains untracked and modified content' '
@@ -609,7 +609,7 @@ test_expect_success 'modified submodule contains untracked and modified content
test_expect_success 'modified submodule contains untracked and modified content (all ignored)' '
echo modification >> sm1/foo6 &&
git diff-index -p --ignore-submodules --submodule=diff HEAD >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
# NOT OK
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index 4fc27c51f7..7e32237a2a 100755
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -100,7 +100,7 @@ test_expect_success 'whitespace=warn, default rule' '
test_expect_success 'whitespace=error-all, default rule' '
test_must_fail apply_patch --whitespace=error-all &&
- ! test -s target
+ test_must_be_empty target
'
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 1ebc587f8f..38fe717c12 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -651,7 +651,7 @@ test_expect_success 'am -3 -q is quiet' '
git checkout -f lorem2 &&
git reset base3way --hard &&
git am -3 -q lorem-move.patch >output.out 2>&1 &&
- ! test -s output.out
+ test_must_be_empty output.out
'
test_expect_success 'am pauses on conflict' '
@@ -874,7 +874,7 @@ test_expect_success 'am -q is quiet' '
git checkout first &&
test_tick &&
git am -q <patch1 >output.out 2>&1 &&
- ! test -s output.out
+ test_must_be_empty output.out
'
test_expect_success 'am empty-file does not infloop' '
diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh
index 7f278d8ce9..ce151e71c1 100755
--- a/t/t5401-update-hooks.sh
+++ b/t/t5401-update-hooks.sh
@@ -104,17 +104,17 @@ test_expect_success 'post-update hook arguments' '
'
test_expect_success 'all hook stdin is /dev/null' '
- ! test -s victim.git/update.stdin &&
- ! test -s victim.git/post-update.stdin
+ test_must_be_empty victim.git/update.stdin &&
+ test_must_be_empty victim.git/post-update.stdin
'
test_expect_success 'all *-receive hook args are empty' '
- ! test -s victim.git/pre-receive.args &&
- ! test -s victim.git/post-receive.args
+ test_must_be_empty victim.git/pre-receive.args &&
+ test_must_be_empty victim.git/post-receive.args
'
test_expect_success 'send-pack produced no output' '
- ! test -s send.out
+ test_must_be_empty send.out
'
cat <<EOF >expect
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 3d33ab3875..07fcea0474 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -161,7 +161,7 @@ test_expect_success 'clone shallow object count' '
test_expect_success 'clone shallow object count (part 2)' '
sed -e "/^in-pack:/d" -e "/^packs:/d" -e "/^size-pack:/d" \
-e "/: 0$/d" count.shallow > count_output &&
- ! test -s count_output
+ test_must_be_empty count_output
'
test_expect_success 'fsck in shallow repo' '
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 359e03ff83..ce3af92843 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -98,8 +98,8 @@ test_expect_success "fetch alone only fetches superproject" '
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
- ! test -s actual.out &&
- ! test -s actual.err
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err
'
test_expect_success "fetch --no-recurse-submodules only fetches superproject" '
@@ -107,8 +107,8 @@ test_expect_success "fetch --no-recurse-submodules only fetches superproject" '
cd downstream &&
git fetch --no-recurse-submodules >../actual.out 2>../actual.err
) &&
- ! test -s actual.out &&
- ! test -s actual.err
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err
'
test_expect_success "using fetchRecurseSubmodules=true in .gitmodules recurses into submodules" '
@@ -127,8 +127,8 @@ test_expect_success "--no-recurse-submodules overrides .gitmodules config" '
cd downstream &&
git fetch --no-recurse-submodules >../actual.out 2>../actual.err
) &&
- ! test -s actual.out &&
- ! test -s actual.err
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err
'
test_expect_success "using fetchRecurseSubmodules=false in .git/config overrides setting in .gitmodules" '
@@ -137,8 +137,8 @@ test_expect_success "using fetchRecurseSubmodules=false in .git/config overrides
git config submodule.submodule.fetchRecurseSubmodules false &&
git fetch >../actual.out 2>../actual.err
) &&
- ! test -s actual.out &&
- ! test -s actual.err
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err
'
test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setting from .git/config" '
@@ -157,8 +157,8 @@ test_expect_success "--quiet propagates to submodules" '
cd downstream &&
git fetch --recurse-submodules --quiet >../actual.out 2>../actual.err
) &&
- ! test -s actual.out &&
- ! test -s actual.err
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err
'
test_expect_success "--quiet propagates to parallel submodules" '
@@ -166,8 +166,8 @@ test_expect_success "--quiet propagates to parallel submodules" '
cd downstream &&
git fetch --recurse-submodules -j 2 --quiet >../actual.out 2>../actual.err
) &&
- ! test -s actual.out &&
- ! test -s actual.err
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err
'
test_expect_success "--dry-run propagates to submodules" '
@@ -221,8 +221,8 @@ test_expect_success "--no-recurse-submodules overrides config setting" '
git config fetch.recurseSubmodules true &&
git fetch --no-recurse-submodules >../actual.out 2>../actual.err
) &&
- ! test -s actual.out &&
- ! test -s actual.err
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err
'
test_expect_success "Recursion doesn't happen when no new commits are fetched in the superproject" '
@@ -235,8 +235,8 @@ test_expect_success "Recursion doesn't happen when no new commits are fetched in
git config --unset fetch.recurseSubmodules &&
git fetch >../actual.out 2>../actual.err
) &&
- ! test -s actual.out &&
- ! test -s actual.err
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err
'
test_expect_success "Recursion stops when no new submodule commits are fetched" '
@@ -268,7 +268,7 @@ test_expect_success "Recursion doesn't happen when new superproject commits don'
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
- ! test -s actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err.file actual.err
'
@@ -357,8 +357,8 @@ test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no ne
git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err &&
git config --unset fetch.recurseSubmodules
) &&
- ! test -s actual.out &&
- ! test -s actual.err
+ test_must_be_empty actual.out &&
+ test_must_be_empty actual.err
'
test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)" '
@@ -402,7 +402,7 @@ test_expect_success "'--recurse-submodules=on-demand' stops when no new submodul
cd downstream &&
git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err
) &&
- ! test -s actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err.file actual.err
'
@@ -477,7 +477,7 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
- ! test -s actual.out &&
+ test_must_be_empty actual.out &&
test_i18ncmp expect.err actual.err &&
(
cd submodule &&
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index 0d4c52016b..12c1e43a84 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -51,7 +51,7 @@ test_expect_success 'no-op fetch -v stderr is as expected' '
test_expect_success 'no-op fetch without "-v" is quiet' '
(cd clone && git fetch 2>../stderr) &&
- ! test -s stderr
+ test_must_be_empty stderr
'
test_expect_success 'remote detects correct HEAD' '
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index cc3fd2baf2..56ca467c0a 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -384,7 +384,7 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
- ! test -s actual.err &&
+ test_must_be_empty actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
(
@@ -408,7 +408,7 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
git diff-files --quiet -- sub &&
git add .gitmodules &&
git mv sub mod/sub 2>actual.err &&
- ! test -s actual.err &&
+ test_must_be_empty actual.err &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
(
@@ -469,7 +469,7 @@ test_expect_success 'checking out a commit before submodule moved needs manual u
git update-index --refresh &&
git diff-files --quiet -- sub .gitmodules &&
git status -s sub2 >actual &&
- ! test -s actual
+ test_must_be_empty actual
'
test_expect_success 'mv -k does not accidentally destroy submodules' '
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index ab9da61da3..0e7d4421a7 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -139,7 +139,7 @@ test_expect_success "checkout -m with dirty tree, renamed" '
test_cmp expect uno &&
! test -f one &&
git diff --cached >current &&
- ! test -s current
+ test_must_be_empty current
'
@@ -163,7 +163,7 @@ test_expect_success 'checkout -m with merge conflict' '
fill d2 aT d7 aS >expect &&
test_cmp current expect &&
git diff --cached two >current &&
- ! test -s current
+ test_must_be_empty current
'
test_expect_success 'format of merge conflict from checkout -m' '
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 9e0d31700e..0fef49954f 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -174,7 +174,7 @@ test_expect_success 'submodule update does not fetch already present commits' '
git submodule update > ../actual 2> ../actual.err
) &&
test_i18ncmp expected actual &&
- ! test -s actual.err
+ test_must_be_empty actual.err
'
test_expect_success 'submodule update should fail due to local changes' '
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index fc44ec96aa..825da1404a 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -941,7 +941,7 @@ test_expect_success 'grep from a subdirectory to search wider area (2)' '
(
cd s || exit 1
( git grep xxyyzz .. >out ; echo $? >status )
- ! test -s out &&
+ test_must_be_empty out &&
test 1 = $(cat status)
)
'
diff --git a/t/t9131-git-svn-empty-symlink.sh b/t/t9131-git-svn-empty-symlink.sh
index f762038f0e..3bf4255aa3 100755
--- a/t/t9131-git-svn-empty-symlink.sh
+++ b/t/t9131-git-svn-empty-symlink.sh
@@ -85,7 +85,7 @@ EOF
test_expect_success 'clone using git svn' 'git svn clone -r1 "$svnrepo" x'
test_expect_success 'enable broken symlink workaround' \
'(cd x && git config svn.brokenSymlinkWorkaround true)'
-test_expect_success '"bar" is an empty file' 'test -f x/bar && ! test -s x/bar'
+test_expect_success '"bar" is an empty file' 'test_must_be_empty x/bar'
test_expect_success 'get "bar" => symlink fix from svn' \
'(cd x && git svn rebase)'
test_expect_success SYMLINKS '"bar" becomes a symlink' 'test -h x/bar'
@@ -94,14 +94,14 @@ test_expect_success SYMLINKS '"bar" becomes a symlink' 'test -h x/bar'
test_expect_success 'clone using git svn' 'git svn clone -r1 "$svnrepo" y'
test_expect_success 'disable broken symlink workaround' \
'(cd y && git config svn.brokenSymlinkWorkaround false)'
-test_expect_success '"bar" is an empty file' 'test -f y/bar && ! test -s y/bar'
+test_expect_success '"bar" is an empty file' 'test_must_be_empty y/bar'
test_expect_success 'get "bar" => symlink fix from svn' \
'(cd y && git svn rebase)'
test_expect_success '"bar" does not become a symlink' '! test -L y/bar'
# svn.brokenSymlinkWorkaround is unset
test_expect_success 'clone using git svn' 'git svn clone -r1 "$svnrepo" z'
-test_expect_success '"bar" is an empty file' 'test -f z/bar && ! test -s z/bar'
+test_expect_success '"bar" is an empty file' 'test_must_be_empty z/bar'
test_expect_success 'get "bar" => symlink fix from svn' \
'(cd z && git svn rebase)'
test_expect_success '"bar" does not become a symlink' '! test -L z/bar'
diff --git a/t/t9135-git-svn-moved-branch-empty-file.sh b/t/t9135-git-svn-moved-branch-empty-file.sh
index 93db45db7d..2f80b216fe 100755
--- a/t/t9135-git-svn-moved-branch-empty-file.sh
+++ b/t/t9135-git-svn-moved-branch-empty-file.sh
@@ -13,8 +13,7 @@ test_expect_success 'test that b1 exists and is empty' '
(
cd x &&
git reset --hard origin/branch-c &&
- test -f b1 &&
- ! test -s b1
+ test_must_be_empty b1
)
'
--
2.18.0.903.gab616d7dc6
^ permalink raw reply related [relevance 4%]
* [PATCH 0/4] tests: make more use of 'test_must_be_empty'
@ 2018-08-19 21:57 3% SZEDER Gábor
2018-08-19 21:57 4% ` [PATCH 1/4] tests: use 'test_must_be_empty' instead of '! test -s' SZEDER Gábor
0 siblings, 1 reply; 200+ results
From: SZEDER Gábor @ 2018-08-19 21:57 UTC (permalink / raw)
To: Junio C Hamano
Cc: git, Andrei Rybak, Ævar Arnfjörð Bjarmason,
SZEDER Gábor
This series is a continuation of and applies on top of
'ab/test-must-be-empty-for-master', and converts even more places to
use 'test_must_be_empty'.
There are still a bunch of cases in the form of 'test -z "$(cmd...)"'
that could use 'test_must_be_empty'... maybe someday.
SZEDER Gábor (4):
tests: use 'test_must_be_empty' instead of '! test -s'
tests: use 'test_must_be_empty' instead of 'test ! -s'
tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
t/t0000-basic.sh | 2 +-
t/t0001-init.sh | 5 +--
t/t0003-attributes.sh | 3 +-
t/t0030-stripspace.sh | 22 ++++------
t/t0040-parse-options.sh | 4 +-
t/t0061-run-command.sh | 9 ++--
t/t0090-cache-tree.sh | 2 +-
t/t0203-gettext-setlocale-sanity.sh | 4 +-
t/t1300-config.sh | 5 +--
t/t1410-reflog.sh | 3 +-
t/t1411-reflog-show.sh | 3 +-
t/t1450-fsck.sh | 11 +++--
t/t1501-work-tree.sh | 2 +-
t/t1510-repo-setup.sh | 24 +++++------
t/t1600-index.sh | 3 +-
t/t1700-split-index.sh | 4 +-
t/t2013-checkout-submodule.sh | 6 +--
t/t2200-add-update.sh | 3 +-
t/t2203-add-intent.sh | 6 +--
t/t2204-add-ignored.sh | 8 ++--
t/t3001-ls-files-others-exclude.sh | 6 +--
t/t3004-ls-files-basic.sh | 6 +--
t/t3035-merge-sparse.sh | 5 +--
t/t3210-pack-refs.sh | 6 +--
t/t3301-notes.sh | 4 +-
t/t3308-notes-merge.sh | 2 +-
t/t3310-notes-merge-manual-resolve.sh | 8 ++--
t/t3404-rebase-interactive.sh | 5 +--
t/t3600-rm.sh | 6 +--
t/t4011-diff-symlink.sh | 2 +-
t/t4015-diff-whitespace.sh | 4 +-
t/t4019-diff-wserror.sh | 2 +-
t/t4027-diff-submodule.sh | 29 ++++++-------
t/t4041-diff-submodule-option.sh | 18 ++++----
t/t4047-diff-dirstat.sh | 4 +-
t/t4060-diff-submodule-option-diff-format.sh | 18 ++++----
t/t4116-apply-reverse.sh | 2 +-
t/t4124-apply-ws-rule.sh | 2 +-
t/t4132-apply-removal.sh | 5 +--
t/t4150-am.sh | 4 +-
t/t4201-shortlog.sh | 2 +-
t/t4203-mailmap.sh | 4 +-
t/t4211-line-log.sh | 2 +-
t/t4212-log-corrupt.sh | 6 +--
t/t4300-merge-tree.sh | 34 +++------------
t/t5304-prune.sh | 3 +-
t/t5314-pack-cycle-detection.sh | 3 +-
t/t5401-update-hooks.sh | 10 ++---
t/t5500-fetch-pack.sh | 2 +-
t/t5509-fetch-push-namespaces.sh | 2 +-
t/t5523-push-upstream.sh | 2 +-
t/t5526-fetch-submodules.sh | 45 ++++++++++----------
t/t5541-http-push-smart.sh | 2 +-
t/t5570-git-daemon.sh | 2 +-
t/t6112-rev-list-filters-objects.sh | 3 +-
t/t6120-describe.sh | 3 +-
t/t6130-pathspec-noglob.sh | 9 ++--
t/t6200-fmt-merge-msg.sh | 4 +-
t/t7001-mv.sh | 6 +--
t/t7004-tag.sh | 8 +---
t/t7008-grep-binary.sh | 6 +--
t/t7064-wtstatus-pv2.sh | 5 +--
t/t7201-co.sh | 7 ++-
t/t7400-submodule-basic.sh | 28 ++++--------
t/t7401-submodule-summary.sh | 2 +-
t/t7406-submodule-update.sh | 2 +-
t/t7501-commit.sh | 6 +--
t/t7600-merge.sh | 9 ++--
t/t7610-mergetool.sh | 3 +-
t/t7810-grep.sh | 35 ++++++---------
t/t7811-grep-open.sh | 18 +++-----
t/t8010-cat-file-filters.sh | 2 +-
t/t9011-svn-da.sh | 14 +++---
t/t9131-git-svn-empty-symlink.sh | 6 +--
t/t9135-git-svn-moved-branch-empty-file.sh | 3 +-
t/t9200-git-cvsexportcommit.sh | 4 +-
t/t9802-git-p4-filetype.sh | 2 +-
t/t9903-bash-prompt.sh | 6 +--
78 files changed, 232 insertions(+), 345 deletions(-)
--
2.18.0.903.gab616d7dc6
^ permalink raw reply [relevance 3%]
* Re: [RFC PATCH v2 10/12] t7416: add new test about HEAD:.gitmodules and not existing .gitmodules
2018-08-02 20:43 0% ` Stefan Beller
@ 2018-08-09 9:14 5% ` Antonio Ospite
0 siblings, 0 replies; 200+ results
From: Antonio Ospite @ 2018-08-09 9:14 UTC (permalink / raw)
To: Stefan Beller
Cc: git, Brandon Williams, Daniel Graña, Jonathan Nieder,
Richard Hartmann
On Thu, 2 Aug 2018 13:43:05 -0700
Stefan Beller <sbeller@google.com> wrote:
> On Thu, Aug 2, 2018 at 6:47 AM Antonio Ospite <ao2@ao2.it> wrote:
> >
> > git submodule commands can now access .gitmodules from the current
> > branch even when it's not in the working tree, add some tests for that
> > scenario.
> >
> > Signed-off-by: Antonio Ospite <ao2@ao2.it>
> > ---
[...]
> > +NOTE: "git mv" and "git rm" are still supposed to work even without
> > +a .gitmodules file, as stated in the t3600-rm.sh and t7001-mv.sh tests.
>
> "supposed to work" != "tested that it works" ?
"git mv submod new_submod" and "git rm submod" are actually expected to
work without the .gitmodules file, and there are tests about that in
t3600-rm.sh and t7001-mv.sh:
t3600-rm.sh:
'rm does not complain when no .gitmodules file is found'
t7001-mv.sh:
'git mv moves a submodule with a .git directory and no .gitmodules'
'mv does not complain when no .gitmodules file is found'
> I am not sure what the NOTE wants to tell me? (Should I review those
> tests to double check them now? or do we just want to tell future readers
> of this test there are other tangent tests to this?)
>
Admittedly the NOTE is not useful without any context: during the
development of "submodule--helper config --stage" I initially assumed
that "git mv" and "git rm" should fail if .gitmodules was not available,
because these commands modify .gitmodules and I added code for that in
stage_updated_gitmodules().
But then later I found out that my assumption was wrong and that git has
tests to verify that these operations on submodules succeed even when
.gitmodules does not exist, which was a little of a surprise to me.
So I removed all my code that was conflicting with git assumptions, and
added the NOTE. However I guess that was primarily a note to myself, and
it should have not slipped in the public patches.
I think I will remove the note, it can be confusing and does not really
add anything, and even less considering that "submodule--helper config
--stage" is going to be dropped.
[...]
> > +test_expect_success 'not adding submodules when the gitmodules config is not checked out' '
> > + (cd super &&
> > + test_must_fail git submodule add ../new_submodule
> > + )
> > +'
> > +
> > +# "git add" in the test above fails as expected, however it still leaves the
> > +# cloned tree in there and adds a config entry to .git/config. This is because
> > +# no cleanup is done by cmd_add in git-submodule.sh when "git
> > +# submodule--helper config" fails to add a new config setting.
> > +#
> > +# If we added the following commands to the test above:
> > +#
> > +# rm -rf .git/modules/new_submodule &&
> > +# git reset HEAD new_submodule &&
> > +# rm -rf new_submodule
>
> Alternatively we could check for the existence of .gitmodules
> before starting all these things?
>
You mean in cmd_add(), before doing anything?
The following would anticipates the same check which makes "git submodule
add" fail:
diff --git a/git-submodule.sh b/git-submodule.sh
index ff258e2e8c..b261175143 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -159,6 +159,11 @@ cmd_add()
shift
done
+ if test ! -e .gitmodules && git cat-file -e HEAD:.gitmodules
+ then
+ die "$(eval_gettext "please make sure that the .gitmodules file in the current branch is checked out")"
+ fi
+
if test -n "$reference_path"
then
is_absolute_path "$reference_path" ||
This refers to .gitmodules explicitly but we said that we do not care
about that for now, if opaque access was ever needed in the future,
something like "submodule--helper config --is-writeable" could be added.
> I think it is okay to not clean up if we check all "regular" or rather expected
> things such as a non-writable .gitmodules file before actually doing it.
> (This is similar to 'checkout' that walks the whole tree and checks if the
> checkout is possible given the dirtyness of the tree, to either abort early
> or pull through completely. In catastrophic problems such as a full disk
> we'd still die in the middle of work)
>
> > +#
> > +# then the repository would be in a clean state and the test below would pass.
> > +#
> > +# Maybe cmd_add should do the cleanup from above itself when failing to add
> > +# a submodule.
> > +test_expect_failure 'init submodule after adding failed when the gitmodules config is not checked out' '
>
> So this comment and test is about explaining why we can fail mid way through,
> which we could not before unless we had the catastrophic event.
>
> I think we should check for a "writable" .gitmodules file at the beginning,
> which is if (G || (!G && !H)) [using the notation from the cover letter]?
>
> > + (cd super &&
> > + git submodule init
With the change from above this last test passes.
BTW the check I am using here and in the code of submodule--helper,
corresponds indeed to the boolean expression you mentioned, but
simplified and negated.
Thanks,
Antonio
--
Antonio Ospite
https://ao2.it
https://twitter.com/ao2it
A: Because it messes up the order in which people normally read text.
See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?
^ permalink raw reply related [relevance 5%]
* Re: [RFC PATCH v2 10/12] t7416: add new test about HEAD:.gitmodules and not existing .gitmodules
2018-08-02 13:46 6% ` [RFC PATCH v2 10/12] t7416: add new test about HEAD:.gitmodules and not existing .gitmodules Antonio Ospite
@ 2018-08-02 20:43 0% ` Stefan Beller
2018-08-09 9:14 5% ` Antonio Ospite
0 siblings, 1 reply; 200+ results
From: Stefan Beller @ 2018-08-02 20:43 UTC (permalink / raw)
To: Antonio Ospite
Cc: git, Brandon Williams, Daniel Graña, Jonathan Nieder,
Richard Hartmann
On Thu, Aug 2, 2018 at 6:47 AM Antonio Ospite <ao2@ao2.it> wrote:
>
> git submodule commands can now access .gitmodules from the current
> branch even when it's not in the working tree, add some tests for that
> scenario.
>
> Signed-off-by: Antonio Ospite <ao2@ao2.it>
> ---
>
> For the test files I used the most used style in other tests, Stefan suggested
> to avoid subshells and use "git -C" but subshells make the test look cleaner
> IMHO.
Oh well. Let's not dive into a style argument, so let me focus on the tests.
IMHO it would be nice if (at least partially) these tests are in the same patch
that added the reading from HEAD:.gitmodules (although I like short
patches, too).
>
> t/t7416-submodule-sparse-gitmodules.sh | 112 +++++++++++++++++++++++++
> 1 file changed, 112 insertions(+)
> create mode 100755 t/t7416-submodule-sparse-gitmodules.sh
>
> diff --git a/t/t7416-submodule-sparse-gitmodules.sh b/t/t7416-submodule-sparse-gitmodules.sh
> new file mode 100755
> index 0000000000..3c7a53316b
> --- /dev/null
> +++ b/t/t7416-submodule-sparse-gitmodules.sh
> @@ -0,0 +1,112 @@
> +#!/bin/sh
> +#
> +# Copyright (C) 2018 Antonio Ospite <ao2@ao2.it>
> +#
> +
> +test_description=' Test reading/writing .gitmodules is not in the working tree
> +
> +This test verifies that, when .gitmodules is in the current branch but is not
> +in the working tree reading from it still works but writing to it does not.
> +
> +The test setup uses a sparse checkout, but the same scenario can be set up
> +also by committing .gitmodules and then just removing it from the filesystem.
> +
> +NOTE: "git mv" and "git rm" are still supposed to work even without
> +a .gitmodules file, as stated in the t3600-rm.sh and t7001-mv.sh tests.
"supposed to work" != "tested that it works" ?
I am not sure what the NOTE wants to tell me? (Should I review those
tests to double check them now? or do we just want to tell future readers
of this test there are other tangent tests to this?)
> +test_expect_success 'initialising submodule when the gitmodules config is not checked out' '
> + (cd super &&
> + git submodule init
> + )
> +'
> +
> +test_expect_success 'showing submodule summary when the gitmodules config is not checked out' '
> + (cd super &&
> + git submodule summary
> + )
> +'
> +
> +test_expect_success 'updating submodule when the gitmodules config is not checked out' '
> + (cd submodule &&
> + echo file2 >file2 &&
> + git add file2 &&
> + git commit -m "add file2 to submodule"
> + ) &&
> + (cd super &&
> + git submodule update
> + )
> +'
> +
> +test_expect_success 'not adding submodules when the gitmodules config is not checked out' '
> + (cd super &&
> + test_must_fail git submodule add ../new_submodule
> + )
> +'
> +
> +# "git add" in the test above fails as expected, however it still leaves the
> +# cloned tree in there and adds a config entry to .git/config. This is because
> +# no cleanup is done by cmd_add in git-submodule.sh when "git
> +# submodule--helper config" fails to add a new config setting.
> +#
> +# If we added the following commands to the test above:
> +#
> +# rm -rf .git/modules/new_submodule &&
> +# git reset HEAD new_submodule &&
> +# rm -rf new_submodule
Alternatively we could check for the existence of .gitmodules
before starting all these things?
I think it is okay to not clean up if we check all "regular" or rather expected
things such as a non-writable .gitmodules file before actually doing it.
(This is similar to 'checkout' that walks the whole tree and checks if the
checkout is possible given the dirtyness of the tree, to either abort early
or pull through completely. In catastrophic problems such as a full disk
we'd still die in the middle of work)
> +#
> +# then the repository would be in a clean state and the test below would pass.
> +#
> +# Maybe cmd_add should do the cleanup from above itself when failing to add
> +# a submodule.
> +test_expect_failure 'init submodule after adding failed when the gitmodules config is not checked out' '
So this comment and test is about explaining why we can fail mid way through,
which we could not before unless we had the catastrophic event.
I think we should check for a "writable" .gitmodules file at the beginning,
which is if (G || (!G && !H)) [using the notation from the cover letter]?
> + (cd super &&
> + git submodule init
> + )
> +'
> +
> +test_done
> --
> 2.18.0
>
^ permalink raw reply [relevance 0%]
* [RFC PATCH v2 00/12] Make submodules work if .gitmodules is not checked out
@ 2018-08-02 13:46 3% Antonio Ospite
2018-08-02 13:46 6% ` [RFC PATCH v2 10/12] t7416: add new test about HEAD:.gitmodules and not existing .gitmodules Antonio Ospite
0 siblings, 1 reply; 200+ results
From: Antonio Ospite @ 2018-08-02 13:46 UTC (permalink / raw)
To: git
Cc: Brandon Williams, Daniel Graña, Jonathan Nieder,
Richard Hartmann, Stefan Beller, Antonio Ospite
Hi,
this is a second version of the RFC from
https://public-inbox.org/git/20180514105823.8378-1-ao2@ao2.it/
Please refer to the cover letter of the previous series for the
motivation and background of the changes.
Patches from 01 to 08 should be rather uncontroversial, as they do not
introduce any change of behavior but just prepare the ground for patches
09 and 10.
The last two patches, 11 and 12 are not strictly related to the topic,
it's just an idea I came up with while reading the code for the series;
I could send them separately if you think they are valid, or drop them.
The behavior of accessing HEAD:.gitmodules have been analyzed with the
following test matrix:
Predicates:
G = .gitmodules exists
H = HEAD:.gitmodules exists
Operations:
read = git submodule--helper config name
write = git submodule--helper config name value
stage = git submodule--helper config --stage
!G and !H:
- read: nop
- write: set value to .gitmodules (we are creating a brand new
.gitmodules)
- stage: exit with error, staging requires .gitmodules (like git
add/rm)
G and !H:
- read: get value from from .gitmodules
- write: set value to .gitmodules
- stage: stage .gitmodules
!G and H:
- read: get the value from HEAD:.gitmodules
- write: exit with error, setting a value requires .gitmodules
- stage: exit with error, staging requires .gitmodules
G and H:
- read: get value from from .gitmodules
- write: set value to .gitmodules
- stage: stage .gitmodules
Note that "git rm" and "git mv" will keep working when !G just as
t3600-rm.sh and t7001-mv.sh mandate, I am not sure if they should fail
if "!G and H".
In my previous attempt I also tried to check for the skip-worktree bit,
but I am not sure if this is needed.
My intuition suggested the following behavior to cover the case of
a manually crafted .gitmodules which could be committed and override the
hidden one:
S = .gitmodules has the skip-worktree bit set
S:
- read: get value from .gitmodules if G or from HEAD:.gitmodules if H
- write: exit with error, .gitmodules is not supposed to be changed
- stage: exit with error, .gitmodules is not supposed to be changed
However it looks like git gives the user quite some freedom to add,
stage, commit, remove files even when they have the skip-worktree bit
set (which was a little surprising to me TBH) so I am leaving this out
for now.
Changes since v1:
* Added a helper to print config values from the gitmodules
configuration, the code is now in submoudle-config.c instead of
buildtin/submodule--helper.c
* Renamed config_gitmodules_set to
config_set_in_gitmodules_file_gently and put it in
submodule-config.c instead of submodule.c
The naming follows the style of git config functions, and also takes
into account Stefan Beller's comment about the final purpose of the
function: we only write gitmodules config to the actual .gitmodules
file, so we may as well reflect that in the function name,
* Started using "working tree" instead of "work tree" as the former is
the official term for the set of checked out files.
* Start referring to HEAD as the "current branch" instead of "the
index", the former should be more accurate.
* Renamed GITMODULES_BLOB to GITMODULES_HEAD because GITMODULES_BLOB
was added in commit 59e7b080 ("fsck: detect gitmodules files",
2018-05-02)
* Do not check for the skip-worktree bit on .gitmodules anymore, just
check for file existence when appropriate.
* Renamed t7415-submodule-sparse-gitmodules.sh to
t7416-submodule-sparse-gitmodules.sh because t7415 was taken by
t7415-submodule-names.sh
* Made "git mv" and "git rm" work again when .gitmodules does not
exist.
* Removed checks about the skip-worktree bit.
Thanks,
Antonio
Antonio Ospite (12):
submodule: add a print_config_from_gitmodules() helper
submodule: factor out a config_set_in_gitmodules_file_gently function
t7411: be nicer to future tests and really clean things up
submodule--helper: add a new 'config' subcommand
submodule: use the 'submodule--helper config' command
submodule--helper: add a '--stage' option to the 'config' sub command
submodule: use 'submodule--helper config --stage' to stage .gitmodules
t7506: cleanup .gitmodules properly before setting up new scenario
submodule: support reading .gitmodules even when it's not checked out
t7416: add new test about HEAD:.gitmodules and not existing
.gitmodules
dir: move is_empty_file() from builtin/am.c to dir.c and make it
public
submodule: remove the .gitmodules file when it is empty
builtin/am.c | 15 ----
builtin/submodule--helper.c | 82 ++++++++++++++++++
cache.h | 1 +
dir.c | 16 ++++
dir.h | 1 +
git-submodule.sh | 10 +--
submodule-config.c | 53 +++++++++++-
submodule-config.h | 3 +
submodule.c | 20 +++--
t/t3600-rm.sh | 32 +++----
t/t7400-submodule-basic.sh | 11 +++
t/t7411-submodule-config.sh | 65 +++++++++++++-
t/t7416-submodule-sparse-gitmodules.sh | 112 +++++++++++++++++++++++++
t/t7506-status-submodule.sh | 3 +-
14 files changed, 375 insertions(+), 49 deletions(-)
create mode 100755 t/t7416-submodule-sparse-gitmodules.sh
--
Antonio Ospite
https://ao2.it
https://twitter.com/ao2it
A: Because it messes up the order in which people normally read text.
See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?
^ permalink raw reply [relevance 3%]
* [RFC PATCH v2 10/12] t7416: add new test about HEAD:.gitmodules and not existing .gitmodules
2018-08-02 13:46 3% [RFC PATCH v2 00/12] Make submodules work if .gitmodules is not checked out Antonio Ospite
@ 2018-08-02 13:46 6% ` Antonio Ospite
2018-08-02 20:43 0% ` Stefan Beller
0 siblings, 1 reply; 200+ results
From: Antonio Ospite @ 2018-08-02 13:46 UTC (permalink / raw)
To: git
Cc: Brandon Williams, Daniel Graña, Jonathan Nieder,
Richard Hartmann, Stefan Beller, Antonio Ospite
git submodule commands can now access .gitmodules from the current
branch even when it's not in the working tree, add some tests for that
scenario.
Signed-off-by: Antonio Ospite <ao2@ao2.it>
---
For the test files I used the most used style in other tests, Stefan suggested
to avoid subshells and use "git -C" but subshells make the test look cleaner
IMHO.
t/t7416-submodule-sparse-gitmodules.sh | 112 +++++++++++++++++++++++++
1 file changed, 112 insertions(+)
create mode 100755 t/t7416-submodule-sparse-gitmodules.sh
diff --git a/t/t7416-submodule-sparse-gitmodules.sh b/t/t7416-submodule-sparse-gitmodules.sh
new file mode 100755
index 0000000000..3c7a53316b
--- /dev/null
+++ b/t/t7416-submodule-sparse-gitmodules.sh
@@ -0,0 +1,112 @@
+#!/bin/sh
+#
+# Copyright (C) 2018 Antonio Ospite <ao2@ao2.it>
+#
+
+test_description=' Test reading/writing .gitmodules is not in the working tree
+
+This test verifies that, when .gitmodules is in the current branch but is not
+in the working tree reading from it still works but writing to it does not.
+
+The test setup uses a sparse checkout, but the same scenario can be set up
+also by committing .gitmodules and then just removing it from the filesystem.
+
+NOTE: "git mv" and "git rm" are still supposed to work even without
+a .gitmodules file, as stated in the t3600-rm.sh and t7001-mv.sh tests.
+'
+
+. ./test-lib.sh
+
+test_expect_success 'sparse checkout setup which hides .gitmodules' '
+ echo file > file &&
+ git add file &&
+ test_tick &&
+ git commit -m upstream &&
+ git clone . super &&
+ git clone super submodule &&
+ git clone super new_submodule &&
+ (cd super &&
+ git submodule add ../submodule
+ test_tick &&
+ git commit -m submodule &&
+ cat >.git/info/sparse-checkout <<\EOF &&
+/*
+!/.gitmodules
+EOF
+ git config core.sparsecheckout true &&
+ git read-tree -m -u HEAD &&
+ test ! -e .gitmodules
+ )
+'
+
+test_expect_success 'reading gitmodules config file when it is not checked out' '
+ (cd super &&
+ echo "../submodule" >expected &&
+ git submodule--helper config submodule.submodule.url >actual &&
+ test_cmp expected actual
+ )
+'
+
+test_expect_success 'not writing gitmodules config file when it is not checked out' '
+ (cd super &&
+ test_must_fail git submodule--helper config submodule.submodule.url newurl
+ )
+'
+
+test_expect_success 'not staging gitmodules config when it is not checked out' '
+ (cd super &&
+ test_must_fail git submodule--helper config --stage
+ )
+'
+
+test_expect_success 'initialising submodule when the gitmodules config is not checked out' '
+ (cd super &&
+ git submodule init
+ )
+'
+
+test_expect_success 'showing submodule summary when the gitmodules config is not checked out' '
+ (cd super &&
+ git submodule summary
+ )
+'
+
+test_expect_success 'updating submodule when the gitmodules config is not checked out' '
+ (cd submodule &&
+ echo file2 >file2 &&
+ git add file2 &&
+ git commit -m "add file2 to submodule"
+ ) &&
+ (cd super &&
+ git submodule update
+ )
+'
+
+test_expect_success 'not adding submodules when the gitmodules config is not checked out' '
+ (cd super &&
+ test_must_fail git submodule add ../new_submodule
+ )
+'
+
+# "git add" in the test above fails as expected, however it still leaves the
+# cloned tree in there and adds a config entry to .git/config. This is because
+# no cleanup is done by cmd_add in git-submodule.sh when "git
+# submodule--helper config" fails to add a new config setting.
+#
+# If we added the following commands to the test above:
+#
+# rm -rf .git/modules/new_submodule &&
+# git reset HEAD new_submodule &&
+# rm -rf new_submodule
+#
+# then the repository would be in a clean state and the test below would pass.
+#
+# Maybe cmd_add should do the cleanup from above itself when failing to add
+# a submodule.
+test_expect_failure 'init submodule after adding failed when the gitmodules config is not checked out' '
+ (cd super &&
+ git submodule init
+ )
+'
+
+test_done
--
2.18.0
^ permalink raw reply related [relevance 6%]
* [PATCH 23/25] t7000-t7999: fix broken &&-chains
2018-07-02 0:23 1% [PATCH 00/25] fix buggy tests, modernize tests, fix broken &&-chains Eric Sunshine
@ 2018-07-02 0:24 8% ` Eric Sunshine
0 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2018-07-02 0:24 UTC (permalink / raw)
To: git
Cc: Elijah Newren, Johannes Sixt, Jonathan Nieder, Jonathan Tan,
Stefan Beller, Junio C Hamano, Luke Diamand, Jeff King,
Eric Sunshine
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
t/t7001-mv.sh | 2 +-
t/t7201-co.sh | 40 +++++++++++++-------------
t/t7400-submodule-basic.sh | 2 +-
t/t7406-submodule-update.sh | 6 ++--
t/t7408-submodule-reference.sh | 2 +-
t/t7501-commit.sh | 52 +++++++++++++++++-----------------
t/t7506-status-submodule.sh | 10 +++----
7 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index cc3fd2baf2..9e59e5a5dd 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -509,7 +509,7 @@ test_expect_success 'moving nested submodules' '
touch nested_level1 &&
git init &&
git add . &&
- git commit -m "nested level 1"
+ git commit -m "nested level 1" &&
git submodule add ../sub_nested_nested &&
git commit -m "add nested level 2"
) &&
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 8d8a63a24b..94cb039a03 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -528,10 +528,10 @@ test_expect_success 'checkout with --merge' '
cat sample >filf &&
git checkout -m -- fild file filf &&
(
- echo "<<<<<<< ours"
- echo ourside
- echo "======="
- echo theirside
+ echo "<<<<<<< ours" &&
+ echo ourside &&
+ echo "=======" &&
+ echo theirside &&
echo ">>>>>>> theirs"
) >merged &&
test_cmp expect fild &&
@@ -549,12 +549,12 @@ test_expect_success 'checkout with --merge, in diff3 -m style' '
cat sample >filf &&
git checkout -m -- fild file filf &&
(
- echo "<<<<<<< ours"
- echo ourside
- echo "||||||| base"
- echo original
- echo "======="
- echo theirside
+ echo "<<<<<<< ours" &&
+ echo ourside &&
+ echo "||||||| base" &&
+ echo original &&
+ echo "=======" &&
+ echo theirside &&
echo ">>>>>>> theirs"
) >merged &&
test_cmp expect fild &&
@@ -572,10 +572,10 @@ test_expect_success 'checkout --conflict=merge, overriding config' '
cat sample >filf &&
git checkout --conflict=merge -- fild file filf &&
(
- echo "<<<<<<< ours"
- echo ourside
- echo "======="
- echo theirside
+ echo "<<<<<<< ours" &&
+ echo ourside &&
+ echo "=======" &&
+ echo theirside &&
echo ">>>>>>> theirs"
) >merged &&
test_cmp expect fild &&
@@ -593,12 +593,12 @@ test_expect_success 'checkout --conflict=diff3' '
cat sample >filf &&
git checkout --conflict=diff3 -- fild file filf &&
(
- echo "<<<<<<< ours"
- echo ourside
- echo "||||||| base"
- echo original
- echo "======="
- echo theirside
+ echo "<<<<<<< ours" &&
+ echo ourside &&
+ echo "||||||| base" &&
+ echo original &&
+ echo "=======" &&
+ echo theirside &&
echo ">>>>>>> theirs"
) >merged &&
test_cmp expect fild &&
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 401adaed32..76cf522a08 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -818,7 +818,7 @@ test_expect_success '../bar/a/b/c works with relative local path - ../foo/bar.gi
cp pristine-.git-config .git/config &&
cp pristine-.gitmodules .gitmodules &&
mkdir -p a/b/c &&
- (cd a/b/c; git init) &&
+ (cd a/b/c && git init) &&
git config remote.origin.url ../foo/bar.git &&
git submodule add ../bar/a/b/c ./a/b/c &&
git submodule init &&
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 9e0d31700e..f604ef7a72 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -865,9 +865,9 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
(cd submodule/subsubmodule &&
git log > ../../expected
) &&
- (cd .git/modules/submodule/modules/subsubmodule
+ (cd .git/modules/submodule/modules/subsubmodule &&
git log > ../../../../../actual
- )
+ ) &&
test_cmp actual expected
)
'
@@ -886,7 +886,7 @@ test_expect_success 'submodule update properly revives a moved submodule' '
git commit -am "pre move" &&
H2=$(git rev-parse --short HEAD) &&
git status | sed "s/$H/XXX/" >expect &&
- H=$(cd submodule2; git rev-parse HEAD) &&
+ H=$(cd submodule2 && git rev-parse HEAD) &&
git rm --cached submodule2 &&
rm -rf submodule2 &&
mkdir -p "moved/sub module" &&
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
index 08d9add05e..34ac28c056 100755
--- a/t/t7408-submodule-reference.sh
+++ b/t/t7408-submodule-reference.sh
@@ -148,7 +148,7 @@ test_expect_success 'preparing second superproject with a nested submodule plus
cd supersuper &&
echo "I am super super." >file &&
git add file &&
- git commit -m B-super-super-initial
+ git commit -m B-super-super-initial &&
git submodule add "file://$base_dir/super" subwithsub &&
git commit -m B-super-super-added &&
git submodule update --init --recursive &&
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 282ff42331..51646d8019 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -411,8 +411,8 @@ test_expect_success 'sign off (1)' '
git commit -s -m "thank you" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
(
- echo thank you
- echo
+ echo thank you &&
+ echo &&
git var GIT_COMMITTER_IDENT |
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
) >expected &&
@@ -430,9 +430,9 @@ test_expect_success 'sign off (2)' '
$existing" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
(
- echo thank you
- echo
- echo $existing
+ echo thank you &&
+ echo &&
+ echo $existing &&
git var GIT_COMMITTER_IDENT |
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
) >expected &&
@@ -450,9 +450,9 @@ test_expect_success 'signoff gap' '
$alt" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
(
- echo welcome
- echo
- echo $alt
+ echo welcome &&
+ echo &&
+ echo $alt &&
git var GIT_COMMITTER_IDENT |
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
) >expected &&
@@ -470,11 +470,11 @@ We have now
$alt" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
(
- echo welcome
- echo
- echo We have now
- echo $alt
- echo
+ echo welcome &&
+ echo &&
+ echo We have now &&
+ echo $alt &&
+ echo &&
git var GIT_COMMITTER_IDENT |
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
) >expected &&
@@ -491,11 +491,11 @@ non-trailer line
Myfooter: x" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
(
- echo subject
- echo
- echo non-trailer line
- echo Myfooter: x
- echo
+ echo subject &&
+ echo &&
+ echo non-trailer line &&
+ echo Myfooter: x &&
+ echo &&
echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
) >expected &&
test_cmp expected actual &&
@@ -508,10 +508,10 @@ non-trailer line
Myfooter: x" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
(
- echo subject
- echo
- echo non-trailer line
- echo Myfooter: x
+ echo subject &&
+ echo &&
+ echo non-trailer line &&
+ echo Myfooter: x &&
echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
) >expected &&
test_cmp expected actual
@@ -524,10 +524,10 @@ test_expect_success 'multiple -m' '
git commit -m "one" -m "two" -m "three" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
(
- echo one
- echo
- echo two
- echo
+ echo one &&
+ echo &&
+ echo two &&
+ echo &&
echo three
) >expected &&
test_cmp expected actual
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index b4b74dbe29..943708fb04 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -193,9 +193,9 @@ test_expect_success 'status with added and untracked file in modified submodule
test_expect_success 'setup .git file for sub' '
(cd sub &&
- rm -f new-file
+ rm -f new-file &&
REAL="$(pwd)/../.real" &&
- mv .git "$REAL"
+ mv .git "$REAL" &&
echo "gitdir: $REAL" >.git) &&
echo .real >>.gitignore &&
git commit -m "added .real to .gitignore" .gitignore
@@ -209,12 +209,12 @@ test_expect_success 'status with added file in modified submodule with .git file
test_expect_success 'status with a lot of untracked files in the submodule' '
(
- cd sub
+ cd sub &&
i=0 &&
while test $i -lt 1024
do
- >some-file-$i
- i=$(( $i + 1 ))
+ >some-file-$i &&
+ i=$(( $i + 1 )) || exit 1
done
) &&
git status --porcelain sub 2>err.actual &&
--
2.18.0.203.gfac676dfb9
^ permalink raw reply related [relevance 8%]
* [PATCH 00/25] fix buggy tests, modernize tests, fix broken &&-chains
@ 2018-07-02 0:23 1% Eric Sunshine
2018-07-02 0:24 8% ` [PATCH 23/25] t7000-t7999: " Eric Sunshine
0 siblings, 1 reply; 200+ results
From: Eric Sunshine @ 2018-07-02 0:23 UTC (permalink / raw)
To: git
Cc: Elijah Newren, Johannes Sixt, Jonathan Nieder, Jonathan Tan,
Stefan Beller, Junio C Hamano, Luke Diamand, Jeff King,
Eric Sunshine
This series fixes several buggy tests which went undetected due to
broken &&-chains in subshells, modernizes some tests to take advantage
of test functions (test_might_fail(), test_write_lines(), etc.), and
fixes a lot of broken &&-chains in subshells. It applies atop
'master'. Happily, there are no broken &&-chains in subshells in any
in-flight topic.
It is split out from an earlier series[1] which additionally extended
--chain-lint to work within subshells. I decided to make this an
independent series because these (hopefully) non-controversial changes
all stand on their own merit, and because I don't want to flood the list
repeatedly with this lengthy series as I re-roll the "extend
--chain-lint to work in subshells" functionality from [1].
To ease review burden, I largely avoided noisy modernizations and
cleanups, and limited changes to merely adding "&&" even when some other
transformation would have made the fix nicer overall. (For example, I
resisted the urge to replace a series of 'echo' statements with a simple
here-doc.)
Changes since [1]:
* Found and fixed more &&-chain breakage, and converted a couple more
'unset' instances (which were hidden behind a MINGW prerequisite) to
sane_unset().
* Rewrote commit messages to sell changes on their own merit rather than
leaning on --chain-lint as a crutch. (junio, jrnieder)
* Changed a modernization/cleanup to use "! non-git-command" rather than
test_must_fail(), moving it to its own patch in the process. (j6t)
* Changed "printf '%s\n'" idiom to test_write_lines(). (junio)
* Incorporated Stefan's fix[2] for a broken 't/lib-submodule-update'
test since my interpretation of the problem was incorrect.
* Converted a subshell 'echo' sequence to write_script().
* Dropped patches which existed primarily to pacify --chain-lint; they
are no longer needed since I re-wrote the "linter" to detect &&-chain
breakage itself (by pure textual inspection) rather than by
incorporating subshell bodies into the main &&-chain:
t0001: use "{...}" block around "||" expression rather than subshell
t3303: use standard here-doc tag "EOF" to avoid fooling --chain-lint
t9104: use "{...}" block around "||" expression rather than subshell
t9401: drop unnecessary nested subshell
* Dropped a patch which pretty much duplicated Junio's 037714252f
(tests: clean after SANITY tests, 2018-06-15), which graduated to
'master':
t7508: use test_when_finished() instead of managing exit code manually
An interdiff against [1] is below, although I stripped out all the noisy
"printf '%s\n'" to test_write_lines() differences, of which there were a
lot, since they drowned out the other more significant changes.
Thanks to Elijah, Hannes, Jonathan Nieder, Jonathan Tan, Junio, Luke,
Peff, and Stefan for comments on [1].
[1]: https://public-inbox.org/git/20180626073001.6555-1-sunshine@sunshineco.com/
[2]: https://public-inbox.org/git/20180627183057.254467-1-sbeller@google.com/
Eric Sunshine (25):
t: use test_might_fail() instead of manipulating exit code manually
t: use test_write_lines() instead of series of 'echo' commands
t: use sane_unset() rather than 'unset' with broken &&-chain
t: drop unnecessary terminating semicolon in subshell
t/lib-submodule-update: fix "absorbing" test
t5405: use test_must_fail() instead of checking exit code manually
t5406: use write_script() instead of birthing shell script manually
t5505: modernize and simplify hard-to-digest test
t6036: fix broken "merge fails but has appropriate contents" tests
t7201: drop pointless "exit 0" at end of subshell
t7400: fix broken "submodule add/reconfigure --force" test
t7810: use test_expect_code() instead of hand-rolled comparison
t9001: fix broken "invoke hook" test
t9814: simplify convoluted check that command correctly errors out
t0000-t0999: fix broken &&-chains
t1000-t1999: fix broken &&-chains
t2000-t2999: fix broken &&-chains
t3000-t3999: fix broken &&-chains
t3030: fix broken &&-chains
t4000-t4999: fix broken &&-chains
t5000-t5999: fix broken &&-chains
t6000-t6999: fix broken &&-chains
t7000-t7999: fix broken &&-chains
t9000-t9999: fix broken &&-chains
t9119: fix broken &&-chains
t/lib-submodule-update.sh | 5 +-
t/t0000-basic.sh | 2 +-
t/t0001-init.sh | 4 +-
t/t0003-attributes.sh | 24 +-
t/t0021-conversion.sh | 4 +-
t/t0090-cache-tree.sh | 2 +-
t/t1004-read-tree-m-u-wf.sh | 8 +-
t/t1005-read-tree-reset.sh | 10 +-
t/t1008-read-tree-overlay.sh | 2 +-
t/t1020-subdirectory.sh | 2 +-
t/t1050-large.sh | 6 +-
t/t1300-config.sh | 2 +-
t/t1411-reflog-show.sh | 6 +-
t/t1507-rev-parse-upstream.sh | 6 +-
t/t1512-rev-parse-disambiguation.sh | 6 +-
t/t1700-split-index.sh | 2 +-
t/t2016-checkout-patch.sh | 24 +-
t/t2103-update-index-ignore-missing.sh | 2 +-
t/t2202-add-addremove.sh | 14 +-
t/t3000-ls-files-others.sh | 2 +-
t/t3006-ls-files-long.sh | 2 +-
t/t3008-ls-files-lazy-init-name-hash.sh | 8 +-
t/t3030-merge-recursive.sh | 340 +++++++++---------
t/t3050-subprojects-fetch.sh | 8 +-
t/t3102-ls-tree-wildcards.sh | 2 +-
t/t3210-pack-refs.sh | 4 +-
t/t3301-notes.sh | 8 +-
t/t3400-rebase.sh | 8 +-
t/t3402-rebase-merge.sh | 4 +-
t/t3404-rebase-interactive.sh | 6 +-
t/t3418-rebase-continue.sh | 4 +-
t/t3700-add.sh | 8 +-
t/t3701-add-interactive.sh | 16 +-
t/t3904-stash-patch.sh | 8 +-
t/t4001-diff-rename.sh | 2 +-
t/t4010-diff-pathspec.sh | 4 +-
t/t4012-diff-binary.sh | 6 +-
t/t4024-diff-optimize-common.sh | 16 +-
| 8 +-
t/t4041-diff-submodule-option.sh | 4 +-
t/t4060-diff-submodule-option-diff-format.sh | 2 +-
t/t4121-apply-diffs.sh | 2 +-
t/t5300-pack-object.sh | 2 +-
t/t5302-pack-index.sh | 2 +-
t/t5400-send-pack.sh | 4 +-
t/t5401-update-hooks.sh | 4 +-
t/t5405-send-pack-rewind.sh | 3 +-
t/t5406-remote-rejects.sh | 5 +-
t/t5500-fetch-pack.sh | 2 +-
t/t5505-remote.sh | 10 +-
t/t5512-ls-remote.sh | 4 +-
t/t5516-fetch-push.sh | 10 +-
t/t5517-push-mirror.sh | 10 +-
t/t5526-fetch-submodules.sh | 2 +-
t/t5531-deep-submodule-push.sh | 2 +-
t/t5543-atomic-push.sh | 2 +-
t/t5601-clone.sh | 2 +-
t/t5605-clone-local.sh | 2 +-
t/t5801-remote-helpers.sh | 2 +-
t/t6010-merge-base.sh | 2 +-
t/t6029-merge-subtree.sh | 16 +-
t/t6036-recursive-corner-cases.sh | 14 +-
t/t6042-merge-rename-corner-cases.sh | 8 +-
t/t6043-merge-rename-directories.sh | 2 +-
t/t7001-mv.sh | 2 +-
t/t7105-reset-patch.sh | 12 +-
t/t7201-co.sh | 41 ++-
t/t7301-clean-interactive.sh | 41 ++-
t/t7400-submodule-basic.sh | 12 +-
t/t7406-submodule-update.sh | 6 +-
t/t7408-submodule-reference.sh | 2 +-
t/t7501-commit.sh | 56 +--
t/t7506-status-submodule.sh | 10 +-
t/t7610-mergetool.sh | 8 +-
t/t7810-grep.sh | 7 +-
t/t9001-send-email.sh | 10 +-
t/t9100-git-svn-basic.sh | 2 +-
t/t9101-git-svn-props.sh | 2 +-
t/t9119-git-svn-info.sh | 120 +++----
t/t9122-git-svn-author.sh | 6 +-
t/t9129-git-svn-i18n-commitencoding.sh | 2 +-
t/t9130-git-svn-authors-file.sh | 4 +-
t/t9134-git-svn-ignore-paths.sh | 6 +-
t/t9137-git-svn-dcommit-clobber-series.sh | 2 +-
t/t9138-git-svn-authors-prog.sh | 6 +-
t/t9146-git-svn-empty-dirs.sh | 20 +-
t/t9147-git-svn-include-paths.sh | 6 +-
t/t9152-svn-empty-dirs-after-gc.sh | 2 +-
t/t9164-git-svn-dcommit-concurrent.sh | 2 +-
...65-git-svn-fetch-merge-branch-of-branch.sh | 2 +-
t/t9200-git-cvsexportcommit.sh | 6 +-
t/t9302-fast-import-unpack-limit.sh | 2 +-
t/t9400-git-cvsserver-server.sh | 8 +-
t/t9600-cvsimport.sh | 2 +-
t/t9806-git-p4-options.sh | 2 +-
t/t9810-git-p4-rcs.sh | 2 +-
t/t9811-git-p4-label-import.sh | 2 +-
t/t9814-git-p4-rename.sh | 18 +-
t/t9815-git-p4-submit-fail.sh | 2 +-
t/t9830-git-p4-symlink-dir.sh | 2 +-
t/t9831-git-p4-triggers.sh | 2 +-
t/t9902-completion.sh | 4 +-
t/t9903-bash-prompt.sh | 2 +-
103 files changed, 567 insertions(+), 589 deletions(-)
--
2.18.0.203.gfac676dfb9
Interdiff since [1]:
diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
index 8a2edee1cb..e90ec79087 100755
--- a/t/lib-submodule-update.sh
+++ b/t/lib-submodule-update.sh
@@ -959,7 +959,7 @@ test_submodule_forced_switch_recursing_with_args () {
)
'
# ... absorbing a .git directory.
- test_expect_failure "$command: replace submodule containing a .git directory with a directory must fail" '
+ test_expect_success "$command: replace submodule containing a .git directory with a directory must fail" '
prolog &&
reset_work_tree_to_interested add_sub1 &&
(
@@ -967,9 +967,8 @@ test_submodule_forced_switch_recursing_with_args () {
git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
replace_gitfile_with_git_dir sub1 &&
rm -rf .git/modules/sub1 &&
- test_must_fail $command replace_sub1_with_directory &&
+ $command replace_sub1_with_directory &&
test_superproject_content origin/replace_sub1_with_directory &&
- test_submodule_content sub1 origin/modify_sub1 &&
test_git_directory_exists sub1
)
'
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 4c865051e7..ca85aae51e 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -408,7 +408,7 @@ is_hidden () {
test_expect_success MINGW '.git hidden' '
rm -rf newdir &&
(
- unset GIT_DIR GIT_WORK_TREE
+ sane_unset GIT_DIR GIT_WORK_TREE &&
mkdir newdir &&
cd newdir &&
git init &&
@@ -420,7 +420,7 @@ test_expect_success MINGW '.git hidden' '
test_expect_success MINGW 'bare git dir not hidden' '
rm -rf newdir &&
(
- unset GIT_DIR GIT_WORK_TREE GIT_CONFIG
+ sane_unset GIT_DIR GIT_WORK_TREE GIT_CONFIG &&
mkdir newdir &&
cd newdir &&
git --bare init
diff --git a/t/t1008-read-tree-overlay.sh b/t/t1008-read-tree-overlay.sh
index e74b185b6c..cf96016844 100755
--- a/t/t1008-read-tree-overlay.sh
+++ b/t/t1008-read-tree-overlay.sh
@@ -23,7 +23,7 @@ test_expect_success setup '
test_expect_success 'multi-read' '
read_tree_must_succeed initial master side &&
- (echo a && echo b/c) >expect &&
+ test_write_lines a b/c >expect &&
git ls-files >actual &&
test_cmp expect actual
'
diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index afa27ffe2d..724b4b9bc0 100755
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -231,9 +231,9 @@ test_expect_success 'timeout if packed-refs.lock exists' '
test_expect_success 'retry acquiring packed-refs.lock' '
LOCK=.git/packed-refs.lock &&
>"$LOCK" &&
- test_when_finished "wait; rm -f $LOCK" &&
+ test_when_finished "wait && rm -f $LOCK" &&
{
- ( sleep 1 ; rm -f $LOCK ) &
+ ( sleep 1 && rm -f $LOCK ) &
} &&
git -c core.packedrefstimeout=3000 pack-refs --all --prune
'
diff --git a/t/t4024-diff-optimize-common.sh b/t/t4024-diff-optimize-common.sh
index 7e76018296..6b44ce1493 100755
--- a/t/t4024-diff-optimize-common.sh
+++ b/t/t4024-diff-optimize-common.sh
@@ -127,17 +127,17 @@ test_expect_success setup '
for n in $sample
do
- ( zs $n ; echo a ) >file-a$n &&
- ( echo b; zs $n; echo ) >file-b$n &&
- ( printf c; zs $n ) >file-c$n &&
- ( echo d; zs $n ) >file-d$n &&
+ ( zs $n && echo a ) >file-a$n &&
+ ( echo b && zs $n && echo ) >file-b$n &&
+ ( printf c && zs $n ) >file-c$n &&
+ ( echo d && zs $n ) >file-d$n &&
git add file-a$n file-b$n file-c$n file-d$n &&
- ( zs $n ; echo A ) >file-a$n &&
- ( echo B; zs $n; echo ) >file-b$n &&
- ( printf C; zs $n ) >file-c$n &&
- ( echo D; zs $n ) >file-d$n &&
+ ( zs $n && echo A ) >file-a$n &&
+ ( echo B && zs $n && echo ) >file-b$n &&
+ ( printf C && zs $n ) >file-c$n &&
+ ( echo D && zs $n ) >file-d$n &&
expect_pattern $n || return 1
diff --git a/t/t5406-remote-rejects.sh b/t/t5406-remote-rejects.sh
index 350d2e6ea5..ff06f99649 100755
--- a/t/t5406-remote-rejects.sh
+++ b/t/t5406-remote-rejects.sh
@@ -6,8 +6,9 @@ test_description='remote push rejects are reported by client'
test_expect_success 'setup' '
mkdir .git/hooks &&
- (echo "#!/bin/sh" && echo "exit 1") >.git/hooks/update &&
- chmod +x .git/hooks/update &&
+ write_script .git/hooks/update <<-\EOF &&
+ exit 1
+ EOF
echo 1 >file &&
git add file &&
git commit -m 1 &&
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index b141145fc2..f604ef7a72 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -886,7 +886,7 @@ test_expect_success 'submodule update properly revives a moved submodule' '
git commit -am "pre move" &&
H2=$(git rev-parse --short HEAD) &&
git status | sed "s/$H/XXX/" >expect &&
- H=$(cd submodule2; git rev-parse HEAD) &&
+ H=$(cd submodule2 && git rev-parse HEAD) &&
git rm --cached submodule2 &&
rm -rf submodule2 &&
mkdir -p "moved/sub module" &&
diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh
index 954948812c..5f91c0d68b 100755
--- a/t/t9146-git-svn-empty-dirs.sh
+++ b/t/t9146-git-svn-empty-dirs.sh
@@ -21,7 +21,7 @@ test_expect_success 'empty directories exist' '
do
if ! test -d "$i"
then
- echo >&2 "$i does not exist"
+ echo >&2 "$i does not exist" &&
exit 1
fi
done
@@ -38,7 +38,7 @@ test_expect_success 'option automkdirs set to false' '
do
if test -d "$i"
then
- echo >&2 "$i exists"
+ echo >&2 "$i exists" &&
exit 1
fi
done
@@ -63,7 +63,7 @@ test_expect_success 'git svn mkdirs recreates empty directories' '
do
if ! test -d "$i"
then
- echo >&2 "$i does not exist"
+ echo >&2 "$i does not exist" &&
exit 1
fi
done
@@ -148,7 +148,7 @@ test_expect_success 'git svn gc-ed files work' '
do
if ! test -d "$i"
then
- echo >&2 "$i does not exist"
+ echo >&2 "$i does not exist" &&
exit 1
fi
done
diff --git a/t/t9152-svn-empty-dirs-after-gc.sh b/t/t9152-svn-empty-dirs-after-gc.sh
index 301e779709..89f285d082 100755
--- a/t/t9152-svn-empty-dirs-after-gc.sh
+++ b/t/t9152-svn-empty-dirs-after-gc.sh
@@ -30,7 +30,7 @@ test_expect_success 'git svn mkdirs recreates empty directories after git svn gc
do
if ! test -d "$i"
then
- echo >&2 "$i does not exist"
+ echo >&2 "$i does not exist" &&
exit 1
fi
done
diff --git a/t/t9302-fast-import-unpack-limit.sh b/t/t9302-fast-import-unpack-limit.sh
index a04de14677..bb1c39cfcc 100755
--- a/t/t9302-fast-import-unpack-limit.sh
+++ b/t/t9302-fast-import-unpack-limit.sh
@@ -80,7 +80,7 @@ test_expect_success 'lookups after checkpoint works' '
do
if test $n -gt 30
then
- echo >&2 "checkpoint did not update branch"
+ echo >&2 "checkpoint did not update branch" &&
exit 1
else
n=$(($n + 1))
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 4207e9caa5..a5e5dca753 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -328,7 +328,7 @@ test_expect_success 'cvs update (subdirectories)' \
'(for dir in A A/B A/B/C A/D E; do
mkdir $dir &&
echo "test file in $dir" >"$dir/file_in_$(echo $dir|sed -e "s#/# #g")" &&
- git add $dir;
+ git add $dir
done) &&
git commit -q -m "deep sub directory structure" &&
git push gitcvs.git >/dev/null &&
diff --git a/t/t9814-git-p4-rename.sh b/t/t9814-git-p4-rename.sh
index 80aac5ab16..60baa06e27 100755
--- a/t/t9814-git-p4-rename.sh
+++ b/t/t9814-git-p4-rename.sh
@@ -9,11 +9,11 @@ test_expect_success 'start p4d' '
'
# We rely on this behavior to detect for p4 move availability.
-test_expect_success 'p4 help unknown returns 1' '
+test_expect_success '"p4 help unknown" errors out' '
(
cd "$cli" &&
p4 help client &&
- test_must_fail p4 help nosuchcommand
+ ! p4 help nosuchcommand
)
'
^ permalink raw reply related [relevance 1%]
* [PATCH 26/29] t7000-t7999: fix broken &&-chains in subshells
2018-06-26 7:29 2% [PATCH 00/29] t: detect and fix broken &&-chains in subshells Eric Sunshine
@ 2018-06-26 7:29 8% ` Eric Sunshine
0 siblings, 0 replies; 200+ results
From: Eric Sunshine @ 2018-06-26 7:29 UTC (permalink / raw)
To: git
Cc: Jeff King, Jonathan Nieder, SZEDER Gábor, Stefan Beller,
Elijah Newren, Jonathan Tan, Eric Sunshine
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
t/t7001-mv.sh | 2 +-
t/t7201-co.sh | 40 +++++++++++++-------------
t/t7400-submodule-basic.sh | 2 +-
t/t7406-submodule-update.sh | 4 +--
t/t7408-submodule-reference.sh | 2 +-
t/t7501-commit.sh | 52 +++++++++++++++++-----------------
t/t7506-status-submodule.sh | 10 +++----
7 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index cc3fd2baf2..9e59e5a5dd 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -509,7 +509,7 @@ test_expect_success 'moving nested submodules' '
touch nested_level1 &&
git init &&
git add . &&
- git commit -m "nested level 1"
+ git commit -m "nested level 1" &&
git submodule add ../sub_nested_nested &&
git commit -m "add nested level 2"
) &&
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 8d8a63a24b..94cb039a03 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -528,10 +528,10 @@ test_expect_success 'checkout with --merge' '
cat sample >filf &&
git checkout -m -- fild file filf &&
(
- echo "<<<<<<< ours"
- echo ourside
- echo "======="
- echo theirside
+ echo "<<<<<<< ours" &&
+ echo ourside &&
+ echo "=======" &&
+ echo theirside &&
echo ">>>>>>> theirs"
) >merged &&
test_cmp expect fild &&
@@ -549,12 +549,12 @@ test_expect_success 'checkout with --merge, in diff3 -m style' '
cat sample >filf &&
git checkout -m -- fild file filf &&
(
- echo "<<<<<<< ours"
- echo ourside
- echo "||||||| base"
- echo original
- echo "======="
- echo theirside
+ echo "<<<<<<< ours" &&
+ echo ourside &&
+ echo "||||||| base" &&
+ echo original &&
+ echo "=======" &&
+ echo theirside &&
echo ">>>>>>> theirs"
) >merged &&
test_cmp expect fild &&
@@ -572,10 +572,10 @@ test_expect_success 'checkout --conflict=merge, overriding config' '
cat sample >filf &&
git checkout --conflict=merge -- fild file filf &&
(
- echo "<<<<<<< ours"
- echo ourside
- echo "======="
- echo theirside
+ echo "<<<<<<< ours" &&
+ echo ourside &&
+ echo "=======" &&
+ echo theirside &&
echo ">>>>>>> theirs"
) >merged &&
test_cmp expect fild &&
@@ -593,12 +593,12 @@ test_expect_success 'checkout --conflict=diff3' '
cat sample >filf &&
git checkout --conflict=diff3 -- fild file filf &&
(
- echo "<<<<<<< ours"
- echo ourside
- echo "||||||| base"
- echo original
- echo "======="
- echo theirside
+ echo "<<<<<<< ours" &&
+ echo ourside &&
+ echo "||||||| base" &&
+ echo original &&
+ echo "=======" &&
+ echo theirside &&
echo ">>>>>>> theirs"
) >merged &&
test_cmp expect fild &&
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 401adaed32..76cf522a08 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -818,7 +818,7 @@ test_expect_success '../bar/a/b/c works with relative local path - ../foo/bar.gi
cp pristine-.git-config .git/config &&
cp pristine-.gitmodules .gitmodules &&
mkdir -p a/b/c &&
- (cd a/b/c; git init) &&
+ (cd a/b/c && git init) &&
git config remote.origin.url ../foo/bar.git &&
git submodule add ../bar/a/b/c ./a/b/c &&
git submodule init &&
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 9e0d31700e..b141145fc2 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -865,9 +865,9 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
(cd submodule/subsubmodule &&
git log > ../../expected
) &&
- (cd .git/modules/submodule/modules/subsubmodule
+ (cd .git/modules/submodule/modules/subsubmodule &&
git log > ../../../../../actual
- )
+ ) &&
test_cmp actual expected
)
'
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
index 08d9add05e..34ac28c056 100755
--- a/t/t7408-submodule-reference.sh
+++ b/t/t7408-submodule-reference.sh
@@ -148,7 +148,7 @@ test_expect_success 'preparing second superproject with a nested submodule plus
cd supersuper &&
echo "I am super super." >file &&
git add file &&
- git commit -m B-super-super-initial
+ git commit -m B-super-super-initial &&
git submodule add "file://$base_dir/super" subwithsub &&
git commit -m B-super-super-added &&
git submodule update --init --recursive &&
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 589b6cea23..39b14b2bdb 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -411,8 +411,8 @@ test_expect_success 'sign off (1)' '
git commit -s -m "thank you" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
(
- echo thank you
- echo
+ echo thank you &&
+ echo &&
git var GIT_COMMITTER_IDENT |
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
) >expected &&
@@ -430,9 +430,9 @@ test_expect_success 'sign off (2)' '
$existing" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
(
- echo thank you
- echo
- echo $existing
+ echo thank you &&
+ echo &&
+ echo $existing &&
git var GIT_COMMITTER_IDENT |
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
) >expected &&
@@ -450,9 +450,9 @@ test_expect_success 'signoff gap' '
$alt" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
(
- echo welcome
- echo
- echo $alt
+ echo welcome &&
+ echo &&
+ echo $alt &&
git var GIT_COMMITTER_IDENT |
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
) >expected &&
@@ -470,11 +470,11 @@ We have now
$alt" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
(
- echo welcome
- echo
- echo We have now
- echo $alt
- echo
+ echo welcome &&
+ echo &&
+ echo We have now &&
+ echo $alt &&
+ echo &&
git var GIT_COMMITTER_IDENT |
sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
) >expected &&
@@ -491,11 +491,11 @@ non-trailer line
Myfooter: x" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
(
- echo subject
- echo
- echo non-trailer line
- echo Myfooter: x
- echo
+ echo subject &&
+ echo &&
+ echo non-trailer line &&
+ echo Myfooter: x &&
+ echo &&
echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
) >expected &&
test_cmp expected actual &&
@@ -508,10 +508,10 @@ non-trailer line
Myfooter: x" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
(
- echo subject
- echo
- echo non-trailer line
- echo Myfooter: x
+ echo subject &&
+ echo &&
+ echo non-trailer line &&
+ echo Myfooter: x &&
echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
) >expected &&
test_cmp expected actual
@@ -524,10 +524,10 @@ test_expect_success 'multiple -m' '
git commit -m "one" -m "two" -m "three" &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
(
- echo one
- echo
- echo two
- echo
+ echo one &&
+ echo &&
+ echo two &&
+ echo &&
echo three
) >expected &&
test_cmp expected actual
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index b4b74dbe29..943708fb04 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -193,9 +193,9 @@ test_expect_success 'status with added and untracked file in modified submodule
test_expect_success 'setup .git file for sub' '
(cd sub &&
- rm -f new-file
+ rm -f new-file &&
REAL="$(pwd)/../.real" &&
- mv .git "$REAL"
+ mv .git "$REAL" &&
echo "gitdir: $REAL" >.git) &&
echo .real >>.gitignore &&
git commit -m "added .real to .gitignore" .gitignore
@@ -209,12 +209,12 @@ test_expect_success 'status with added file in modified submodule with .git file
test_expect_success 'status with a lot of untracked files in the submodule' '
(
- cd sub
+ cd sub &&
i=0 &&
while test $i -lt 1024
do
- >some-file-$i
- i=$(( $i + 1 ))
+ >some-file-$i &&
+ i=$(( $i + 1 )) || exit 1
done
) &&
git status --porcelain sub 2>err.actual &&
--
2.18.0.419.gfe4b301394
^ permalink raw reply related [relevance 8%]
* [PATCH 00/29] t: detect and fix broken &&-chains in subshells
@ 2018-06-26 7:29 2% Eric Sunshine
2018-06-26 7:29 8% ` [PATCH 26/29] t7000-t7999: " Eric Sunshine
0 siblings, 1 reply; 200+ results
From: Eric Sunshine @ 2018-06-26 7:29 UTC (permalink / raw)
To: git
Cc: Jeff King, Jonathan Nieder, SZEDER Gábor, Stefan Beller,
Elijah Newren, Jonathan Tan, Eric Sunshine
The --chain-lint[1] option detects breakage in the top-level &&-chain of
tests. This series undertakes the more complex task of teaching it to
also detect &&-chain breakage within subshells. See patch 29/29 for the
gory details of how that's done.
The series is built atop 'master', however, it has a conflict with an
in-flight topic. In particular, patch 1/29 rewrites a test in t7508 in
'master' to avoid &&-chain breakage. 'jc/clean-after-sanity-tests' in
'next' performs pretty much the same rewrite. If this series is queued
atop 'master', then it needs patch 1/29; if it is queued somewhere above
'jc/clean-after-sanity-tests', then 1/29 can be dropped.
Aside from identifying a rather significant number of &&-chain breaks,
repairing those broken chains uncovered genuine bugs in several tests
which were hidden by missing &&-chain links. Those bugs are also fixed
by this series. I would appreciate if the following people would
double-check my fixes:
Stefan Bellar - 8/29 "t7400" and (especially) 13/29 "lib-submodule-update"
Jonathan Tan - 10/29 "t9001"
Elijah Newren - 6/29 "t6036"
In order to keep the noise level down and ease review burden, please
take into account that I largely avoided modernizations and cleanups,
and limited changes to merely adding "&&" even when some other
transformation would have made the fix nicer overall. (For example, I
resisted the urge to replace a series of 'echo' statements in a subshell
with a simple here-doc.)
Finally, although all simple &&-chain fixes originally inhabited a
single patch, they were split out into several patches to avoid hitting
vger.kernel.org's message size limit. However, when queuing, all patches
titled "t????: fix broken &&-chains in subshells" could be squashed into
a single patch titled "t: fix broken &&-chains in subshells".
[1]: https://public-inbox.org/git/20150320100429.GA17354@peff.net/
Eric Sunshine (29):
t7508: use test_when_finished() instead of managing exit code manually
t0001: use "{...}" block around "||" expression rather than subshell
t1300: use sane_unset() to avoid breaking &&-chain
t3303: use standard here-doc tag "EOF" to avoid fooling --chain-lint
t5505: modernize and simplify hard-to-digest test
t6036: fix broken "merge fails but has appropriate contents" tests
t7201: drop pointless "exit 0" at end of subshell
t7400: fix broken "submodule add/reconfigure --force" test
t7810: use test_expect_code() instead of hand-rolled comparison
t9001: fix broken "invoke hook" test
t9104: use "{...}" block around "||" expression rather than subshell
t9401: drop unnecessary nested subshell
t/lib-submodule-update: fix broken "replace submodule must-fail" test
t: drop subshell with missing &&-chain in favor of simpler construct
t: drop unnecessary terminating semicolons in subshell
t: use test_might_fail() instead of manipulating exit code manually
t: use test_must_fail() instead of checking exit code manually
t0000-t0999: fix broken &&-chains in subshells
t1000-t1999: fix broken &&-chains in subshells
t2000-t2999: fix broken &&-chains in subshells
t3000-t3999: fix broken &&-chains in subshells
t3030: fix broken &&-chains in subshells
t4000-t4999: fix broken &&-chains in subshells
t5000-t5999: fix broken &&-chains in subshells
t6000-t6999: fix broken &&-chains in subshells
t7000-t7999: fix broken &&-chains in subshells
t9000-t9999: fix broken &&-chains in subshells
t9119: fix broken &&-chains in subshells
t/test-lib: teach --chain-lint to detect broken &&-chains in subshells
t/lib-submodule-update.sh | 10 +-
t/t0000-basic.sh | 2 +-
t/t0001-init.sh | 2 +-
t/t0003-attributes.sh | 24 +-
t/t0021-conversion.sh | 4 +-
t/t0090-cache-tree.sh | 2 +-
t/t1004-read-tree-m-u-wf.sh | 8 +-
t/t1005-read-tree-reset.sh | 10 +-
t/t1008-read-tree-overlay.sh | 2 +-
t/t1020-subdirectory.sh | 2 +-
t/t1050-large.sh | 6 +-
t/t1300-config.sh | 2 +-
t/t1411-reflog-show.sh | 6 +-
t/t1507-rev-parse-upstream.sh | 6 +-
t/t1512-rev-parse-disambiguation.sh | 6 +-
t/t1700-split-index.sh | 2 +-
t/t2016-checkout-patch.sh | 24 +-
t/t2103-update-index-ignore-missing.sh | 2 +-
t/t2202-add-addremove.sh | 14 +-
t/t3000-ls-files-others.sh | 2 +-
t/t3006-ls-files-long.sh | 2 +-
t/t3008-ls-files-lazy-init-name-hash.sh | 8 +-
t/t3030-merge-recursive.sh | 340 +++++++++---------
t/t3050-subprojects-fetch.sh | 8 +-
t/t3102-ls-tree-wildcards.sh | 2 +-
t/t3301-notes.sh | 8 +-
t/t3303-notes-subtrees.sh | 12 +-
t/t3400-rebase.sh | 8 +-
t/t3402-rebase-merge.sh | 4 +-
t/t3404-rebase-interactive.sh | 6 +-
t/t3418-rebase-continue.sh | 4 +-
t/t3700-add.sh | 8 +-
t/t3701-add-interactive.sh | 16 +-
t/t3904-stash-patch.sh | 8 +-
t/t4001-diff-rename.sh | 2 +-
t/t4010-diff-pathspec.sh | 4 +-
t/t4012-diff-binary.sh | 6 +-
t/t4025-hunk-header.sh | 8 +-
t/t4041-diff-submodule-option.sh | 4 +-
t/t4060-diff-submodule-option-diff-format.sh | 2 +-
t/t4121-apply-diffs.sh | 2 +-
t/t5300-pack-object.sh | 2 +-
t/t5302-pack-index.sh | 2 +-
t/t5400-send-pack.sh | 4 +-
t/t5401-update-hooks.sh | 4 +-
t/t5405-send-pack-rewind.sh | 3 +-
t/t5406-remote-rejects.sh | 2 +-
t/t5500-fetch-pack.sh | 2 +-
t/t5505-remote.sh | 10 +-
t/t5512-ls-remote.sh | 4 +-
t/t5516-fetch-push.sh | 10 +-
t/t5517-push-mirror.sh | 10 +-
t/t5526-fetch-submodules.sh | 2 +-
t/t5531-deep-submodule-push.sh | 2 +-
t/t5543-atomic-push.sh | 2 +-
t/t5601-clone.sh | 2 +-
t/t5605-clone-local.sh | 2 +-
t/t5801-remote-helpers.sh | 2 +-
t/t6010-merge-base.sh | 2 +-
t/t6029-merge-subtree.sh | 16 +-
t/t6036-recursive-corner-cases.sh | 14 +-
t/t6042-merge-rename-corner-cases.sh | 8 +-
t/t6043-merge-rename-directories.sh | 2 +-
t/t7001-mv.sh | 2 +-
t/t7105-reset-patch.sh | 12 +-
t/t7201-co.sh | 41 ++-
t/t7301-clean-interactive.sh | 41 ++-
t/t7400-submodule-basic.sh | 12 +-
t/t7406-submodule-update.sh | 4 +-
t/t7408-submodule-reference.sh | 2 +-
t/t7501-commit.sh | 56 +--
t/t7506-status-submodule.sh | 10 +-
t/t7508-status.sh | 20 +-
t/t7610-mergetool.sh | 8 +-
t/t7810-grep.sh | 7 +-
t/t9001-send-email.sh | 10 +-
t/t9100-git-svn-basic.sh | 2 +-
t/t9101-git-svn-props.sh | 2 +-
t/t9104-git-svn-follow-parent.sh | 4 +-
t/t9119-git-svn-info.sh | 120 +++----
t/t9122-git-svn-author.sh | 6 +-
t/t9129-git-svn-i18n-commitencoding.sh | 2 +-
t/t9130-git-svn-authors-file.sh | 4 +-
t/t9134-git-svn-ignore-paths.sh | 6 +-
t/t9137-git-svn-dcommit-clobber-series.sh | 2 +-
t/t9138-git-svn-authors-prog.sh | 6 +-
t/t9146-git-svn-empty-dirs.sh | 12 +-
t/t9147-git-svn-include-paths.sh | 6 +-
t/t9164-git-svn-dcommit-concurrent.sh | 2 +-
...65-git-svn-fetch-merge-branch-of-branch.sh | 2 +-
t/t9200-git-cvsexportcommit.sh | 6 +-
t/t9400-git-cvsserver-server.sh | 6 +-
t/t9401-git-cvsserver-crlf.sh | 4 +-
t/t9600-cvsimport.sh | 2 +-
t/t9806-git-p4-options.sh | 2 +-
t/t9810-git-p4-rcs.sh | 2 +-
t/t9811-git-p4-label-import.sh | 2 +-
t/t9814-git-p4-rename.sh | 16 +-
t/t9815-git-p4-submit-fail.sh | 2 +-
t/t9830-git-p4-symlink-dir.sh | 2 +-
t/t9831-git-p4-triggers.sh | 2 +-
t/t9902-completion.sh | 4 +-
t/t9903-bash-prompt.sh | 2 +-
t/test-lib.sh | 245 ++++++++++++-
104 files changed, 810 insertions(+), 593 deletions(-)
--
2.18.0.419.gfe4b301394
^ permalink raw reply [relevance 2%]
* [PATCH 2/3] test: update tests for strict usage of -- checkout
@ 2018-05-13 2:23 5% ` Dannier Castro L
0 siblings, 0 replies; 200+ results
From: Dannier Castro L @ 2018-05-13 2:23 UTC (permalink / raw)
To: git; +Cc: Dannier Castro L, gitster, Matthieu.Moy, jrnieder, bmwill
The flag '--' must always be before any file path when <checkout>
command is used.
The list of 34 test files updated is shown:
t0021-conversion.sh
t0027-auto-crlf.sh
t1011-read-tree-sparse-checkout.sh
t1050-large.sh
t1051-large-conversion.sh
t2009-checkout-statinfo.sh
t2010-checkout-ambiguous.sh
t2013-checkout-submodule.sh
t2016-checkout-patch.sh
t2022-checkout-paths.sh
t2028-worktree-move.sh
t2030-unresolve-info.sh
t3001-ls-files-others-exclude.sh
t3509-cherry-pick-merge-df.sh
t3510-cherry-pick-sequence.sh
t4015-diff-whitespace.sh
t4124-apply-ws-rule.sh
t5403-post-checkout-hook.sh
t6007-rev-list-cherry-pick-file.sh
t6026-merge-attr.sh
t6030-bisect-porcelain.sh
t6111-rev-list-treesame.sh
t7001-mv.sh
t7008-grep-binary.sh
t7201-co.sh
t7300-clean.sh
t7501-commit.sh
t7502-commit.sh
t7607-merge-overwrite.sh
t7810-grep.sh
t7811-grep-open.sh
t8006-blame-textconv.sh
t9010-svn-fe.sh
t8003-blame-corner-cases.sh
Signed-off-by: Dannier Castro L <danniercl@gmail.com>
---
t/t0021-conversion.sh | 12 ++++++------
t/t0027-auto-crlf.sh | 4 ++--
t/t1011-read-tree-sparse-checkout.sh | 4 ++--
t/t1050-large.sh | 2 +-
t/t1051-large-conversion.sh | 4 ++--
t/t2009-checkout-statinfo.sh | 6 +++---
t/t2010-checkout-ambiguous.sh | 4 ++--
t/t2013-checkout-submodule.sh | 4 ++--
t/t2016-checkout-patch.sh | 9 +--------
t/t2022-checkout-paths.sh | 4 ++--
t/t2028-worktree-move.sh | 2 +-
t/t2030-unresolve-info.sh | 6 +++---
t/t3001-ls-files-others-exclude.sh | 2 +-
t/t3420-rebase-autostash.sh | 2 +-
t/t3510-cherry-pick-sequence.sh | 4 ++--
t/t3910-mac-os-precompose.sh | 4 ++--
t/t4015-diff-whitespace.sh | 4 ++--
t/t4117-apply-reject.sh | 2 +-
t/t4124-apply-ws-rule.sh | 16 ++++++++--------
t/t5403-post-checkout-hook.sh | 2 +-
t/t6007-rev-list-cherry-pick-file.sh | 2 +-
t/t6026-merge-attr.sh | 2 +-
t/t6030-bisect-porcelain.sh | 2 +-
t/t6038-merge-text-auto.sh | 2 +-
t/t6050-replace.sh | 2 +-
t/t6111-rev-list-treesame.sh | 2 +-
t/t7001-mv.sh | 2 +-
t/t7008-grep-binary.sh | 2 +-
t/t7201-co.sh | 8 ++++----
t/t7300-clean.sh | 2 +-
t/t7501-commit.sh | 10 +++++-----
t/t7502-commit.sh | 2 +-
t/t7607-merge-overwrite.sh | 4 ++--
t/t7810-grep.sh | 2 +-
t/t7811-grep-open.sh | 2 +-
t/t8003-blame-corner-cases.sh | 2 +-
t/t8006-blame-textconv.sh | 2 +-
t/t9010-svn-fe.sh | 2 +-
38 files changed, 71 insertions(+), 78 deletions(-)
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 46f8e58..9f4955a 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -380,7 +380,7 @@ test_expect_success PERL 'required process filter should filter data' '
git commit -m "test commit 2" &&
rm -f test2.r "testsubdir/test3 '\''sq'\'',\$x=.r" &&
- filter_git checkout --quiet --no-progress . &&
+ filter_git checkout --quiet --no-progress -- . &&
cat >expected.log <<-EOF &&
START
init handshake complete
@@ -466,7 +466,7 @@ test_expect_success PERL 'required process filter should be used only for "clean
rm test.r &&
- filter_git checkout --quiet --no-progress . &&
+ filter_git checkout --quiet --no-progress -- . &&
# If the filter would be used for "smudge", too, we would see
# "IN: smudge test.r 57 [OK] -- OUT: 57 . [OK]" here
cat >expected.log <<-EOF &&
@@ -580,7 +580,7 @@ test_expect_success PERL 'process filter should restart after unexpected write f
rm -f *.r &&
rm -f debug.log &&
- git checkout --quiet --no-progress . 2>git-stderr.log &&
+ git checkout --quiet --no-progress -- . 2>git-stderr.log &&
grep "smudge write error at" git-stderr.log &&
grep "error: external filter" git-stderr.log &&
@@ -630,7 +630,7 @@ test_expect_success PERL 'process filter should not be restarted if it signals a
git add . &&
rm -f *.r &&
- filter_git checkout --quiet --no-progress . &&
+ filter_git checkout --quiet --no-progress -- . &&
cat >expected.log <<-EOF &&
START
init handshake complete
@@ -669,7 +669,7 @@ test_expect_success PERL 'process filter abort stops processing of all further f
# Note: This test assumes that Git filters files in alphabetical
# order ("abort.r" before "test.r").
- filter_git checkout --quiet --no-progress . &&
+ filter_git checkout --quiet --no-progress -- . &&
cat >expected.log <<-EOF &&
START
init handshake complete
@@ -763,7 +763,7 @@ test_expect_success PERL 'delayed checkout in process filter' '
test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.b &&
rm *.a *.b &&
- filter_git checkout . &&
+ filter_git checkout -- . &&
test_cmp_count ../a.exp a.log &&
test_cmp_count ../b.exp b.log &&
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index beb5927..3587e45 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -293,9 +293,9 @@ checkout_files () {
do
rm crlf_false_attr__$f.txt &&
if test -z "$ceol"; then
- git checkout crlf_false_attr__$f.txt
+ git checkout -- crlf_false_attr__$f.txt
else
- git -c core.eol=$ceol checkout crlf_false_attr__$f.txt
+ git -c core.eol=$ceol checkout -- crlf_false_attr__$f.txt
fi
done
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index c167f60..82e0013 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -257,7 +257,7 @@ test_expect_success 'checkout without --ignore-skip-worktree-bits' '
echo sub >.git/info/sparse-checkout &&
git checkout &&
echo modified >> sub/added &&
- git checkout . &&
+ git checkout -- . &&
test_path_is_missing init.t &&
git diff --exit-code HEAD
'
@@ -269,7 +269,7 @@ test_expect_success 'checkout with --ignore-skip-worktree-bits' '
echo sub >.git/info/sparse-checkout &&
git checkout &&
echo modified >> sub/added &&
- git checkout --ignore-skip-worktree-bits . &&
+ git checkout --ignore-skip-worktree-bits -- . &&
test_path_is_file init.t &&
git diff --exit-code HEAD
'
diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index 6fd264c..270bb40 100755
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -89,7 +89,7 @@ test_expect_success 'add a large file or two' '
test_expect_success 'checkout a large file' '
large1=$(git rev-parse :large1) &&
git update-index --add --cacheinfo 100644 $large1 another &&
- git checkout another &&
+ git checkout -- another &&
test_cmp large1 another
'
diff --git a/t/t1051-large-conversion.sh b/t/t1051-large-conversion.sh
index 8b7640b..7326528 100755
--- a/t/t1051-large-conversion.sh
+++ b/t/t1051-large-conversion.sh
@@ -18,7 +18,7 @@ check_input() {
check_output() {
rm -f small large &&
- git checkout small large &&
+ git checkout -- small large &&
head -n 1 large >large.head &&
test_cmp small large.head
}
@@ -76,7 +76,7 @@ test_expect_success 'user-defined filters convert on output' '
test_expect_success 'ident converts on output' '
set_attr ident &&
rm -f small large &&
- git checkout small large &&
+ git checkout -- small large &&
sed -n "s/Id: .*/Id: SHA/p" <small >small.clean &&
head -n 1 large >large.head &&
sed -n "s/Id: .*/Id: SHA/p" <large.head >large.clean &&
diff --git a/t/t2009-checkout-statinfo.sh b/t/t2009-checkout-statinfo.sh
index f3c2152..0a51b14 100755
--- a/t/t2009-checkout-statinfo.sh
+++ b/t/t2009-checkout-statinfo.sh
@@ -37,13 +37,13 @@ test_expect_success 'path checkout' '
git reset --hard &&
test "$(git diff-files --raw)" = "" &&
- git checkout master world &&
+ git checkout master -- world &&
test "$(git diff-files --raw)" = "" &&
- git checkout side world &&
+ git checkout side -- world &&
test "$(git diff-files --raw)" = "" &&
- git checkout master world &&
+ git checkout master -- world &&
test "$(git diff-files --raw)" = ""
'
diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh
index 2e47fe0..87c8ad2 100755
--- a/t/t2010-checkout-ambiguous.sh
+++ b/t/t2010-checkout-ambiguous.sh
@@ -29,7 +29,7 @@ test_expect_success 'checkout world from the index' '
'
test_expect_success 'non ambiguous call' '
- git checkout all
+ git checkout -- all
'
test_expect_success 'allow the most common case' '
@@ -44,7 +44,7 @@ test_expect_success 'check ambiguity' '
test_expect_success 'check ambiguity in subdir' '
mkdir sub &&
# not ambiguous because sub/world does not exist
- git -C sub checkout world ../all &&
+ git -C sub checkout world -- ../all &&
echo hello >sub/world &&
# ambiguous because sub/world does exist
test_must_fail git -C sub checkout world ../all
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
index 6ef1573..2581382 100755
--- a/t/t2013-checkout-submodule.sh
+++ b/t/t2013-checkout-submodule.sh
@@ -34,9 +34,9 @@ test_expect_success '"checkout <submodule>" updates the index only' '
git update-index --refresh &&
git diff-files --quiet &&
git diff-index --quiet --cached HEAD &&
- git checkout HEAD^ submodule &&
+ git checkout HEAD^ -- submodule &&
test_must_fail git diff-files --quiet &&
- git checkout HEAD submodule &&
+ git checkout HEAD -- submodule &&
git diff-files --quiet
'
diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh
index 9cd0ac4..c39d2c4 100755
--- a/t/t2016-checkout-patch.sh
+++ b/t/t2016-checkout-patch.sh
@@ -79,13 +79,6 @@ test_expect_success PERL 'git checkout -p handles deletion' '
# dir/foo. There's always an extra 'n' to reject edits to dir/foo in
# the failure case (and thus get out of the loop).
-test_expect_success PERL 'path limiting works: dir' '
- set_state dir/foo work head &&
- (echo y; echo n) | git checkout -p dir &&
- verify_saved_state bar &&
- verify_state dir/foo head head
-'
-
test_expect_success PERL 'path limiting works: -- dir' '
set_state dir/foo work head &&
(echo y; echo n) | git checkout -p -- dir &&
@@ -103,7 +96,7 @@ test_expect_success PERL 'path limiting works: HEAD^ -- dir' '
test_expect_success PERL 'path limiting works: foo inside dir' '
set_state dir/foo work head &&
# the third n is to get out in case it mistakenly does not apply
- (echo y; echo n; echo n) | (cd dir && git checkout -p foo) &&
+ (echo y; echo n; echo n) | (cd dir && git checkout -p -- foo) &&
verify_saved_state bar &&
verify_state dir/foo head head
'
diff --git a/t/t2022-checkout-paths.sh b/t/t2022-checkout-paths.sh
index f46d049..6e254fa 100755
--- a/t/t2022-checkout-paths.sh
+++ b/t/t2022-checkout-paths.sh
@@ -26,7 +26,7 @@ test_expect_success 'checking out paths out of a tree does not clobber unrelated
echo untracked >expect.next2 &&
cat expect.next2 >dir/next2 &&
- git checkout master dir &&
+ git checkout master -- dir &&
test_cmp expect.common dir/common &&
test_path_is_file dir/master &&
@@ -52,7 +52,7 @@ test_expect_success 'do not touch unmerged entries matching $path but not in $tr
EOF
git update-index --index-info <expect.next0 &&
- git checkout master dir &&
+ git checkout master -- dir &&
test_cmp expect.common dir/common &&
test_path_is_file dir/master &&
diff --git a/t/t2028-worktree-move.sh b/t/t2028-worktree-move.sh
index 5d5b363..3e869e8 100755
--- a/t/t2028-worktree-move.sh
+++ b/t/t2028-worktree-move.sh
@@ -111,7 +111,7 @@ test_expect_success 'remove locked worktree' '
test_expect_success 'remove worktree with dirty tracked file' '
echo dirty >>destination/init.t &&
- test_when_finished "git -C destination checkout init.t" &&
+ test_when_finished "git -C destination checkout -- init.t" &&
test_must_fail git worktree remove destination
'
diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh
index 309199b..b599c37 100755
--- a/t/t2030-unresolve-info.sh
+++ b/t/t2030-unresolve-info.sh
@@ -108,7 +108,7 @@ test_expect_success 'plumbing clears' '
test_expect_success 'add records checkout -m undoes' '
prime_resolve_undo &&
git diff HEAD &&
- git checkout --conflict=merge fi/le &&
+ git checkout --conflict=merge -- fi/le &&
echo checkout used the record and removed it &&
check_resolve_undo removed &&
echo the index and the work tree is unmerged again &&
@@ -131,7 +131,7 @@ test_expect_success 'rerere and rerere forget' '
rerere_id=$(cd .git/rr-cache && echo */postimage) &&
rerere_id=${rerere_id%/postimage} &&
test -f .git/rr-cache/$rerere_id/postimage &&
- git checkout -m fi/le &&
+ git checkout -m -- fi/le &&
echo resurrect the conflict &&
grep "^=======" fi/le &&
echo reresolve the conflict &&
@@ -157,7 +157,7 @@ test_expect_success 'rerere and rerere forget (subdirectory)' '
rerere_id=$(cd .git/rr-cache && echo */postimage) &&
rerere_id=${rerere_id%/postimage} &&
test -f .git/rr-cache/$rerere_id/postimage &&
- (cd fi && git checkout -m le) &&
+ (cd fi && git checkout -m -- le) &&
echo resurrect the conflict &&
grep "^=======" fi/le &&
echo reresolve the conflict &&
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index 3fc484e..f376590 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -103,7 +103,7 @@ test_expect_success \
test_cmp expect output'
test_expect_success 'restore gitignore' '
- git checkout --ignore-skip-worktree-bits $allignores &&
+ git checkout --ignore-skip-worktree-bits -- $allignores &&
rm .git/index
'
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index e243700..7503b0f 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -345,7 +345,7 @@ test_expect_success 'autostash is saved on editor failure with conflict' '
) &&
echo conflicting-content >expected &&
test_cmp expected file0 &&
- git checkout file0 &&
+ git checkout -- file0 &&
git stash pop &&
echo uncommitted-content >expected &&
test_cmp expected file0
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 0acf4b1..742e467 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -52,7 +52,7 @@ test_expect_success 'cherry-pick mid-cherry-pick-sequence' '
test_must_fail git cherry-pick base..anotherpick &&
test_cmp_rev picked CHERRY_PICK_HEAD &&
# "oops, I forgot that these patches rely on the change from base"
- git checkout HEAD foo &&
+ git checkout HEAD -- foo &&
git cherry-pick base &&
git cherry-pick picked &&
git cherry-pick --continue &&
@@ -205,7 +205,7 @@ test_expect_success '--abort refuses to clobber unrelated change, harder case' '
test_line_count = 2 log &&
test_must_fail git update-index --refresh &&
- git checkout unrelated &&
+ git checkout -- unrelated &&
git cherry-pick --abort &&
test_cmp_rev initial HEAD
'
diff --git a/t/t3910-mac-os-precompose.sh b/t/t3910-mac-os-precompose.sh
index 26dd5b7..6932f20 100755
--- a/t/t3910-mac-os-precompose.sh
+++ b/t/t3910-mac-os-precompose.sh
@@ -141,9 +141,9 @@ test_expect_success "git checkout nfc" '
git checkout f.$Odiarnfc
'
# Make it possible to checkout files with their NFD names
-test_expect_success "git checkout file nfd" '
+test_expect_success "git checkout -- file nfd" '
rm -f f.* &&
- git checkout f.$Odiarnfd
+ git checkout -- f.$Odiarnfd
'
# Make it possible to checkout links with their NFD names
test_expect_success "git checkout link nfd" '
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 17df491..90da499 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -552,7 +552,7 @@ test_expect_success 'check with space before tab in indent' '
'
test_expect_success '--check and --exit-code are not exclusive' '
- git checkout x &&
+ git checkout -- x &&
git diff --check --exit-code
'
@@ -769,7 +769,7 @@ test_expect_success 'checkdiff detects new trailing blank lines (2)' '
'
test_expect_success 'checkdiff allows new blank lines' '
- git checkout x &&
+ git checkout -- x &&
mv x y &&
(
echo "/* This is new */" &&
diff --git a/t/t4117-apply-reject.sh b/t/t4117-apply-reject.sh
index d80187d..e97dfa5 100755
--- a/t/t4117-apply-reject.sh
+++ b/t/t4117-apply-reject.sh
@@ -49,7 +49,7 @@ test_expect_success setup '
test_expect_success 'apply --reject is incompatible with --3way' '
test_when_finished "cat saved.file1 >file1" &&
git diff >patch.0 &&
- git checkout file1 &&
+ git checkout -- file1 &&
test_must_fail git apply --reject --3way patch.0 &&
git diff --exit-code
'
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index 4fc27c5..ae5ace7 100755
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -223,7 +223,7 @@ test_expect_success 'blank at EOF with --whitespace=fix (1)' '
{ cat expect; echo; } >one &&
git diff -- one >patch &&
- git checkout one &&
+ git checkout -- one &&
git apply --whitespace=fix patch &&
test_cmp expect one
'
@@ -235,7 +235,7 @@ test_expect_success 'blank at EOF with --whitespace=fix (2)' '
{ cat expect; echo; echo; } >one &&
git diff -- one >patch &&
- git checkout one &&
+ git checkout -- one &&
git apply --whitespace=fix patch &&
test_cmp expect one
'
@@ -247,7 +247,7 @@ test_expect_success 'blank at EOF with --whitespace=fix (3)' '
{ cat expect; echo; echo; } >one &&
git diff -- one >patch &&
- git checkout one &&
+ git checkout -- one &&
git apply --whitespace=fix patch &&
test_cmp expect one
'
@@ -259,7 +259,7 @@ test_expect_success 'blank at end of hunk, not at EOF with --whitespace=fix' '
cp expect one &&
git diff -- one >patch &&
- git checkout one &&
+ git checkout -- one &&
git apply --whitespace=fix patch &&
test_cmp expect one
'
@@ -271,7 +271,7 @@ test_expect_success 'blank at EOF with --whitespace=warn' '
cat one >expect &&
git diff -- one >patch &&
- git checkout one &&
+ git checkout -- one &&
git apply --whitespace=warn patch 2>error &&
test_cmp expect one &&
grep "new blank line at EOF" error
@@ -284,7 +284,7 @@ test_expect_success 'blank at EOF with --whitespace=error' '
echo >>one &&
git diff -- one >patch &&
- git checkout one &&
+ git checkout -- one &&
test_must_fail git apply --whitespace=error patch 2>error &&
test_cmp expect one &&
grep "new blank line at EOF" error
@@ -297,7 +297,7 @@ test_expect_success 'blank but not empty at EOF' '
cat one >expect &&
git diff -- one >patch &&
- git checkout one &&
+ git checkout -- one &&
git apply --whitespace=warn patch 2>error &&
test_cmp expect one &&
grep "new blank line at EOF" error
@@ -309,7 +309,7 @@ test_expect_success 'applying beyond EOF requires one non-blank context line' '
{ echo b; } >>one &&
git diff -- one >patch &&
- git checkout one &&
+ git checkout -- one &&
{ echo a; echo; } >one &&
cp one expect &&
test_must_fail git apply --whitespace=fix patch &&
diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index fc898c9..f72ee38 100755
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -64,7 +64,7 @@ test_expect_success 'post-checkout receives the right args with HEAD changed ' '
'
test_expect_success 'post-checkout receives the right args when not switching branches ' '
- GIT_DIR=clone2/.git git checkout master b &&
+ GIT_DIR=clone2/.git git checkout master -- b &&
old=$(awk "{print \$1}" clone2/.git/post-checkout.args) &&
new=$(awk "{print \$2}" clone2/.git/post-checkout.args) &&
flag=$(awk "{print \$3}" clone2/.git/post-checkout.args) &&
diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index f026837..e5b0daa 100755
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -32,7 +32,7 @@ test_expect_success setup '
git commit -m "E" &&
git tag E &&
git checkout master &&
- git checkout branch foo &&
+ git checkout branch -- foo &&
test_tick &&
git commit -m "B" &&
git tag B &&
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index 8f9b48a..4aae0e9 100755
--- a/t/t6026-merge-attr.sh
+++ b/t/t6026-merge-attr.sh
@@ -72,7 +72,7 @@ test_expect_success 'check merge result in working tree' '
test_expect_success 'retry the merge with longer context' '
echo text conflict-marker-size=32 >>.gitattributes &&
- git checkout -m text &&
+ git checkout -m -- text &&
sed -ne "/^\([<=>]\)\1\1\1*/{
s/ .*$//
p
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index f84ff94..7104f08 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -177,7 +177,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' '
grep "* other" branch.output > /dev/null &&
test_must_fail test -e .git/BISECT_START &&
test -z "$(git for-each-ref "refs/bisect/*")" &&
- git checkout HEAD hello
+ git checkout HEAD -- hello
'
# $HASH1 is good, $HASH4 is bad, we skip $HASH3
diff --git a/t/t6038-merge-text-auto.sh b/t/t6038-merge-text-auto.sh
index 5e8d5fa..2e2979b 100755
--- a/t/t6038-merge-text-auto.sh
+++ b/t/t6038-merge-text-auto.sh
@@ -51,7 +51,7 @@ test_expect_success setup '
git rm .gitattributes &&
rm file &&
- git checkout file &&
+ git checkout -- file &&
test_tick &&
git commit -m "remove .gitattributes" &&
git tag c &&
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index c630aba..0bea83c 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -292,7 +292,7 @@ test_expect_success 'not just commits' '
git update-ref refs/replace/$ORIGINAL $REPLACED &&
mv file file.original &&
- git checkout file &&
+ git checkout -- file &&
test_cmp file.replaced file
'
diff --git a/t/t6111-rev-list-treesame.sh b/t/t6111-rev-list-treesame.sh
index 32474c2..bc46a77 100755
--- a/t/t6111-rev-list-treesame.sh
+++ b/t/t6111-rev-list-treesame.sh
@@ -43,7 +43,7 @@ test_expect_success setup '
test_commit "file=Blah" file "Blah" F &&
test_tick && git merge --no-commit third-branch &&
- git checkout third-branch file &&
+ git checkout third-branch -- file &&
git commit &&
note G &&
git branch fiddler-branch &&
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index d4e6485..f46903f 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -481,7 +481,7 @@ test_expect_success 'mv -k does not accidentally destroy submodules' '
git status --porcelain >actual &&
grep "^R sub -> dest/sub" actual &&
git reset --hard &&
- git checkout .
+ git checkout -- .
'
test_expect_success 'moving a submodule in nested directories' '
diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep-binary.sh
index 615e7e0..de19773 100755
--- a/t/t7008-grep-binary.sh
+++ b/t/t7008-grep-binary.sh
@@ -192,7 +192,7 @@ test_expect_success 'grep --cached respects binary diff attribute (2)' '
rm .gitattributes &&
git grep --cached text t >actual &&
test_when_finished "git rm --cached .gitattributes" &&
- test_when_finished "git checkout .gitattributes" &&
+ test_when_finished "git checkout -- .gitattributes" &&
test_cmp expect actual
'
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 76c223c..65a3d24 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -498,7 +498,7 @@ test_expect_success 'checkout with an unmerged path can be ignored' '
cat sample >fild &&
cat sample >file &&
cat sample >filf &&
- git checkout -f fild file filf &&
+ git checkout -f -- fild file filf &&
test_cmp expect fild &&
test_cmp expect filf &&
test_cmp sample file
@@ -511,11 +511,11 @@ test_expect_success 'checkout unmerged stage' '
cat sample >fild &&
cat sample >file &&
cat sample >filf &&
- git checkout --ours . &&
+ git checkout --ours -- . &&
test_cmp expect fild &&
test_cmp expect filf &&
test_cmp expect file &&
- git checkout --theirs file &&
+ git checkout --theirs -- file &&
test ztheirside = "z$(cat file)"
'
@@ -677,7 +677,7 @@ test_expect_success 'custom merge driver with checkout -m' '
) &&
mv arm expect &&
- git checkout -m arm &&
+ git checkout -m -- arm &&
test_cmp expect arm
'
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 7b36954..7b22454 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -38,7 +38,7 @@ test_expect_success 'git clean with skip-worktree .gitignore' '
test -f obj.o &&
test -f build/lib.so &&
git update-index --no-skip-worktree .gitignore &&
- git checkout .gitignore
+ git checkout -- .gitignore
'
test_expect_success 'git clean' '
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index fa61b1a..bae0137 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -30,12 +30,12 @@ test_expect_success 'setup: initial commit' '
'
test_expect_success '-m and -F do not mix' '
- git checkout HEAD file && echo >>file && git add file &&
+ git checkout HEAD -- file && echo >>file && git add file &&
test_must_fail git commit -m foo -m bar -F file
'
test_expect_success '-m and -C do not mix' '
- git checkout HEAD file && echo >>file && git add file &&
+ git checkout HEAD -- file && echo >>file && git add file &&
test_must_fail git commit -C HEAD -m illegal
'
@@ -119,18 +119,18 @@ test_expect_success 'empty commit message' '
'
test_expect_success 'template "emptyness" check does not kick in with -F' '
- git checkout HEAD file && echo >>file && git add file &&
+ git checkout HEAD -- file && echo >>file && git add file &&
git commit -t file -F file
'
test_expect_success 'template "emptyness" check' '
- git checkout HEAD file && echo >>file && git add file &&
+ git checkout HEAD -- file && echo >>file && git add file &&
test_must_fail git commit -t file 2>err &&
test_i18ngrep "did not edit" err
'
test_expect_success 'setup: commit message from file' '
- git checkout HEAD file && echo >>file && git add file &&
+ git checkout HEAD -- file && echo >>file && git add file &&
echo this is the commit message, coming from a file >msg &&
git commit -F msg -a
'
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index d33a3cb..ec8df56 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -470,7 +470,7 @@ test_expect_success 'Hand committing of a redundant merge removes dups' '
git rev-parse second master >expect &&
test_must_fail git merge second master &&
- git checkout master g &&
+ git checkout master -- g &&
EDITOR=: git commit -a &&
git cat-file commit HEAD | sed -n -e "s/^parent //p" -e "/^$/q" >actual &&
test_cmp expect actual
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index 9c422bc..5e2ea53 100755
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -55,7 +55,7 @@ test_expect_success 'will not overwrite staged changes' '
rm c2.c &&
test_must_fail git merge c2 &&
test_path_is_missing .git/MERGE_HEAD &&
- git checkout c2.c &&
+ git checkout -- c2.c &&
test_cmp important c2.c
'
@@ -88,7 +88,7 @@ test_expect_success 'will not overwrite removed file with staged changes' '
rm c1.c &&
test_must_fail git merge c1a &&
test_path_is_missing .git/MERGE_HEAD &&
- git checkout c1.c &&
+ git checkout -- c1.c &&
test_cmp important c1.c
'
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 1797f63..8d00cc6 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -714,7 +714,7 @@ test_expect_success 'grep with CE_VALID file' '
rm t/t &&
test "$(git grep test)" = "t/t:test" &&
git update-index --no-assume-unchanged t/t &&
- git checkout t/t
+ git checkout -- t/t
'
cat >expected <<EOF
diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index e1951a5..e0e0fbf 100755
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -119,7 +119,7 @@ test_expect_success 'modified file' '
>empty &&
echo "enum grep_pat_token" >unrelated &&
- test_when_finished "git checkout HEAD unrelated" &&
+ test_when_finished "git checkout HEAD -- unrelated" &&
GIT_PAGER=./less git grep -F -O "enum grep_pat_token" >out &&
test_cmp expect actual &&
test_cmp empty out
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index 661f9d4..da3f98f 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -265,7 +265,7 @@ test_expect_success 'blame file with CRLF core.autocrlf=true' '
git commit -m "add crlfinrepo" &&
git config core.autocrlf true &&
mv crlfinrepo tmp &&
- git checkout crlfinrepo &&
+ git checkout -- crlfinrepo &&
rm tmp &&
git blame crlfinrepo >actual &&
grep "A U Thor" actual
diff --git a/t/t8006-blame-textconv.sh b/t/t8006-blame-textconv.sh
index 7683515..a81d677 100755
--- a/t/t8006-blame-textconv.sh
+++ b/t/t8006-blame-textconv.sh
@@ -73,7 +73,7 @@ test_expect_success 'blame --textconv going through revisions' '
'
test_expect_success 'blame --textconv with local changes' '
- test_when_finished "git checkout zero.bin" &&
+ test_when_finished "git checkout -- zero.bin" &&
printf "bin: updated number 0\015" >zero.bin &&
git blame --textconv zero.bin >blame &&
expect="(Not Committed Yet ....-..-.. ..:..:.. +0000 1)" &&
diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index 8eaaca6..ba54fb2 100755
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -258,7 +258,7 @@ test_expect_success 'directory with files' '
try_dump directory.dump &&
git ls-tree -r --name-only HEAD >actual.files &&
- git checkout HEAD directory &&
+ git checkout HEAD -- directory &&
test_cmp expect.files actual.files &&
test_cmp hello directory/file1 &&
test_cmp hi directory/file2
--
2.7.4
^ permalink raw reply related [relevance 5%]
* [PATCHv3 6/6] submodule: fixup nested submodules after moving the submodule
2018-03-28 22:35 4% ` [PATCHv3 " Stefan Beller
@ 2018-03-28 22:35 8% ` Stefan Beller
0 siblings, 0 replies; 200+ results
From: Stefan Beller @ 2018-03-28 22:35 UTC (permalink / raw)
To: jonathantanmy; +Cc: bmwill, git, gitster, hvoigt, sbeller, seanwbehan
connect_work_tree_and_git_dir is used to connect a submodule worktree with
its git directory and vice versa after events that require a reconnection
such as moving around the working tree. As submodules can have nested
submodules themselves, we'd also want to fix the nested submodules when
asked to. Add an option to recurse into the nested submodules and connect
them as well.
As submodules are identified by their name (which determines their git
directory in relation to their superproject's git directory) internally
and by their path in the working tree of the superproject, we need to
make sure that the mapping of name <-> path is kept intact. We can do
that in the git-mv command by writing out the gitmodules file first
and then forcing a reload of the submodule config machinery.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
builtin/mv.c | 6 ++--
builtin/submodule--helper.c | 3 +-
dir.c | 60 +++++++++++++++++++++++++++++++++++--
dir.h | 12 +++++++-
repository.c | 6 ++--
repository.h | 3 ++
submodule.c | 6 ++--
t/t7001-mv.sh | 2 +-
8 files changed, 83 insertions(+), 15 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index cf3684d907..b0c5178e0d 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -275,10 +275,12 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
die_errno(_("renaming '%s' failed"), src);
}
if (submodule_gitfile[i]) {
- if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
- connect_work_tree_and_git_dir(dst, submodule_gitfile[i]);
if (!update_path_in_gitmodules(src, dst))
gitmodules_modified = 1;
+ if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
+ connect_work_tree_and_git_dir(dst,
+ submodule_gitfile[i],
+ 1);
}
if (mode == WORKING_DIRECTORY)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 5551cf19c3..ffdc51f426 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1260,8 +1260,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
strbuf_reset(&sb);
}
- /* Connect module worktree and git dir */
- connect_work_tree_and_git_dir(path, sm_gitdir);
+ connect_work_tree_and_git_dir(path, sm_gitdir, 0);
p = git_pathdup_submodule(path, "config");
if (!p)
diff --git a/dir.c b/dir.c
index ce6e50d2a2..4f401b6a3c 100644
--- a/dir.c
+++ b/dir.c
@@ -19,6 +19,7 @@
#include "varint.h"
#include "ewah/ewok.h"
#include "fsmonitor.h"
+#include "submodule-config.h"
/*
* Tells read_directory_recursive how a file or directory should be treated.
@@ -2988,8 +2989,57 @@ void untracked_cache_add_to_index(struct index_state *istate,
untracked_cache_invalidate_path(istate, path);
}
-/* Update gitfile and core.worktree setting to connect work tree and git dir */
-void connect_work_tree_and_git_dir(const char *work_tree_, const char *git_dir_)
+static void connect_wt_gitdir_in_nested(const char *sub_worktree,
+ const char *sub_gitdir)
+{
+ int i;
+ struct repository subrepo;
+ struct strbuf sub_wt = STRBUF_INIT;
+ struct strbuf sub_gd = STRBUF_INIT;
+
+ const struct submodule *sub;
+
+ /* If the submodule has no working tree, we can ignore it. */
+ if (repo_init(&subrepo, sub_gitdir, sub_worktree))
+ return;
+
+ if (repo_read_index(&subrepo) < 0)
+ die("index file corrupt in repo %s", subrepo.gitdir);
+
+ for (i = 0; i < subrepo.index->cache_nr; i++) {
+ const struct cache_entry *ce = subrepo.index->cache[i];
+
+ if (!S_ISGITLINK(ce->ce_mode))
+ continue;
+
+ while (i + 1 < subrepo.index->cache_nr &&
+ !strcmp(ce->name, subrepo.index->cache[i + 1]->name))
+ /*
+ * Skip entries with the same name in different stages
+ * to make sure an entry is returned only once.
+ */
+ i++;
+
+ sub = submodule_from_path(&subrepo, &null_oid, ce->name);
+ if (!sub || !is_submodule_active(&subrepo, ce->name))
+ /* .gitmodules broken or inactive sub */
+ continue;
+
+ strbuf_reset(&sub_wt);
+ strbuf_reset(&sub_gd);
+ strbuf_addf(&sub_wt, "%s/%s", sub_worktree, sub->path);
+ strbuf_addf(&sub_gd, "%s/modules/%s", sub_gitdir, sub->name);
+
+ connect_work_tree_and_git_dir(sub_wt.buf, sub_gd.buf, 1);
+ }
+ strbuf_release(&sub_wt);
+ strbuf_release(&sub_gd);
+ repo_clear(&subrepo);
+}
+
+void connect_work_tree_and_git_dir(const char *work_tree_,
+ const char *git_dir_,
+ int recurse_into_nested)
{
struct strbuf gitfile_sb = STRBUF_INIT;
struct strbuf cfg_sb = STRBUF_INIT;
@@ -3019,6 +3069,10 @@ void connect_work_tree_and_git_dir(const char *work_tree_, const char *git_dir_)
strbuf_release(&gitfile_sb);
strbuf_release(&cfg_sb);
strbuf_release(&rel_path);
+
+ if (recurse_into_nested)
+ connect_wt_gitdir_in_nested(work_tree, git_dir);
+
free(work_tree);
free(git_dir);
}
@@ -3032,5 +3086,5 @@ void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_
die_errno(_("could not migrate git directory from '%s' to '%s'"),
old_git_dir, new_git_dir);
- connect_work_tree_and_git_dir(path, new_git_dir);
+ connect_work_tree_and_git_dir(path, new_git_dir, 0);
}
diff --git a/dir.h b/dir.h
index 11a047ba48..d2545a7685 100644
--- a/dir.h
+++ b/dir.h
@@ -359,7 +359,17 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long
void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked);
void add_untracked_cache(struct index_state *istate);
void remove_untracked_cache(struct index_state *istate);
-extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
+
+/*
+ * Connect a worktree to a git directory by creating (or overwriting) a
+ * '.git' file containing the location of the git directory. In the git
+ * directory set the core.worktree setting to indicate where the worktree is.
+ * When `recurse_into_nested` is set, recurse into any nested submodules,
+ * connecting them as well.
+ */
+extern void connect_work_tree_and_git_dir(const char *work_tree,
+ const char *git_dir,
+ int recurse_into_nested);
extern void relocate_gitdir(const char *path,
const char *old_git_dir,
const char *new_git_dir);
diff --git a/repository.c b/repository.c
index eb5b8e9f5a..beff3caa9e 100644
--- a/repository.c
+++ b/repository.c
@@ -135,9 +135,9 @@ static int read_and_verify_repository_format(struct repository_format *format,
* Initialize 'repo' based on the provided 'gitdir'.
* Return 0 upon success and a non-zero value upon failure.
*/
-static int repo_init(struct repository *repo,
- const char *gitdir,
- const char *worktree)
+int repo_init(struct repository *repo,
+ const char *gitdir,
+ const char *worktree)
{
struct repository_format format;
memset(repo, 0, sizeof(*repo));
diff --git a/repository.h b/repository.h
index 09df94a472..6041367f08 100644
--- a/repository.h
+++ b/repository.h
@@ -97,6 +97,9 @@ extern void repo_set_gitdir(struct repository *repo,
extern void repo_set_worktree(struct repository *repo, const char *path);
extern void repo_set_hash_algo(struct repository *repo, int algo);
extern void initialize_the_repository(void);
+extern int repo_init(struct repository *r,
+ const char *gitdir,
+ const char *worktree);
extern int repo_submodule_init(struct repository *submodule,
struct repository *superproject,
const char *path);
diff --git a/submodule.c b/submodule.c
index dac73d10a7..53c45e49d0 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1625,7 +1625,7 @@ int submodule_move_head(const char *path,
} else {
char *gitdir = xstrfmt("%s/modules/%s",
get_git_common_dir(), sub->name);
- connect_work_tree_and_git_dir(path, gitdir);
+ connect_work_tree_and_git_dir(path, gitdir, 0);
free(gitdir);
/* make sure the index is clean as well */
@@ -1635,7 +1635,7 @@ int submodule_move_head(const char *path,
if (old && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
char *gitdir = xstrfmt("%s/modules/%s",
get_git_common_dir(), sub->name);
- connect_work_tree_and_git_dir(path, gitdir);
+ connect_work_tree_and_git_dir(path, gitdir, 1);
free(gitdir);
}
}
@@ -1948,7 +1948,7 @@ void absorb_git_dir_into_superproject(const char *prefix,
if (!sub)
die(_("could not lookup name for submodule '%s'"), path);
connect_work_tree_and_git_dir(path,
- git_path("modules/%s", sub->name));
+ git_path("modules/%s", sub->name), 0);
} else {
/* Is it already absorbed into the superprojects git dir? */
char *real_sub_git_dir = real_pathdup(sub_git_dir, 1);
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 6e5031f56f..bfe2c427f1 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -491,7 +491,7 @@ test_expect_success 'moving a submodule in nested directories' '
test_cmp expect actual
'
-test_expect_failure 'moving nested submodules' '
+test_expect_success 'moving nested submodules' '
git commit -am "cleanup commit" &&
mkdir sub_nested_nested &&
(cd sub_nested_nested &&
--
2.17.0.rc1.321.gba9d0f2565-goog
^ permalink raw reply related [relevance 8%]
* [PATCHv3 0/6] Moving submodules with nested submodules
@ 2018-03-28 22:35 4% ` Stefan Beller
2018-03-28 22:35 8% ` [PATCHv3 6/6] submodule: fixup nested submodules after moving the submodule Stefan Beller
0 siblings, 1 reply; 200+ results
From: Stefan Beller @ 2018-03-28 22:35 UTC (permalink / raw)
To: jonathantanmy; +Cc: bmwill, git, gitster, hvoigt, sbeller, seanwbehan
v3:
* reordered patches to have Jonathans patch before submodule_free
* addressed Jonathans comments on patch 5.
* rebased on origin/sb/object-store to resolve a visibility conflict
about repo_init being exposed outside of repository.c
v2:
* addressed memleaks and messy code in patch 5
* removed the extern keyword where applicable
* extended the commit message, stating we want to rename submodule_free
in the future.
* picked up Jonathans patch and added it as a nice finish of the series.
I did not see the need or aesthetic desire to put that patch earlier
in the series.
Thanks,
Stefan
v1:
This fixes the bug reported in [1] ("Bug: moving submodules that have submodules
inside them causes a fatal error in git status")
[1] https://public-inbox.org/git/20180306192017.GA5797@riseup.net/
Thanks,
Stefan
Jonathan Tan (1):
grep: remove "repo" arg from non-supporting funcs
Stefan Beller (5):
submodule.h: drop declaration of connect_work_tree_and_git_dir
submodule-config: allow submodule_free to handle arbitrary
repositories
submodule-config: add repository argument to submodule_from_{name,
path}
submodule-config: remove submodule_from_cache
submodule: fixup nested submodules after moving the submodule
.../technical/api-submodule-config.txt | 2 +-
builtin/grep.c | 14 ++---
builtin/mv.c | 6 +-
builtin/submodule--helper.c | 17 +++---
dir.c | 60 ++++++++++++++++++-
dir.h | 12 +++-
repository.c | 8 +--
repository.h | 3 +
submodule-config.c | 29 ++++-----
submodule-config.h | 15 +++--
submodule.c | 40 +++++++------
submodule.h | 1 -
t/helper/test-submodule-config.c | 8 ++-
t/t7001-mv.sh | 2 +-
unpack-trees.c | 2 +-
15 files changed, 140 insertions(+), 79 deletions(-)
--
2.17.0.rc1.321.gba9d0f2565-goog
^ permalink raw reply [relevance 4%]
* [ANNOUNCE] Git v2.17.0-rc2
@ 2018-03-28 19:56 1% Junio C Hamano
0 siblings, 0 replies; 200+ results
From: Junio C Hamano @ 2018-03-28 19:56 UTC (permalink / raw)
To: git; +Cc: Linux Kernel, git-packagers
A release candidate Git v2.17.0-rc2 is now available for testing
at the usual places. It is comprised of 499 non-merge commits
since v2.16.0, contributed by 62 people, 19 of which are new faces.
I am hoping that we can have the final version tagged at the end of
coming weekend, before I fly out to Tokyo. I expect to be offline
most of the next week after the final is tagged.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the
'v2.17.0-rc2' tag and the 'master' branch that the tag points at:
url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = https://github.com/gitster/git
New contributors whose contributions weren't in v2.16.0 are as follows.
Welcome to the Git development community!
Adam Borowski, Alban Gruin, Andreas G. Schacker, Bernhard
M. Wiedemann, Christian Ludwig, Gargi Sharma, Genki Sky,
Gregory Herrero, Jon Simons, Juan F. Codagnone, Kim Gybels,
Lucas Werkmeister, Mathias Rav, Michele Locati, Motoki Seki,
Stefan Moch, Stephen R Guglielmo, Tatyana Krasnukha, and Thomas
Levesque.
Returning contributors who helped this release are as follows.
Thanks for your continued support.
Ævar Arnfjörð Bjarmason, Alexander Shopov, Alex Bennée, Ben
Peart, Brandon Williams, brian m. carlson, Christian Couder,
Daniel Knittl-Frank, David Pursehouse, Derrick Stolee, Elijah
Newren, Eric Sunshine, Eric Wong, Jason Merrill, Jeff Hostetler,
Jeff King, Johannes Schindelin, Jonathan Nieder, Jonathan Tan,
Junio C Hamano, Kaartic Sivaraam, Mårten Kongstad, Martin
Ågren, Matthieu Moy, Michael Haggerty, Nathan Payre, Nguyễn
Thái Ngọc Duy, Nicolas Morey-Chaisemartin, Olga Telezhnaya,
Patryk Obara, Phillip Wood, Prathamesh Chavan, Ramsay Jones,
Randall S. Becker, Rasmus Villemoes, René Scharfe, Robert
P. J. Day, Stefan Beller, SZEDER Gábor, Thomas Gummerer,
Todd Zullinger, Torsten Bögershausen, and Yasushi SHOJI.
----------------------------------------------------------------
Git 2.17 Release Notes (draft)
==============================
Updates since v2.16
-------------------
UI, Workflows & Features
* "diff" family of commands learned "--find-object=<object-id>" option
to limit the findings to changes that involve the named object.
* "git format-patch" learned to give 72-cols to diffstat, which is
consistent with other line length limits the subcommand uses for
its output meant for e-mails.
* The log from "git daemon" can be redirected with a new option; one
relevant use case is to send the log to standard error (instead of
syslog) when running it from inetd.
* "git rebase" learned to take "--allow-empty-message" option.
* "git am" has learned the "--quit" option, in addition to the
existing "--abort" option; having the pair mirrors a few other
commands like "rebase" and "cherry-pick".
* "git worktree add" learned to run the post-checkout hook, just like
"git clone" runs it upon the initial checkout.
* "git tag" learned an explicit "--edit" option that allows the
message given via "-m" and "-F" to be further edited.
* "git fetch --prune-tags" may be used as a handy short-hand for
getting rid of stale tags that are locally held.
* The new "--show-current-patch" option gives an end-user facing way
to get the diff being applied when "git rebase" (and "git am")
stops with a conflict.
* "git add -p" used to offer "/" (look for a matching hunk) as a
choice, even there was only one hunk, which has been corrected.
Also the single-key help is now given only for keys that are
enabled (e.g. help for '/' won't be shown when there is only one
hunk).
* Since Git 1.7.9, "git merge" defaulted to --no-ff (i.e. even when
the side branch being merged is a descendant of the current commit,
create a merge commit instead of fast-forwarding) when merging a
tag object. This was appropriate default for integrators who pull
signed tags from their downstream contributors, but caused an
unnecessary merges when used by downstream contributors who
habitually "catch up" their topic branches with tagged releases
from the upstream. Update "git merge" to default to --no-ff only
when merging a tag object that does *not* sit at its usual place in
refs/tags/ hierarchy, and allow fast-forwarding otherwise, to
mitigate the problem.
* "git status" can spend a lot of cycles to compute the relation
between the current branch and its upstream, which can now be
disabled with "--no-ahead-behind" option.
* "git diff" and friends learned funcname patterns for Go language
source files.
* "git send-email" learned "--reply-to=<address>" option.
* Funcname pattern used for C# now recognizes "async" keyword.
* In a way similar to how "git tag" learned to honor the pager
setting only in the list mode, "git config" learned to ignore the
pager setting when it is used for setting values (i.e. when the
purpose of the operation is not to "show").
Performance, Internal Implementation, Development Support etc.
* More perf tests for threaded grep
* "perf" test output can be sent to codespeed server.
* The build procedure for perl/ part has been greatly simplified by
weaning ourselves off of MakeMaker.
* Perl 5.8 or greater has been required since Git 1.7.4 released in
2010, but we continued to assume some core modules may not exist and
used a conditional "eval { require <<module>> }"; we no longer do
this. Some platforms (Fedora/RedHat/CentOS, for example) ship Perl
without all core modules by default (e.g. Digest::MD5, File::Temp,
File::Spec, Net::Domain, Net::SMTP). Users on such platforms may
need to install these additional modules.
* As a convenience, we install copies of Perl modules we require which
are not part of the core Perl distribution (e.g. Error and
Mail::Address). Users and packagers whose operating system provides
these modules can set NO_PERL_CPAN_FALLBACKS to avoid installing the
bundled modules.
* In preparation for implementing narrow/partial clone, the machinery
for checking object connectivity used by gc and fsck has been
taught that a missing object is OK when it is referenced by a
packfile specially marked as coming from trusted repository that
promises to make them available on-demand and lazily.
* The machinery to clone & fetch, which in turn involves packing and
unpacking objects, has been told how to omit certain objects using
the filtering mechanism introduced by another topic. It now knows
to mark the resulting pack as a promisor pack to tolerate missing
objects, laying foundation for "narrow" clones.
* The first step to getting rid of mru API and using the
doubly-linked list API directly instead.
* Retire mru API as it does not give enough abstraction over
underlying list API to be worth it.
* Rewrite two more "git submodule" subcommands in C.
* The tracing machinery learned to report tweaking of environment
variables as well.
* Update Coccinelle rules to catch and optimize strbuf_addf(&buf, "%s", str)
* Prevent "clang-format" from breaking line after function return type.
* The sequencer infrastructure is shared across "git cherry-pick",
"git rebase -i", etc., and has always spawned "git commit" when it
needs to create a commit. It has been taught to do so internally,
when able, by reusing the codepath "git commit" itself uses, which
gives performance boost for a few tens of percents in some sample
scenarios.
* Push the submodule version of collision-detecting SHA-1 hash
implementation a bit harder on builders.
* Avoid mmapping small files while using packed refs (especially ones
with zero size, which would cause later munmap() to fail).
* Conversion from uchar[20] to struct object_id continues.
* More tests for wildmatch functions.
* The code to binary search starting from a fan-out table (which is
how the packfile is indexed with object names) has been refactored
into a reusable helper.
* We now avoid using identifiers that clash with C++ keywords. Even
though it is not a goal to compile Git with C++ compilers, changes
like this help use of code analysis tools that targets C++ on our
codebase.
* The executable is now built in 'script' phase in Travis CI integration,
to follow the established practice, rather than during 'before_script'
phase. This allows the CI categorize the failures better ('failed'
is project's fault, 'errored' is build environment's).
(merge 3c93b82920 sg/travis-build-during-script-phase later to maint).
* Writing out the index file when the only thing that changed in it
is the untracked cache information is often wasteful, and this has
been optimized out.
* Various pieces of Perl code we have have been cleaned up.
* Internal API clean-up to allow write_locked_index() optionally skip
writing the in-core index when it is not modified.
Also contains various documentation updates and code clean-ups.
Fixes since v2.16
-----------------
* An old regression in "git describe --all $annotated_tag^0" has been
fixed.
* "git status" after moving a path in the working tree (hence making
it appear "removed") and then adding with the -N option (hence
making that appear "added") detected it as a rename, but did not
report the old and new pathnames correctly.
* "git svn dcommit" did not take into account the fact that a
svn+ssh:// URL with a username@ (typically used for pushing) refers
to the same SVN repository without the username@ and failed when
svn.pushmergeinfo option is set.
* API clean-up around revision traversal.
* "git merge -Xours/-Xtheirs" learned to use our/their version when
resolving a conflicting updates to a symbolic link.
* "git clone $there $here" is allowed even when here directory exists
as long as it is an empty directory, but the command incorrectly
removed it upon a failure of the operation.
* "git commit --fixup" did not allow "-m<message>" option to be used
at the same time; allow it to annotate resulting commit with more
text.
* When resetting the working tree files recursively, the working tree
of submodules are now also reset to match.
* "git stash -- <pathspec>" incorrectly blew away untracked files in
the directory that matched the pathspec, which has been corrected.
* Instead of maintaining home-grown email address parsing code, ship
a copy of reasonably recent Mail::Address to be used as a fallback
in 'git send-email' when the platform lacks it.
(merge d60be8acab mm/send-email-fallback-to-local-mail-address later to maint).
* "git add -p" was taught to ignore local changes to submodules as
they do not interfere with the partial addition of regular changes
anyway.
* Avoid showing a warning message in the middle of a line of "git
diff" output.
(merge 4e056c989f nd/diff-flush-before-warning later to maint).
* The http tracing code, often used to debug connection issues,
learned to redact potentially sensitive information from its output
so that it can be more safely sharable.
(merge 8ba18e6fa4 jt/http-redact-cookies later to maint).
* Crash fix for a corner case where an error codepath tried to unlock
what it did not acquire lock on.
(merge 81fcb698e0 mr/packed-ref-store-fix later to maint).
* The split-index mode had a few corner case bugs fixed.
(merge ae59a4e44f tg/split-index-fixes later to maint).
* Assorted fixes to "git daemon".
(merge ed15e58efe jk/daemon-fixes later to maint).
* Completion of "git merge -s<strategy>" (in contrib/) did not work
well in non-C locale.
(merge 7cc763aaa3 nd/list-merge-strategy later to maint).
* Workaround for segfault with more recent versions of SVN.
(merge 7f6f75e97a ew/svn-branch-segfault-fix later to maint).
* Plug recently introduced leaks in fsck.
(merge ba3a08ca0e jt/fsck-code-cleanup later to maint).
* "git pull --rebase" did not pass verbosity setting down when
recursing into a submodule.
(merge a56771a668 sb/pull-rebase-submodule later to maint).
* The way "git reset --hard" reports the commit the updated HEAD
points at is made consistent with the way how the commit title is
generated by the other parts of the system. This matters when the
title is spread across physically multiple lines.
(merge 1cf823fb68 tg/reset-hard-show-head-with-pretty later to maint).
* Test fixes.
(merge 63b1a175ee sg/test-i18ngrep later to maint).
* Some bugs around "untracked cache" feature have been fixed. This
will notice corrupt data in the untracked cache left by old and
buggy code and issue a warning---the index can be fixed by clearing
the untracked cache from it.
(merge 0cacebf099 nd/fix-untracked-cache-invalidation later to maint).
(merge 7bf0be7501 ab/untracked-cache-invalidation-docs later to maint).
* "git blame HEAD COPYING" in a bare repository failed to run, while
"git blame HEAD -- COPYING" run just fine. This has been corrected.
* "git add" files in the same directory, but spelling the directory
path in different cases on case insensitive filesystem, corrupted
the name hash data structure and led to unexpected results. This
has been corrected.
(merge c95525e90d bp/name-hash-dirname-fix later to maint).
* "git rebase -p" mangled log messages of a merge commit, which is
now fixed.
(merge ed5144d7eb js/fix-merge-arg-quoting-in-rebase-p later to maint).
* Some low level protocol codepath could crash when they get an
unexpected flush packet, which is now fixed.
(merge bb1356dc64 js/packet-read-line-check-null later to maint).
* "git check-ignore" with multiple paths got confused when one is a
file and the other is a directory, which has been fixed.
(merge d60771e930 rs/check-ignore-multi later to maint).
* "git describe $garbage" stopped giving any errors when the garbage
happens to be a string with 40 hexadecimal letters.
(merge a8e7a2bf0f sb/describe-blob later to maint).
* Code to unquote single-quoted string (used in the parser for
configuration files, etc.) did not diagnose bogus input correctly
and produced bogus results instead.
(merge ddbbf8eb25 jk/sq-dequote-on-bogus-input later to maint).
* Many places in "git apply" knew that "/dev/null" that signals
"there is no such file on this side of the diff" can be followed by
whitespace and garbage when parsing a patch, except for one, which
made an otherwise valid patch (e.g. ones from subversion) rejected.
(merge e454ad4bec tk/apply-dev-null-verify-name-fix later to maint).
* We no longer create any *.spec file, so "make clean" should not
remove it.
(merge 4321bdcabb tz/do-not-clean-spec-file later to maint).
* "git push" over http transport did not unquote the push-options
correctly.
(merge 90dce21eb0 jk/push-options-via-transport-fix later to maint).
* "git send-email" learned to complain when the batch-size option is
not defined when the relogin-delay option is, since these two are
mutually required.
(merge 9caa70697b xz/send-email-batch-size later to maint).
* Y2k20 fix ;-) for our perl scripts.
(merge a40e06ee33 bw/perl-timegm-timelocal-fix later to maint).
* Threaded "git grep" has been optimized to avoid allocation in code
section that is covered under a mutex.
(merge 38ef24dccf rv/grep-cleanup later to maint).
* "git subtree" script (in contrib/) scripted around "git log", whose
output got affected by end-user configuration like log.showsignature
(merge 8841b5222c sg/subtree-signed-commits later to maint).
* While finding unique object name abbreviation, the code may
accidentally have read beyond the end of the array of object names
in a pack.
(merge 21abed500c ds/find-unique-abbrev-optim later to maint).
* Micro optimization in revision traversal code.
(merge ebbed3ba04 ds/mark-parents-uninteresting-optim later to maint).
* "git commit" used to run "gc --auto" near the end, which was lost
when the command was reimplemented in C by mistake.
(merge 095c741edd ab/gc-auto-in-commit later to maint).
* Allow running a couple of tests with "sh -x".
(merge c20bf94abc sg/cvs-tests-with-x later to maint).
* The codepath to replace an existing entry in the index had a bug in
updating the name hash structure, which has been fixed.
(merge 0e267b7a24 bp/refresh-cache-ent-rehash-fix later to maint).
* The transfer.fsckobjects configuration tells "git fetch" to
validate the data and connected-ness of objects in the received
pack; the code to perform this check has been taught about the
narrow clone's convention that missing objects that are reachable
from objects in a pack that came from a promissor remote is OK.
* There was an unused file-scope static variable left in http.c when
building for versions of libCURL that is older than 7.19.4, which
has been fixed.
(merge b8fd6008ec rj/http-code-cleanup later to maint).
* Shell script portability fix.
(merge 206a6ae013 ml/filter-branch-portability-fix later to maint).
* Other minor doc, test and build updates and code cleanups.
(merge e2a5a028c7 bw/oidmap-autoinit later to maint).
(merge ec3b4b06f8 cl/t9001-cleanup later to maint).
(merge e1b3f3dd38 ks/submodule-doc-updates later to maint).
(merge fbac558a9b rs/describe-unique-abbrev later to maint).
(merge 8462ff43e4 tb/crlf-conv-flags later to maint).
(merge 7d68bb0766 rb/hashmap-h-compilation-fix later to maint).
(merge 3449847168 cc/sha1-file-name later to maint).
(merge ad622a256f ds/use-get-be64 later to maint).
(merge f919ffebed sg/cocci-move-array later to maint).
(merge 4e801463c7 jc/mailinfo-cleanup-fix later to maint).
(merge ef5b3a6c5e nd/shared-index-fix later to maint).
(merge 9f5258cbb8 tz/doc-show-defaults-to-head later to maint).
(merge b780e4407d jc/worktree-add-short-help later to maint).
(merge ae239fc8e5 rs/cocci-strbuf-addf-to-addstr later to maint).
(merge 2e22a85e5c nd/ignore-glob-doc-update later to maint).
(merge 3738031581 jk/gettext-poison later to maint).
(merge 54360a1956 rj/sparse-updates later to maint).
(merge 12e31a6b12 sg/doc-test-must-fail-args later to maint).
(merge 760f1ad101 bc/doc-interpret-trailers-grammofix later to maint).
(merge 4ccf461f56 bp/fsmonitor later to maint).
(merge a6119f82b1 jk/test-hashmap-updates later to maint).
(merge 5aea9fe6cc rd/typofix later to maint).
(merge e4e5da2796 sb/status-doc-fix later to maint).
(merge 7976e901c8 gs/test-unset-xdg-cache-home later to maint).
(merge d023df1ee6 tg/worktree-create-tracking later to maint).
(merge 4cbe92fd41 sm/mv-dry-run-update later to maint).
(merge 75e5e9c3f7 sb/color-h-cleanup later to maint).
(merge 2708ef4af6 sg/t6300-modernize later to maint).
(merge d88e92d4e0 bw/doc-submodule-recurse-config-with-clone later to maint).
(merge f74bbc8dd2 jk/cached-commit-buffer later to maint).
(merge 1316416903 ms/non-ascii-ticks later to maint).
(merge 878056005e rs/strbuf-read-file-or-whine later to maint).
(merge 79f0ba1547 jk/strbuf-read-file-close-error later to maint).
(merge edfb8ba068 ot/ref-filter-cleanup later to maint).
(merge 11395a3b4b jc/test-must-be-empty later to maint).
(merge 768b9d6db7 mk/doc-pretty-fill later to maint).
(merge 2caa7b8d27 ab/man-sec-list later to maint).
(merge 40c17eb184 ks/t3200-typofix later to maint).
(merge bd9958c358 dp/merge-strategy-doc-fix later to maint).
(merge 9ee0540a40 js/ming-strftime later to maint).
(merge 1775e990f7 tz/complete-tag-delete-tagname later to maint).
(merge 00a4b03501 rj/warning-uninitialized-fix later to maint).
(merge b635ed97a0 jk/attributes-path-doc later to maint).
----------------------------------------------------------------
Changes since v2.16.0 are as follows:
Adam Borowski (1):
hooks/pre-auto-gc-battery: allow gc to run on non-laptops
Alban Gruin (1):
userdiff: add built-in pattern for golang
Alex Bennée (1):
send-email: add test for Linux's get_maintainer.pl
Alexander Shopov (1):
Mark messages for translations
Andreas G. Schacker (1):
doc/read-tree: remove obsolete remark
Ben Peart (4):
dir.c: don't flag the index as dirty for changes to the untracked cache
name-hash: properly fold directory names in adjust_dirname_case()
fsmonitor: update documentation to remove reference to invalid config settings
Fix bugs preventing adding updated cache entries to the name hash
Bernhard M. Wiedemann (1):
perl: call timegm and timelocal with 4-digit year
Brandon Williams (39):
oidmap: ensure map is initialized
object_info: change member name from 'typename' to 'type_name'
object: rename function 'typename' to 'type_name'
blame: rename 'this' variables
pack-objects: rename 'this' variables
rev-parse: rename 'this' variable
submodule: indicate that 'submodule.recurse' doesn't apply to clone
diff: rename 'this' variables
apply: rename 'try' variables
apply: rename 'new' variables
checkout: rename 'new' variables
help: rename 'new' variables
pack-redundant: rename 'new' variables
reflog: rename 'new' variables
remote: rename 'new' variables
combine-diff: rename 'new' variables
commit: rename 'new' variables
diff-lib: rename 'new' variable
diff: rename 'new' variables
diffcore-delta: rename 'new' variables
entry: rename 'new' variables
http: rename 'new' variables
imap-send: rename 'new' variables
line-log: rename 'new' variables
read-cache: rename 'new' variables
ref-filter: rename 'new' variables
remote: rename 'new' variables
split-index: rename 'new' variables
submodule: rename 'new' variables
trailer: rename 'new' variables
unpack-trees: rename 'new' variables
init-db: rename 'template' variables
environment: rename 'template' variables
diff: rename 'template' variables
environment: rename 'namespace' variables
wrapper: rename 'template' variables
tempfile: rename 'template' variables
trailer: rename 'template' variables
replace: rename 'new' variables
Christian Couder (12):
perf/aggregate: fix checking ENV{GIT_PERF_SUBSECTION}
perf/aggregate: refactor printing results
perf/aggregate: implement codespeed JSON output
perf/run: add conf_opts argument to get_var_from_env_or_config()
perf/run: learn about perf.codespeedOutput
perf/run: learn to send output to codespeed server
perf/run: read GIT_PERF_REPO_NAME from perf.repoName
sha1_file: remove static strbuf from sha1_file_name()
sha1_file: improve sha1_file_name() perfs
perf/aggregate: add --subsection option
perf/aggregate: add --reponame option
perf/aggregate: sort JSON fields in output
Christian Ludwig (3):
t9001: use existing helper in send-email test
send-email: rename variable for clarity
send-email: support separate Reply-To address
Daniel Knittl-Frank (1):
describe: prepend "tags/" when describing tags with embedded name
David Pursehouse (1):
Documentation/merge-strategies: typofix
Derrick Stolee (3):
packfile: use get_be64() for large offsets
sha1_name: fix uninitialized memory errors
revision.c: reduce object database queries
Elijah Newren (3):
Tighten and correct a few testcases for merging and cherry-picking
merge-recursive: fix logic ordering issue
merge-recursive: add explanation for src_entry and dst_entry
Eric Sunshine (5):
t5601-clone: test case-conflicting files on case-insensitive filesystem
worktree: add: fix 'post-checkout' not knowing new worktree location
git-worktree.txt: fix missing ")" typo
git-worktree.txt: fix indentation of example and text of 'add' command
t2028: fix minor error and issues in newly-added "worktree move" tests
Eric Wong (2):
fsck: fix leak when traversing trees
git-svn: control destruction order to avoid segfault
Gargi Sharma (1):
mru: Replace mru.[ch] with list.h implementation
Genki Sky (2):
rebase: add --allow-empty-message option
test-lib.sh: unset XDG_CACHE_HOME
Gregory Herrero (1):
rebase -p: fix incorrect commit message when calling `git merge`.
Jason Merrill (1):
git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.
Jeff Hostetler (12):
upload-pack: add object filtering for partial clone
fetch-pack, index-pack, transport: partial clone
fetch-pack: add --no-filter
fetch: support filters
partial-clone: define partial clone settings in config
t5616: end-to-end tests for partial clone
fetch: inherit filter-spec from partial clone
t5616: test bulk prefetch after partial fetch
stat_tracking_info: return +1 when branches not equal
status: add --[no-]ahead-behind to status and commit for V2 format.
status: update short status to respect --no-ahead-behind
status: support --no-ahead-behind in long format
Jeff King (35):
t5600: fix outdated comment about unborn HEAD
t5600: modernize style
clone: factor out dir_exists() helper
clone: do not clean up directories we didn't create
sq_quote_argv: drop maxlen parameter
trace: avoid unnecessary quoting
t5570: use ls-remote instead of clone for interp tests
t/lib-git-daemon: record daemon log
daemon: fix off-by-one in logging extended attributes
daemon: handle NULs in extended attribute string
t/lib-git-daemon: add network-protocol helpers
daemon: fix length computation in newline stripping
t0205: drop redundant test
git-sh-i18n: check GETTEXT_POISON before USE_GETTEXT_SCHEME
correct error messages for NULL packet_read_line()
CodingGuidelines: mention "static" and "extern"
t0002: simplify error checking
describe: confirm that blobs actually exist
test-hashmap: use ALLOC_ARRAY rather than bare malloc
test-hashmap: check allocation computation for overflow
test-hashmap: use xsnprintf rather than snprintf
test-hashmap: use strbuf_getline rather than fgets
test-hashmap: simplify alloc_test_entry
test-hashmap: use "unsigned int" for hash storage
sq_dequote: fix extra consumption of source string
t5545: factor out http repository setup
remote-curl: unquote incoming push-options
commit: drop uses of get_cached_commit_buffer()
revision: drop --show-all option
t: send verbose test-helper output to fd 4
strbuf_read_file(): preserve errno across close() call
smart-http: document flush after "# service" line
t3701: add a test for interactive.diffFilter
add--interactive: detect bogus diffFilter output
doc/gitattributes: mention non-recursive behavior
Johannes Schindelin (3):
sequencer: assign only free()able strings to gpg_sign
apply: demonstrate a problem applying svn diffs
mingw: abort on invalid strftime formats
Jon Simons (1):
always check for NULL return from packet_read_line()
Jonathan Nieder (1):
perl: treat PERLLIB_EXTRA as an extra path again
Jonathan Tan (23):
extension.partialclone: introduce partial clone extension
fsck: introduce partialclone extension
fsck: support refs pointing to promisor objects
fsck: support referenced promisor objects
fsck: support promisor objects as CLI argument
index-pack: refactor writing of .keep files
introduce fetch-object: fetch one promisor object
sha1_file: support lazily fetching missing objects
rev-list: support termination at promisor objects
gc: do not repack promisor packfiles
fetch-pack: test support excluding large blobs
fetch: refactor calculation of remote list
clone: partial clone
unpack-trees: batch fetching of missing blobs
fetch-pack: restore save_commit_buffer after use
http: support cookie redaction when tracing
http: support omitting data from traces
Docs: split out long-running subprocess handshake
packfile: remove GIT_DEBUG_LOOKUP log statements
packfile: refactor hash search with fanout table
sha1_file: restore OBJECT_INFO_QUICK functionality
index-pack: support checking objects but not links
fetch-pack: do not check links for partial fetch
Juan F. Codagnone (1):
mailinfo: avoid segfault when can't open files
Junio C Hamano (22):
merge: teach -Xours/-Xtheirs to symbolic link merge
worktree: say that "add" takes an arbitrary commit in short-help
Start 2.17 cycle
Git 2.16.1
First batch after 2.16
blame: tighten command line parser
Second batch for 2.17
Third batch for 2.17
Git 2.16.2
merge: allow fast-forward when merging a tracked tag
Fourth batch for 2.17
Fifth batch for 2.17
test_must_be_empty: make sure the file exists, not just empty
untracked cache: use git_env_bool() not getenv() for customization
Sixth batch for 2.17
Seventh batch for 2.17
Eighth batch for 2.17
Git 2.17-rc0
Git 2.17-rc1
Git 2.16.3
t9902: disable test on the list of merge-strategies under GETTEXT_POISON
Git 2.17-rc2
Kaartic Sivaraam (3):
Doc/gitsubmodules: make some changes to improve readability and syntax
Doc/git-submodule: improve readability and grammar of a sentence
t/t3200: fix a typo in a test description
Kim Gybels (1):
packed_ref_cache: don't use mmap() for small files
Lucas Werkmeister (1):
daemon: add --log-destination=(stderr|syslog|none)
Martin Ågren (9):
t7006: add tests for how git config paginates
config: respect `pager.config` in list/get-mode only
config: change default of `pager.config` to "on"
sequencer: make lockfiles non-static
sequencer: always roll back lock in `do_recursive_merge()`
merge-recursive: always roll back lock in `merge_recursive_generic()`
merge: always roll back lock in `checkout_fast_forward()`
sequencer: do not roll back lockfile unnecessarily
write_locked_index(): add flag to avoid writing unchanged index
Mathias Rav (1):
files_initial_transaction_commit(): only unlock if locked
Matthieu Moy (2):
send-email: add and use a local copy of Mail::Address
perl/Git: remove now useless email-address parsing code
Michael Haggerty (5):
struct snapshot: store `start` rather than `header_len`
create_snapshot(): use `xmemdupz()` rather than a strbuf
find_reference_location(): make function safe for empty snapshots
packed_ref_iterator_begin(): make optimization more general
load_contents(): don't try to mmap an empty file
Michele Locati (1):
filter-branch: use printf instead of echo -e
Motoki Seki (1):
Documentation/gitsubmodules.txt: avoid non-ASCII apostrophes
Mårten Kongstad (1):
docs/pretty-formats: fix typo '% <(<N>)' -> '%<|(<N>)'
Nathan Payre (1):
send-email: extract email-parsing code into a subroutine
Nguyễn Thái Ngọc Duy (85):
t2203: test status output with porcelain v2 format
Use DIFF_DETECT_RENAME for detect_rename assignments
wt-status.c: coding style fix
wt-status.c: catch unhandled diff status codes
wt-status.c: rename rename-related fields in wt_status_change_data
wt-status.c: handle worktree renames
trace.c: move strbuf_release() out of print_trace_line()
add--interactive: ignore submodule changes except HEAD
read-cache.c: change type of "temp" in write_shared_index()
read-cache.c: move tempfile creation/cleanup out of write_shared_index
diff.c: flush stdout before printing rename warnings
run-command.c: introduce trace_run_command()
run-command.c: print program 'git' when tracing git_cmd mode
run-command.c: print env vars in trace_run_command()
run-command.c: print new cwd in trace_run_command()
read-cache: don't write index twice if we can't write shared index
worktree.c: add validate_worktree()
dir.c: avoid stat() in valid_cached_dir()
dir.c: fix missing dir invalidation in untracked code
format-patch: keep cover-letter diffstat wrapped in 72 columns
completion: fix completing merge strategies on non-C locales
dir.c: stop ignoring opendir() error in open_cached_dir()
format-patch: reduce patch diffstat width to 72
gitignore.txt: elaborate shell glob syntax
trace: measure where the time is spent in the index-heavy operations
diff.c: refactor pprint_rename() to use strbuf
dir.c: ignore paths containing .git when invalidating untracked cache
parse-options: support --git-completion-helper
parse-options: add OPT_xxx_F() variants
parse-options: let OPT__FORCE take optional flags argument
git-completion.bash: introduce __gitcomp_builtin
completion: use __gitcomp_builtin in _git_add
completion: use __gitcomp_builtin in _git_am
completion: use __gitcomp_builtin in _git_apply
completion: use __gitcomp_builtin in _git_branch
completion: use __gitcomp_builtin in _git_checkout
completion: use __gitcomp_builtin in _git_cherry_pick
completion: use __gitcomp_builtin in _git_clean
completion: use __gitcomp_builtin in _git_clone
completion: use __gitcomp_builtin in _git_commit
completion: use __gitcomp_builtin in _git_config
completion: use __gitcomp_builtin in _git_describe
completion: use __gitcomp_builtin in _git_difftool
completion: use __gitcomp_builtin in _git_fetch
completion: use __gitcomp_builtin in _git_fsck
completion: use __gitcomp_builtin in _git_gc
completion: use __gitcomp_builtin in _git_grep
completion: use __gitcomp_builtin in _git_help
completion: use __gitcomp_builtin in _git_init
completion: use __gitcomp_builtin in _git_ls_files
completion: use __gitcomp_builtin in _git_ls_remote
completion: use __gitcomp_builtin in _git_merge
completion: use __gitcomp_builtin in _git_merge_base
completion: use __gitcomp_builtin in _git_mv
completion: use __gitcomp_builtin in _git_name_rev
completion: use __gitcomp_builtin in _git_notes
completion: use __gitcomp_builtin in _git_pull
completion: use __gitcomp_builtin in _git_push
completion: use __gitcomp_builtin in _git_remote
remote: force completing --mirror= instead of --mirror
completion: use __gitcomp_builtin in _git_replace
completion: use __gitcomp_builtin in _git_reset
completion: use __gitcomp_builtin in _git_revert
completion: use __gitcomp_builtin in _git_rm
completion: use __gitcomp_builtin in _git_show_branch
completion: use __gitcomp_builtin in _git_status
completion: use __gitcomp_builtin in _git_tag
completion: use __gitcomp_builtin in _git_worktree
worktree.c: add update_worktree_location()
worktree move: new command
worktree move: accept destination as directory
worktree move: refuse to move worktrees with submodules
worktree remove: new command
worktree remove: allow it when $GIT_WORK_TREE is already gone
am: add --show-current-patch
rebase: add --show-current-patch
rebase: introduce and use pseudo-ref REBASE_HEAD
am: support --quit
diff: add --compact-summary
object.h: update flag allocation comment
object.h: realign object flag allocation comment
completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate
completion: simplify _git_notes
completion: complete --{reuse,reedit}-message= for all notes subcmds
completion: more subcommands in _git_notes()
Nicolas Morey-Chaisemartin (1):
tag: add --edit option
Olga Telezhnaya (3):
mru: use double-linked list from list.h
ref-filter: get rid of duplicate code
ref-filter: get rid of goto
Patryk Obara (14):
clang-format: adjust penalty for return type line break
http-push: improve error log
sha1_file: convert pretend_sha1_file to object_id
dir: convert struct sha1_stat to use object_id
sha1_file: convert hash_sha1_file to object_id
cache: clear whole hash buffer with oidclr
match-trees: convert splice_tree to object_id
commit: convert commit_tree* to object_id
notes: convert combine_notes_* to object_id
notes: convert write_notes_tree to object_id
sha1_file: convert write_sha1_file to object_id
sha1_file: convert force_object_loose to object_id
sha1_file: convert write_loose_object to object_id
sha1_file: rename hash_sha1_file_literally
Phillip Wood (25):
t3404: check intermediate squash messages
commit: move empty message checks to libgit
Add a function to update HEAD after creating a commit
commit: move post-rewrite code to libgit
commit: move print_commit_summary() to libgit
sequencer: simplify adding Signed-off-by: trailer
sequencer: load commit related config
sequencer: try to commit without forking 'git commit'
t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
sequencer: improve config handling
t7505: style fixes
t7505: add tests for cherry-pick and rebase -i/-p
sequencer: run 'prepare-commit-msg' hook
add -p: only display help for active keys
add -p: only bind search key if there's more than one hunk
add -p: improve error messages
add -i: add function to format hunk header
t3701: indent here documents
t3701: use test_write_lines and write_script
t3701: don't hard code sha1 hash values
t3701: add failing test for pathological context lines
add -p: adjust offsets of subsequent hunks when one is skipped
add -p: calculate offset delta for edited patches
add -p: fix counting when splitting and coalescing
add -p: don't rely on apply's '--recount' option
Prathamesh Chavan (2):
submodule: port submodule subcommand 'sync' from shell to C
submodule: port submodule subcommand 'deinit' from shell to C
Ramsay Jones (6):
t4151: consolidate multiple calls to test_i18ngrep
config.mak.uname: remove SPARSE_FLAGS setting for cygwin
Makefile: suppress a sparse warning for pack-revindex.c
http: fix an unused variable warning for 'curl_no_proxy'
-Wuninitialized: remove some 'init-self' workarounds
read-cache: fix an -Wmaybe-uninitialized warning
Randall S. Becker (1):
hashmap.h: remove unused variable
Rasmus Villemoes (2):
grep: move grep_source_init outside critical section
grep: simplify grep_oid and grep_file
René Scharfe (15):
commit: avoid allocation in clear_commit_marks_many()
commit: use clear_commit_marks_many() in remove_redundant()
ref-filter: use clear_commit_marks_many() in do_merge_filter()
object: add clear_commit_marks_all()
bisect: avoid using the rev_info flag leak_pending
bundle: avoid using the rev_info flag leak_pending
checkout: avoid using the rev_info flag leak_pending
revision: remove the unused flag leak_pending
commit: remove unused function clear_commit_marks_for_object_array()
describe: use strbuf_add_unique_abbrev() for adding short hashes
cocci: use format keyword instead of a literal string
cocci: simplify check for trivial format strings
check-ignore: fix mix of directories and other file types
sequencer: factor out strbuf_read_file_or_whine()
perf: use GIT_PERF_REPEAT_COUNT=3 by default even without config file
Robert P. J. Day (2):
t/: correct obvious typo "detahced"
Correct mispellings of ".gitmodule" to ".gitmodules"
SZEDER Gábor (34):
travis-ci: build Git during the 'script' phase
Use MOVE_ARRAY
travis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux build
travis-ci: use 'set -e' in the 32 bit Linux build job
travis-ci: don't repeat the path of the cache directory
travis-ci: don't run the test suite as root in the 32 bit Linux build
travis-ci: don't fail if user already exists on 32 bit Linux build job
t5541: add 'test_i18ngrep's missing filename parameter
t5812: add 'test_i18ngrep's missing filename parameter
t6022: don't run 'git merge' upstream of a pipe
t4001: don't run 'git status' upstream of a pipe
t5510: consolidate 'grep' and 'test_i18ngrep' patterns
t5536: let 'test_i18ngrep' read the file without redirection
t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'
t: validate 'test_i18ngrep's parameters
t: make 'test_i18ngrep' more informative on failure
t: document 'test_must_fail ok=<signal-name>'
t6300-for-each-ref: fix "more than one quoting style" tests
Makefile: generate Git(3pm) as dependency of the 'doc' and 'man' targets
t: prevent '-x' tracing from interfering with test helpers' stderr
t: add means to disable '-x' tracing for individual test scripts
t1507-rev-parse-upstream: don't check the stderr of a shell function
t5536: simplify checking of messages output to stderr
t3030-merge-recursive: don't check the stderr of a subshell
t5500-fetch-pack: don't check the stderr of a subshell
t5526: use $TRASH_DIRECTORY to specify the path of GIT_TRACE log file
t5570-git-daemon: don't check the stderr of a subshell
t9903-bash-prompt: don't check the stderr of __git_ps1()
t1510-repo-setup: mark as untraceable with '-x'
t/README: add a note about don't saving stderr of compound commands
travis-ci: run tests with '-x' tracing
t9400-git-cvsserver-server: don't rely on the output of 'test_cmp'
t9402-git-cvsserver-refs: don't check the stderr of a subshell
completion: clear cached --options when sourcing the completion script
Stefan Beller (15):
diff.h: make pickaxe_opts an unsigned bit field
diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit
diff: introduce DIFF_PICKAXE_KINDS_MASK
diffcore: add a pickaxe option to find a specific blob
diff: properly error out when combining multiple pickaxe options
diff: use HAS_MULTI_BITS instead of counting bits manually
t/lib-submodule-update.sh: clarify test
t/lib-submodule-update.sh: fix test ignoring ignored files in submodules
unpack-trees: oneway_merge to update submodules
submodule: submodule_move_head omits old argument in forced case
builtin/pull: respect verbosity settings in submodules
send-email: error out when relogin delay is missing
color.h: document and modernize header
Documentation/git-status: clarify status table for porcelain mode
submodule deinit: handle non existing pathspecs gracefully
Stefan Moch (2):
t7001: add test case for --dry-run
mv: remove unneeded 'if (!show_only)'
Stephen R Guglielmo (1):
subtree: fix add and pull for GPG-signed commits
Tatyana Krasnukha (1):
apply: handle Subversion diffs with /dev/null gracefully
Thomas Gummerer (6):
stash: don't delete untracked files that match pathspec
read-cache: fix reading the shared index for other repos
split-index: don't write cache tree with null oid entries
travis: run tests with GIT_TEST_SPLIT_INDEX
reset --hard: make use of the pretty machinery
git-stash.txt: remove extra square bracket
Thomas Levesque (1):
userdiff.c: add C# async keyword in diff pattern
Todd Zullinger (5):
doc: mention 'git show' defaults to HEAD
Makefile: remove *.spec from clean target
Makefile: add NO_PERL_CPAN_FALLBACKS knob
RelNotes: add details on Perl module changes
completion: complete tags with git tag --delete/--verify
Torsten Bögershausen (1):
convert_to_git(): safe_crlf/checksafe becomes int conv_flags
Yasushi SHOJI (1):
bisect: debug: convert struct object to object_id
brian m. carlson (15):
repository: pre-initialize hash algo pointer
hash: move SHA-1 macros to hash.h
hash: create union for hash context allocation
builtin/index-pack: improve hash function abstraction
builtin/unpack-objects: switch uses of SHA-1 to the_hash_algo
sha1_file: switch uses of SHA-1 to the_hash_algo
fast-import: switch various uses of SHA-1 to the_hash_algo
pack-check: convert various uses of SHA-1 to abstract forms
pack-write: switch various SHA-1 values to abstract forms
read-cache: abstract away uses of SHA-1
csum-file: rename sha1file to hashfile
csum-file: abstract uses of SHA-1
bulk-checkin: abstract SHA-1 usage
hash: update obsolete reference to SHA1_HEADER
docs/interpret-trailers: fix agreement error
Ævar Arnfjörð Bjarmason (53):
Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto
Makefile: under "make dist", include the sha1collisiondetection submodule
sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
Makefile: replace perl/Makefile.PL with simple make rules
commit doc: document that -c, -C, -F and --fixup with -m error
commit: add support for --fixup <commit> -m"<extra message>"
perl: avoid *.pmc and fix Error.pm further
perf: amend the grep tests to test grep.threads
cat-file doc: document that -e will return some output
status: add a failing test showing a core.untrackedCache bug
wildmatch test: indent with tabs, not spaces
wildmatch test: use more standard shell style
wildmatch test: don't try to vertically align our output
wildmatch test: use a paranoia pattern from nul_match()
wildmatch test: remove dead fnmatch() test code
wildmatch test: use test_must_fail, not ! for test-wildmatch
wildmatch test: perform all tests under all wildmatch() modes
wildmatch test: create & test files on disk in addition to in-memory
test-lib: add an EXPENSIVE_ON_WINDOWS prerequisite
wildmatch test: mark test as EXPENSIVE_ON_WINDOWS
fetch: don't redundantly NULL something calloc() gave us
fetch: trivially refactor assignment to ref_nr
fetch: stop accessing "remote" variable indirectly
remote: add a macro for "refs/tags/*:refs/tags/*"
fetch tests: refactor in preparation for testing tag pruning
fetch tests: re-arrange arguments for future readability
fetch tests: add a tag to be deleted to the pruning tests
fetch tests: test --prune and refspec interaction
fetch tests: double quote a variable for interpolation
fetch tests: expand case/esac for later change
fetch tests: fetch <url> <spec> as well as fetch [<remote>]
git fetch doc: add a new section to explain the ins & outs of pruning
git remote doc: correct dangerous lies about what prune does
git-fetch & config doc: link to the new PRUNING section
fetch tests: add scaffolding for the new fetch.pruneTags
fetch: add a --prune-tags option and fetch.pruneTags config
fetch: make the --prune-tags work with <url>
update-index doc: note a fixed bug in the untracked cache
update-index doc: note the caveat with "could not open..."
perl: *.pm files should not have the executable bit
Git.pm: remove redundant "use strict" from sub-package
Git.pm: add the "use warnings" pragma
commit: run git gc --auto just before the post-commit hook
gitweb: hard-depend on the Digest::MD5 5.8 module
Git.pm: hard-depend on the File::{Temp,Spec} modules
git-send-email: unconditionally use Net::{SMTP,Domain}
perl: update our ancient copy of Error.pm
perl: update our copy of Mail::Address
perl: move CPAN loader wrappers to another namespace
perl: generalize the Git::LoadCPAN facility
perl: move the perl/Git/FromCPAN tree to perl/FromCPAN
perl Git::LoadCPAN: emit better errors under NO_PERL_CPAN_FALLBACKS
git manpage: note git-security@googlegroups.com
^ permalink raw reply [relevance 1%]
* Re: [PATCH 5/6] submodule: fixup nested submodules after moving the submodule
2018-03-28 17:24 9% ` [PATCH 5/6] submodule: fixup nested submodules after moving the submodule Stefan Beller
@ 2018-03-28 17:35 0% ` Brandon Williams
0 siblings, 0 replies; 200+ results
From: Brandon Williams @ 2018-03-28 17:35 UTC (permalink / raw)
To: Stefan Beller; +Cc: gitster, git, hvoigt, jonathantanmy, seanwbehan
On 03/28, Stefan Beller wrote:
> connect_work_tree_and_git_dir is used to connect a submodule worktree with
> its git directory and vice versa after events that require a reconnection
> such as moving around the working tree. As submodules can have nested
> submodules themselves, we'd also want to fix the nested submodules when
> asked to. Add an option to recurse into the nested submodules and connect
> them as well.
>
> As submodules are identified by their name (which determines their git
> directory in relation to their superproject's git directory) internally
> and by their path in the working tree of the superproject, we need to
> make sure that the mapping of name <-> path is kept intact. We can do
> that in the git-mv command by writing out the gitmodules file first
> and then forcing a reload of the submodule config machinery.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> builtin/mv.c | 6 ++--
> builtin/submodule--helper.c | 3 +-
> dir.c | 63 +++++++++++++++++++++++++++++++++++--
> dir.h | 12 ++++++-
> submodule.c | 6 ++--
> t/t7001-mv.sh | 2 +-
> 6 files changed, 80 insertions(+), 12 deletions(-)
>
> diff --git a/builtin/mv.c b/builtin/mv.c
> index 6d141f7a53..7a63667d64 100644
> --- a/builtin/mv.c
> +++ b/builtin/mv.c
> @@ -276,10 +276,12 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
> die_errno(_("renaming '%s' failed"), src);
> }
> if (submodule_gitfile[i]) {
> - if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
> - connect_work_tree_and_git_dir(dst, submodule_gitfile[i]);
> if (!update_path_in_gitmodules(src, dst))
> gitmodules_modified = 1;
> + if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
> + connect_work_tree_and_git_dir(dst,
> + submodule_gitfile[i],
> + 1);
> }
>
> if (mode == WORKING_DIRECTORY)
> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
> index a921fbbf56..05fd657f99 100644
> --- a/builtin/submodule--helper.c
> +++ b/builtin/submodule--helper.c
> @@ -1259,8 +1259,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
> strbuf_reset(&sb);
> }
>
> - /* Connect module worktree and git dir */
> - connect_work_tree_and_git_dir(path, sm_gitdir);
> + connect_work_tree_and_git_dir(path, sm_gitdir, 0);
>
> p = git_pathdup_submodule(path, "config");
> if (!p)
> diff --git a/dir.c b/dir.c
> index dedbf5d476..71947c0ef3 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -19,6 +19,7 @@
> #include "varint.h"
> #include "ewah/ewok.h"
> #include "fsmonitor.h"
> +#include "submodule-config.h"
>
> /*
> * Tells read_directory_recursive how a file or directory should be treated.
> @@ -3010,8 +3011,60 @@ void untracked_cache_add_to_index(struct index_state *istate,
> untracked_cache_invalidate_path(istate, path, 1);
> }
>
> -/* Update gitfile and core.worktree setting to connect work tree and git dir */
> -void connect_work_tree_and_git_dir(const char *work_tree_, const char *git_dir_)
> +static void connect_wt_gitdir_in_nested(const char *sub_worktree,
> + const char *sub_gitdir)
> +{
> + int i;
> + struct repository subrepo;
> + struct strbuf sub_wt = STRBUF_INIT;
> + struct strbuf sub_gd = STRBUF_INIT;
> +
> + const struct submodule *sub;
> +
> + if (repo_init(&subrepo, sub_gitdir, sub_worktree))
> + return;
Note that in Duy's object-store series he made this function private
(IIRC) so this will result in some clash of the two series.
> +
> + if (repo_read_index(&subrepo) < 0)
> + die("index file corrupt in repo %s", subrepo.gitdir);
> +
> + for (i = 0; i < subrepo.index->cache_nr; i++) {
> + const struct cache_entry *ce = subrepo.index->cache[i];
> +
> + if (!S_ISGITLINK(ce->ce_mode))
> + continue;
> +
> + while (i + 1 < subrepo.index->cache_nr &&
> + !strcmp(ce->name, subrepo.index->cache[i + 1]->name))
> + /*
> + * Skip entries with the same name in different stages
> + * to make sure an entry is returned only once.
> + */
> + i++;
> +
> + sub = submodule_from_path(&subrepo, &null_oid, ce->name);
> + if (!sub)
> + /* submodule not checked out? */
> + continue;
> +
> + if (is_submodule_active(&subrepo, ce->name)) {
> + strbuf_addf(&sub_wt, "%s/%s", sub_worktree, sub->path);
> + strbuf_addf(&sub_gd, "%s/modules/%s", sub_gitdir, sub->name);
> +
> + connect_work_tree_and_git_dir(sub_wt.buf, sub_gd.buf, 0);
> + connect_wt_gitdir_in_nested(sub_wt.buf, sub_gd.buf);
> +
> + strbuf_reset(&sub_wt);
> + strbuf_reset(&sub_gd);
> + }
> + }
> + strbuf_release(&sub_wt);
> + strbuf_release(&sub_gd);
> + repo_clear(&subrepo);
> +}
> +
> +void connect_work_tree_and_git_dir(const char *work_tree_,
> + const char *git_dir_,
> + int recurse_into_nested)
> {
> struct strbuf gitfile_sb = STRBUF_INIT;
> struct strbuf cfg_sb = STRBUF_INIT;
> @@ -3041,6 +3094,10 @@ void connect_work_tree_and_git_dir(const char *work_tree_, const char *git_dir_)
> strbuf_release(&gitfile_sb);
> strbuf_release(&cfg_sb);
> strbuf_release(&rel_path);
> +
> + if (recurse_into_nested)
> + connect_wt_gitdir_in_nested(work_tree, git_dir);
> +
> free(work_tree);
> free(git_dir);
> }
> @@ -3054,5 +3111,5 @@ void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_
> die_errno(_("could not migrate git directory from '%s' to '%s'"),
> old_git_dir, new_git_dir);
>
> - connect_work_tree_and_git_dir(path, new_git_dir);
> + connect_work_tree_and_git_dir(path, new_git_dir, 0);
> }
> diff --git a/dir.h b/dir.h
> index b0758b82a2..3870193e52 100644
> --- a/dir.h
> +++ b/dir.h
> @@ -359,7 +359,17 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long
> void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked);
> void add_untracked_cache(struct index_state *istate);
> void remove_untracked_cache(struct index_state *istate);
> -extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
> +
> +/*
> + * Connect a worktree to a git directory by creating (or overwriting) a
> + * '.git' file containing the location of the git directory. In the git
> + * directory set the core.worktree setting to indicate where the worktree is.
> + * When `recurse_into_nested` is set, recurse into any nested submodules,
> + * connecting them as well.
> + */
> +extern void connect_work_tree_and_git_dir(const char *work_tree,
> + const char *git_dir,
> + int recurse_into_nested);
> extern void relocate_gitdir(const char *path,
> const char *old_git_dir,
> const char *new_git_dir);
> diff --git a/submodule.c b/submodule.c
> index 89d0aee086..c2dac6c00f 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -1624,7 +1624,7 @@ int submodule_move_head(const char *path,
> } else {
> char *gitdir = xstrfmt("%s/modules/%s",
> get_git_common_dir(), sub->name);
> - connect_work_tree_and_git_dir(path, gitdir);
> + connect_work_tree_and_git_dir(path, gitdir, 0);
> free(gitdir);
>
> /* make sure the index is clean as well */
> @@ -1634,7 +1634,7 @@ int submodule_move_head(const char *path,
> if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
> char *gitdir = xstrfmt("%s/modules/%s",
> get_git_common_dir(), sub->name);
> - connect_work_tree_and_git_dir(path, gitdir);
> + connect_work_tree_and_git_dir(path, gitdir, 1);
> free(gitdir);
> }
> }
> @@ -1947,7 +1947,7 @@ void absorb_git_dir_into_superproject(const char *prefix,
> if (!sub)
> die(_("could not lookup name for submodule '%s'"), path);
> connect_work_tree_and_git_dir(path,
> - git_path("modules/%s", sub->name));
> + git_path("modules/%s", sub->name), 0);
> } else {
> /* Is it already absorbed into the superprojects git dir? */
> char *real_sub_git_dir = real_pathdup(sub_git_dir, 1);
> diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
> index d4e6485a26..ff70244620 100755
> --- a/t/t7001-mv.sh
> +++ b/t/t7001-mv.sh
> @@ -497,7 +497,7 @@ test_expect_success 'moving a submodule in nested directories' '
> test_cmp expect actual
> '
>
> -test_expect_failure 'moving nested submodules' '
> +test_expect_success 'moving nested submodules' '
> git commit -am "cleanup commit" &&
> mkdir sub_nested_nested &&
> (cd sub_nested_nested &&
> --
> 2.17.0.rc1.321.gba9d0f2565-goog
>
--
Brandon Williams
^ permalink raw reply [relevance 0%]
* [PATCH 5/6] submodule: fixup nested submodules after moving the submodule
2018-03-28 17:24 4% ` [PATCHv2 0/6] Moving submodules with nested submodules Stefan Beller
@ 2018-03-28 17:24 9% ` Stefan Beller
2018-03-28 17:35 0% ` Brandon Williams
0 siblings, 1 reply; 200+ results
From: Stefan Beller @ 2018-03-28 17:24 UTC (permalink / raw)
To: sbeller, gitster; +Cc: bmwill, git, hvoigt, jonathantanmy, seanwbehan
connect_work_tree_and_git_dir is used to connect a submodule worktree with
its git directory and vice versa after events that require a reconnection
such as moving around the working tree. As submodules can have nested
submodules themselves, we'd also want to fix the nested submodules when
asked to. Add an option to recurse into the nested submodules and connect
them as well.
As submodules are identified by their name (which determines their git
directory in relation to their superproject's git directory) internally
and by their path in the working tree of the superproject, we need to
make sure that the mapping of name <-> path is kept intact. We can do
that in the git-mv command by writing out the gitmodules file first
and then forcing a reload of the submodule config machinery.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
builtin/mv.c | 6 ++--
builtin/submodule--helper.c | 3 +-
dir.c | 63 +++++++++++++++++++++++++++++++++++--
dir.h | 12 ++++++-
submodule.c | 6 ++--
t/t7001-mv.sh | 2 +-
6 files changed, 80 insertions(+), 12 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index 6d141f7a53..7a63667d64 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -276,10 +276,12 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
die_errno(_("renaming '%s' failed"), src);
}
if (submodule_gitfile[i]) {
- if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
- connect_work_tree_and_git_dir(dst, submodule_gitfile[i]);
if (!update_path_in_gitmodules(src, dst))
gitmodules_modified = 1;
+ if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
+ connect_work_tree_and_git_dir(dst,
+ submodule_gitfile[i],
+ 1);
}
if (mode == WORKING_DIRECTORY)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index a921fbbf56..05fd657f99 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1259,8 +1259,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
strbuf_reset(&sb);
}
- /* Connect module worktree and git dir */
- connect_work_tree_and_git_dir(path, sm_gitdir);
+ connect_work_tree_and_git_dir(path, sm_gitdir, 0);
p = git_pathdup_submodule(path, "config");
if (!p)
diff --git a/dir.c b/dir.c
index dedbf5d476..71947c0ef3 100644
--- a/dir.c
+++ b/dir.c
@@ -19,6 +19,7 @@
#include "varint.h"
#include "ewah/ewok.h"
#include "fsmonitor.h"
+#include "submodule-config.h"
/*
* Tells read_directory_recursive how a file or directory should be treated.
@@ -3010,8 +3011,60 @@ void untracked_cache_add_to_index(struct index_state *istate,
untracked_cache_invalidate_path(istate, path, 1);
}
-/* Update gitfile and core.worktree setting to connect work tree and git dir */
-void connect_work_tree_and_git_dir(const char *work_tree_, const char *git_dir_)
+static void connect_wt_gitdir_in_nested(const char *sub_worktree,
+ const char *sub_gitdir)
+{
+ int i;
+ struct repository subrepo;
+ struct strbuf sub_wt = STRBUF_INIT;
+ struct strbuf sub_gd = STRBUF_INIT;
+
+ const struct submodule *sub;
+
+ if (repo_init(&subrepo, sub_gitdir, sub_worktree))
+ return;
+
+ if (repo_read_index(&subrepo) < 0)
+ die("index file corrupt in repo %s", subrepo.gitdir);
+
+ for (i = 0; i < subrepo.index->cache_nr; i++) {
+ const struct cache_entry *ce = subrepo.index->cache[i];
+
+ if (!S_ISGITLINK(ce->ce_mode))
+ continue;
+
+ while (i + 1 < subrepo.index->cache_nr &&
+ !strcmp(ce->name, subrepo.index->cache[i + 1]->name))
+ /*
+ * Skip entries with the same name in different stages
+ * to make sure an entry is returned only once.
+ */
+ i++;
+
+ sub = submodule_from_path(&subrepo, &null_oid, ce->name);
+ if (!sub)
+ /* submodule not checked out? */
+ continue;
+
+ if (is_submodule_active(&subrepo, ce->name)) {
+ strbuf_addf(&sub_wt, "%s/%s", sub_worktree, sub->path);
+ strbuf_addf(&sub_gd, "%s/modules/%s", sub_gitdir, sub->name);
+
+ connect_work_tree_and_git_dir(sub_wt.buf, sub_gd.buf, 0);
+ connect_wt_gitdir_in_nested(sub_wt.buf, sub_gd.buf);
+
+ strbuf_reset(&sub_wt);
+ strbuf_reset(&sub_gd);
+ }
+ }
+ strbuf_release(&sub_wt);
+ strbuf_release(&sub_gd);
+ repo_clear(&subrepo);
+}
+
+void connect_work_tree_and_git_dir(const char *work_tree_,
+ const char *git_dir_,
+ int recurse_into_nested)
{
struct strbuf gitfile_sb = STRBUF_INIT;
struct strbuf cfg_sb = STRBUF_INIT;
@@ -3041,6 +3094,10 @@ void connect_work_tree_and_git_dir(const char *work_tree_, const char *git_dir_)
strbuf_release(&gitfile_sb);
strbuf_release(&cfg_sb);
strbuf_release(&rel_path);
+
+ if (recurse_into_nested)
+ connect_wt_gitdir_in_nested(work_tree, git_dir);
+
free(work_tree);
free(git_dir);
}
@@ -3054,5 +3111,5 @@ void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_
die_errno(_("could not migrate git directory from '%s' to '%s'"),
old_git_dir, new_git_dir);
- connect_work_tree_and_git_dir(path, new_git_dir);
+ connect_work_tree_and_git_dir(path, new_git_dir, 0);
}
diff --git a/dir.h b/dir.h
index b0758b82a2..3870193e52 100644
--- a/dir.h
+++ b/dir.h
@@ -359,7 +359,17 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long
void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked);
void add_untracked_cache(struct index_state *istate);
void remove_untracked_cache(struct index_state *istate);
-extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
+
+/*
+ * Connect a worktree to a git directory by creating (or overwriting) a
+ * '.git' file containing the location of the git directory. In the git
+ * directory set the core.worktree setting to indicate where the worktree is.
+ * When `recurse_into_nested` is set, recurse into any nested submodules,
+ * connecting them as well.
+ */
+extern void connect_work_tree_and_git_dir(const char *work_tree,
+ const char *git_dir,
+ int recurse_into_nested);
extern void relocate_gitdir(const char *path,
const char *old_git_dir,
const char *new_git_dir);
diff --git a/submodule.c b/submodule.c
index 89d0aee086..c2dac6c00f 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1624,7 +1624,7 @@ int submodule_move_head(const char *path,
} else {
char *gitdir = xstrfmt("%s/modules/%s",
get_git_common_dir(), sub->name);
- connect_work_tree_and_git_dir(path, gitdir);
+ connect_work_tree_and_git_dir(path, gitdir, 0);
free(gitdir);
/* make sure the index is clean as well */
@@ -1634,7 +1634,7 @@ int submodule_move_head(const char *path,
if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
char *gitdir = xstrfmt("%s/modules/%s",
get_git_common_dir(), sub->name);
- connect_work_tree_and_git_dir(path, gitdir);
+ connect_work_tree_and_git_dir(path, gitdir, 1);
free(gitdir);
}
}
@@ -1947,7 +1947,7 @@ void absorb_git_dir_into_superproject(const char *prefix,
if (!sub)
die(_("could not lookup name for submodule '%s'"), path);
connect_work_tree_and_git_dir(path,
- git_path("modules/%s", sub->name));
+ git_path("modules/%s", sub->name), 0);
} else {
/* Is it already absorbed into the superprojects git dir? */
char *real_sub_git_dir = real_pathdup(sub_git_dir, 1);
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index d4e6485a26..ff70244620 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -497,7 +497,7 @@ test_expect_success 'moving a submodule in nested directories' '
test_cmp expect actual
'
-test_expect_failure 'moving nested submodules' '
+test_expect_success 'moving nested submodules' '
git commit -am "cleanup commit" &&
mkdir sub_nested_nested &&
(cd sub_nested_nested &&
--
2.17.0.rc1.321.gba9d0f2565-goog
^ permalink raw reply related [relevance 9%]
* [PATCHv2 0/6] Moving submodules with nested submodules
@ 2018-03-28 17:24 4% ` Stefan Beller
2018-03-28 17:24 9% ` [PATCH 5/6] submodule: fixup nested submodules after moving the submodule Stefan Beller
0 siblings, 1 reply; 200+ results
From: Stefan Beller @ 2018-03-28 17:24 UTC (permalink / raw)
To: sbeller, gitster; +Cc: bmwill, git, hvoigt, jonathantanmy, seanwbehan
v2:
* addressed memleaks and messy code in patch 5
* removed the extern keyword where applicable
* extended the commit message, stating we want to rename submodule_free
in the future.
* picked up Jonathans patch and added it as a nice finish of the series.
I did not see the need or aesthetic desire to put that patch earlier
in the series.
Thanks,
Stefan
v1:
This fixes the bug reported in [1] ("Bug: moving submodules that have submodules
inside them causes a fatal error in git status")
[1] https://public-inbox.org/git/20180306192017.GA5797@riseup.net/
Thanks,
Stefan
Jonathan Tan (1):
grep: remove "repo" arg from non-supporting funcs
Stefan Beller (5):
submodule.h: drop declaration of connect_work_tree_and_git_dir
submodule-config: allow submodule_free to handle arbitrary
repositories
submodule-config: add repository argument to submodule_from_{name,
path}
submodule-config: remove submodule_from_cache
submodule: fixup nested submodules after moving the submodule
.../technical/api-submodule-config.txt | 2 +-
builtin/grep.c | 14 ++---
builtin/mv.c | 6 +-
builtin/submodule--helper.c | 17 +++--
dir.c | 63 ++++++++++++++++++-
dir.h | 12 +++-
repository.c | 2 +-
submodule-config.c | 29 ++++-----
submodule-config.h | 15 +++--
submodule.c | 40 ++++++------
submodule.h | 1 -
t/helper/test-submodule-config.c | 8 ++-
t/t7001-mv.sh | 2 +-
unpack-trees.c | 2 +-
14 files changed, 137 insertions(+), 76 deletions(-)
--
2.17.0.rc1.321.gba9d0f2565-goog
^ permalink raw reply [relevance 4%]
Results 1-200 of ~700 next (older) | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2018-03-28 0:42 [PATCH 5/5] submodule: fixup nested submodules after moving the submodule Stefan Beller
2018-03-28 17:24 4% ` [PATCHv2 0/6] Moving submodules with nested submodules Stefan Beller
2018-03-28 17:24 9% ` [PATCH 5/6] submodule: fixup nested submodules after moving the submodule Stefan Beller
2018-03-28 17:35 0% ` Brandon Williams
2018-03-28 17:54 [PATCHv2 0/6] Moving submodules with nested submodules Jonathan Tan
2018-03-28 22:35 4% ` [PATCHv3 " Stefan Beller
2018-03-28 22:35 8% ` [PATCHv3 6/6] submodule: fixup nested submodules after moving the submodule Stefan Beller
2018-03-28 19:56 1% [ANNOUNCE] Git v2.17.0-rc2 Junio C Hamano
2018-05-13 2:23 [PATCH 1/3] checkout.c: add strict usage of -- before file_path Dannier Castro L
2018-05-13 2:23 5% ` [PATCH 2/3] test: update tests for strict usage of -- checkout Dannier Castro L
2018-06-26 7:29 2% [PATCH 00/29] t: detect and fix broken &&-chains in subshells Eric Sunshine
2018-06-26 7:29 8% ` [PATCH 26/29] t7000-t7999: " Eric Sunshine
2018-07-02 0:23 1% [PATCH 00/25] fix buggy tests, modernize tests, fix broken &&-chains Eric Sunshine
2018-07-02 0:24 8% ` [PATCH 23/25] t7000-t7999: " Eric Sunshine
2018-08-02 13:46 3% [RFC PATCH v2 00/12] Make submodules work if .gitmodules is not checked out Antonio Ospite
2018-08-02 13:46 6% ` [RFC PATCH v2 10/12] t7416: add new test about HEAD:.gitmodules and not existing .gitmodules Antonio Ospite
2018-08-02 20:43 0% ` Stefan Beller
2018-08-09 9:14 5% ` Antonio Ospite
2018-08-19 21:57 3% [PATCH 0/4] tests: make more use of 'test_must_be_empty' SZEDER Gábor
2018-08-19 21:57 4% ` [PATCH 1/4] tests: use 'test_must_be_empty' instead of '! test -s' SZEDER Gábor
2018-09-21 23:58 6% [PATCH 0/3] bring some tests to newer style Stefan Beller
2018-09-21 23:58 11% ` [PATCH 1/3] t7001: reformat " Stefan Beller
2018-09-24 13:31 6% ` Derrick Stolee
2018-09-24 16:09 5% ` Junio C Hamano
2018-09-24 18:51 5% ` Stefan Beller
2018-09-25 20:36 6% ` Junio C Hamano
2020-07-17 23:24 10% [PATCH] git-mv: improve error message for conflicted file Chris Torek via GitGitGadget
2020-07-17 23:47 0% ` Eric Sunshine
2020-07-18 1:35 ` Chris Torek
2020-07-18 6:55 3% ` Eric Sunshine
2020-07-20 6:17 10% ` [PATCH v2] " Chris Torek via GitGitGadget
2020-08-02 0:45 [PATCH] t1450: fix quoting of NUL byte when corrupting pack Junio C Hamano
2020-08-02 14:30 5% ` Martin Ågren
2020-08-02 17:22 0% ` Eric Sunshine
2020-08-06 20:08 3% ` [PATCH v2 0/2] t: don't spuriously close and reopen quotes Martin Ågren
2020-08-06 20:08 6% ` [PATCH v2 1/2] " Martin Ågren
2020-08-28 6:56 Git in Outreachy? Jeff King
2020-08-31 6:55 ` Christian Couder
2020-09-16 6:42 5% ` Christian Couder
2020-09-25 17:02 15% [PATCH 00/11] Modernizing the t7001 test script shubham verma
2020-09-25 17:02 13% ` [PATCH 01/11] t7001: convert tests from the old style to the current style shubham verma
2020-09-25 17:40 11% ` Eric Sunshine
2020-09-25 17:02 13% ` [PATCH 02/11] t7001: use TAB instead of spaces shubham verma
2020-09-25 17:44 11% ` Eric Sunshine
2020-09-25 17:02 17% ` [PATCH 03/11] t7001: remove unnecessary blank lines shubham verma
2020-09-25 17:50 6% ` Eric Sunshine
2020-09-25 20:19 6% ` Junio C Hamano
2020-09-25 17:02 19% ` [PATCH 04/11] t7001: change the style for cd according to subshell shubham verma
2020-09-25 18:12 11% ` Eric Sunshine
2020-09-25 17:02 19% ` [PATCH 05/11] t7001: remove whitespace after redirect operators shubham verma
2020-09-25 17:02 15% ` [PATCH 06/11] t7001: change (cd <path> && git foo) to (git -C <path> foo) shubham verma
2020-09-25 18:53 11% ` Eric Sunshine
2020-09-25 17:02 18% ` [PATCH 07/11] t7001: use ': >' rather than 'touch' shubham verma
2020-09-25 18:57 6% ` Eric Sunshine
2020-09-25 20:21 6% ` Junio C Hamano
2020-09-25 17:02 19% ` [PATCH 08/11] t7001: put each command on a separate line shubham verma
2020-09-25 19:01 6% ` Eric Sunshine
2020-09-25 17:02 19% ` [PATCH 09/11] t7001: use here-docs instead of echo shubham verma
2020-09-25 20:23 6% ` Junio C Hamano
2020-09-25 17:02 16% ` [PATCH 10/11] t7001: use `test` rather than `[` shubham verma
2020-09-25 17:02 15% ` [PATCH 11/11] t7001: move cleanup code from outside the tests into them shubham verma
2020-09-25 19:36 4% ` Eric Sunshine
2020-09-25 20:54 4% ` Junio C Hamano
2020-09-25 17:33 6% ` [PATCH 00/11] Modernizing the t7001 test script Eric Sunshine
2020-10-01 5:42 6% ` Shubham Verma
2020-12-22 19:22 6% ` Junio C Hamano
2020-09-25 22:57 6% What's cooking in git.git (Sep 2020, #07; Fri, 25) Junio C Hamano
2020-09-29 22:06 6% What's cooking in git.git (Sep 2020, #08; Tue, 29) Junio C Hamano
2020-10-06 20:11 6% What's cooking in git.git (Oct 2020, #01; Mon, 5) Junio C Hamano
2020-10-09 15:59 6% What's cooking in git.git (Oct 2020, #02; Fri, 9) Junio C Hamano
2020-10-10 11:48 5% [Outreachy] Introduction Charvi Mendiratta
2020-10-11 8:09 6% ` Christian Couder
[not found] ` <CAPSFM5cXN57z56Cvq-NX1H4raS7d8=qXEFDQqpypJfoYzbxcyA@mail.gmail.com>
2020-10-15 18:56 0% ` Charvi Mendiratta
2020-10-15 17:57 5% [PATCH 0/5][Outreachy] modernizing the test scripts charvi-077
2020-10-16 12:54 0% ` Christian Couder
2020-10-17 8:27 0% ` Charvi Mendiratta
2020-10-16 8:28 [Outreachy] Introduction Zodwa Phakathi
2020-10-16 8:46 5% ` Christian Couder
2020-10-19 18:13 6% What's cooking in git.git (Oct 2020, #03; Mon, 19) Junio C Hamano
2020-10-27 23:33 5% What's cooking in git.git (Oct 2020, #04; Tue, 27) Junio C Hamano
2020-10-29 22:26 5% What's cooking in git.git (Oct 2020, #05; Thu, 29) Junio C Hamano
2020-11-02 22:27 5% What's cooking in git.git (Nov 2020, #01; Mon, 2) Junio C Hamano
2020-11-09 23:42 5% What's cooking in git.git (Nov 2020, #02; Mon, 9) Junio C Hamano
2020-11-11 22:13 5% What's cooking in git.git (Nov 2020, #03; Wed, 11) Junio C Hamano
2020-11-21 22:57 5% What's cooking in git.git (Nov 2020, #04; Thu, 19) Junio C Hamano
2020-11-26 0:58 5% What's cooking in git.git (Nov 2020, #05; Wed, 25) Junio C Hamano
2020-12-01 5:15 5% What's cooking in git.git (Nov 2020, #06; Mon, 30) Junio C Hamano
2020-12-09 1:31 5% What's cooking in git.git (Dec 2020, #01; Tue, 8) Junio C Hamano
2020-12-14 20:04 5% What's cooking in git.git (Dec 2020, #02; Mon, 14) Junio C Hamano
2020-12-19 5:34 5% What's cooking in git.git (Dec 2020, #03; Fri, 18) Junio C Hamano
2020-12-22 20:07 5% What's cooking in git.git (Dec 2020, #04; Tue, 22) Junio C Hamano
2020-12-28 19:09 5% What's cooking in git.git (Dec 2020, #05; Mon, 28) Junio C Hamano
[not found] <BYAPR21MB1158F64E1141453F7D00B46CE0D89@BYAPR21MB1158.namprd21.prod.outlook.com>
[not found] ` <BYAPR21MB11585FFD46DEE7AD4EEEFEABE0D89@BYAPR21MB1158.namprd21.prod.outlook.com>
2020-12-29 2:06 14% ` [PATCH] git-mv: fix git mv bug with case insensitive fs Dan Moseley
2020-12-31 7:13 0% ` Torsten Bögershausen
2021-01-06 4:05 Junio C Hamano
[not found] ` <20210301170425.12154-1-tboegi@web.de>
2021-03-01 20:23 14% ` [EXTERNAL] [PATCH v2 1/1] git mv foo FOO ; git mv foo bar gave an assert Dan Moseley
2021-03-01 21:47 0% ` Junio C Hamano
2021-01-07 13:38 5% What's cooking in git.git (Jan 2021, #01; Wed, 6) Junio C Hamano
2021-01-08 19:22 5% What's cooking in git.git (Jan 2021, #02; Fri, 8) Junio C Hamano
2021-01-16 1:00 4% What's cooking in git.git (Jan 2021, #03; Fri, 15) Junio C Hamano
2021-01-16 21:59 5% What's cooking in git.git (Jan 2021, #04; Sat, 16) Junio C Hamano
2021-01-20 18:27 [PATCH v2 0/3] Remove GIT_TEST_GETTEXT_POISON facility Ævar Arnfjörð Bjarmason
2021-02-11 1:53 3% ` [PATCH 0/4] More GETTEXT_POISON removal Ævar Arnfjörð Bjarmason
2021-02-11 1:53 1% ` [PATCH 4/4] tests: remove most uses of test_i18ncmp Ævar Arnfjörð Bjarmason
2021-01-26 1:59 5% What's cooking in git.git (Jan 2021, #05; Mon, 25) Junio C Hamano
2021-01-31 0:00 5% What's cooking in git.git (Jan 2021, #06; Sat, 30) Junio C Hamano
2021-02-04 0:27 5% What's cooking in git.git (Feb 2021, #01; Wed, 3) Junio C Hamano
2021-02-09 17:32 15% [PATCH v2 00/10] Modernizing the t7001 test script shubham verma
2021-02-09 17:32 12% ` [PATCH v2 01/10] t7001: modernize test formatting shubham verma
2021-02-09 17:32 13% ` [PATCH v2 02/10] t7001: indent with TABs instead of spaces shubham verma
2021-02-09 17:32 17% ` [PATCH v2 03/10] t7001: remove unnecessary blank lines shubham verma
2021-02-09 17:32 17% ` [PATCH v2 04/10] t7001: modernize subshell formatting shubham verma
2021-02-09 17:32 19% ` [PATCH v2 05/10] t7001: remove whitespace after redirect operators shubham verma
2021-02-09 17:32 15% ` [PATCH v2 06/10] t7001: avoid using `cd` outside of subshells shubham verma
2021-02-09 17:32 19% ` [PATCH v2 07/10] t7001: use '>' rather than 'touch' shubham verma
2021-02-09 17:32 19% ` [PATCH v2 08/10] t7001: put each command on a separate line shubham verma
2021-02-09 17:32 19% ` [PATCH v2 09/10] t7001: use here-docs instead of echo shubham verma
2021-02-09 17:32 16% ` [PATCH v2 10/10] t7001: use `test` rather than `[` shubham verma
2021-02-09 19:24 6% ` [PATCH v2 00/10] Modernizing the t7001 test script Eric Sunshine
2021-02-09 22:58 6% ` Junio C Hamano
2021-02-11 7:28 6% ` Eric Sunshine
2021-02-11 7:37 6% ` Junio C Hamano
2021-02-11 7:56 6% ` Shubham Verma
2021-02-11 7:59 6% ` Eric Sunshine
2021-02-11 1:32 4% What's cooking in git.git (Feb 2021, #02; Wed, 10) Junio C Hamano
2021-02-11 19:46 15% [PATCH v3 00/10] Modernizing the t7001 test script Shubham Verma
2021-02-11 19:46 12% ` [PATCH v3 01/10] t7001: modernize test formatting Shubham Verma
2021-02-11 19:46 13% ` [PATCH v3 02/10] t7001: indent with TABs instead of spaces Shubham Verma
2021-02-11 19:46 17% ` [PATCH v3 03/10] t7001: remove unnecessary blank lines Shubham Verma
2021-02-11 19:46 17% ` [PATCH v3 04/10] t7001: modernize subshell formatting Shubham Verma
2021-02-11 19:46 19% ` [PATCH v3 05/10] t7001: remove whitespace after redirect operators Shubham Verma
2021-02-11 19:47 15% ` [PATCH v3 06/10] t7001: avoid using `cd` outside of subshells Shubham Verma
2021-02-11 19:47 19% ` [PATCH v3 07/10] t7001: use '>' rather than 'touch' Shubham Verma
2021-02-11 19:47 19% ` [PATCH v3 08/10] t7001: put each command on a separate line Shubham Verma
2021-02-11 19:47 19% ` [PATCH v3 09/10] t7001: use here-docs instead of echo Shubham Verma
2021-02-11 19:47 16% ` [PATCH v3 10/10] t7001: use `test` rather than `[` Shubham Verma
2021-02-11 21:44 6% ` [PATCH v3 00/10] Modernizing the t7001 test script Junio C Hamano
2021-02-23 8:26 11% ` Shubham Verma
2021-02-23 17:33 6% ` Junio C Hamano
2021-02-18 2:11 4% What's cooking in git.git (Feb 2021, #03; Wed, 17) Junio C Hamano
2021-02-19 3:11 5% What's cooking in git.git (Feb 2021, #04; Thu, 18) Junio C Hamano
2021-03-03 10:14 4% [ANNOUNCE] Git v2.31.0-rc1 Junio C Hamano
2021-03-03 10:14 5% What's cooking in git.git (Mar 2021, #01; Tue, 2) Junio C Hamano
2021-03-09 18:05 4% [ANNOUNCE] Git v2.31.0-rc2 Junio C Hamano
2021-03-15 19:30 4% [ANNOUNCE] Git v2.31.0 Junio C Hamano
2021-05-04 16:27 [PATCH v3 0/8] Parallel Checkout (part 3) Matheus Tavares
2021-05-04 16:27 ` [PATCH v3 4/8] parallel-checkout: add tests for basic operations Matheus Tavares
2021-05-26 18:36 ` AIX failures on parallel checkout (new in v2.32.0-rc*) Ævar Arnfjörð Bjarmason
2021-05-26 22:01 5% ` Matheus Tavares Bernardino
2021-05-26 23:00 5% ` Junio C Hamano
2021-05-26 23:58 4% [PATCH] t2080: fix cp invocation to copy symlinks instead of following them Matheus Tavares
2021-05-27 7:25 6% ` Christian Couder
2021-05-27 12:51 0% ` Ævar Arnfjörð Bjarmason
2021-05-31 14:01 0% ` Ævar Arnfjörð Bjarmason
2021-06-02 1:36 0% ` Đoàn Trần Công Danh
2021-06-02 10:50 0% ` Ævar Arnfjörð Bjarmason
2021-06-02 11:22 0% ` Đoàn Trần Công Danh
2021-06-02 13:36 0% ` Ævar Arnfjörð Bjarmason
2021-10-02 9:19 4% [PATCH 0/5] COPYING: modernize, steal boilerplate from linux.git Ævar Arnfjörð Bjarmason
2021-10-02 9:19 10% ` [PATCH 2/5] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
2021-10-05 17:01 3% ` [PATCH v2 0/5] COPYING: modernize, steal boilerplate from linux.git Ævar Arnfjörð Bjarmason
2021-10-05 17:01 10% ` [PATCH v2 2/5] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
2021-10-15 9:30 4% ` [PATCH v3 0/2] tests: stop relying on top-level COPYING and README Ævar Arnfjörð Bjarmason
2021-10-15 9:30 10% ` [PATCH v3 2/2] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
2022-03-25 1:56 11% [PATCH] mv: refresh stat info for moved entry Victoria Dye via GitGitGadget
2022-03-29 1:07 9% ` [PATCH v2] " Victoria Dye via GitGitGadget
2022-03-29 13:19 0% ` Derrick Stolee
2022-03-29 16:44 0% ` Junio C Hamano
2022-03-29 18:54 0% ` Derrick Stolee
2022-08-25 5:20 What's cooking in git.git (Aug 2022, #08; Wed, 24) Junio C Hamano
2022-08-25 10:04 5% ` Jeff King
2022-09-08 23:02 4% [PATCH] builtin/mv.c: fix possible segfault in add_slash() Shaoxuan Yuan
2022-09-09 14:14 5% ` Derrick Stolee
2022-09-09 16:37 0% ` Junio C Hamano
2022-09-09 19:44 3% ` [PATCH v2] " Shaoxuan Yuan
2022-09-09 20:04 0% ` Junio C Hamano
2022-09-09 22:40 0% ` Shaoxuan Yuan
2022-09-09 22:27 3% ` [PATCH v3] " Shaoxuan Yuan
2022-10-30 17:20 13% [PATCH] t7001-mv.sh:modernizing test script using function Debra Obondo via GitGitGadget
2022-10-30 18:00 6% ` Taylor Blau
2022-10-31 18:04 10% ` Martin Ågren
2022-11-01 1:14 6% ` Taylor Blau
2022-11-03 18:39 13% ` [PATCH v2] t7001-mv.sh: modernizing test script using functions Debra Obondo via GitGitGadget
2022-11-03 19:37 6% ` Martin Ågren
2022-11-04 15:05 13% ` [PATCH v3] " Debra Obondo via GitGitGadget
2022-11-04 22:00 6% ` Taylor Blau
2022-10-31 5:31 2% What's cooking in git.git (Oct 2022, #09; Mon, 31) Taylor Blau
2022-11-04 1:05 2% What's cooking in git.git (Nov 2022, #01; Thu, 3) Taylor Blau
2022-11-08 10:55 2% [OUTREACHY][DRAFT Proposal] Unify ref-filter formats with other --pretty formats Debra Obondo
2022-11-08 23:12 1% What's cooking in git.git (Nov 2022, #02; Tue, 8) Taylor Blau
2022-11-15 4:50 1% What's cooking in git.git (Nov 2022, #03; Mon, 14) Taylor Blau
2022-11-23 7:25 1% [ANNOUNCE] Git v2.39.0-rc0 Junio C Hamano
2022-11-30 6:12 1% [ANNOUNCE] Git v2.39.0-rc1 Junio C Hamano
2022-12-06 4:00 1% [ANNOUNCE] Git v2.39.0-rc2 Junio C Hamano
2022-12-12 13:43 1% [ANNOUNCE] Git v2.39.0 Junio C Hamano
2023-05-08 18:59 7% [PATCH 0/3] dropping "verbose" test helper function Jeff King
2023-05-08 19:01 13% ` [PATCH 1/3] t7001: avoid git on upstream of pipe Jeff King
2023-05-08 19:01 19% ` [PATCH 2/3] t7001: use "ls-files --format" instead of "cut" Jeff King
2023-05-08 19:04 6% ` [PATCH 3/3] t: drop "verbose" helper function Jeff King
2023-05-08 22:26 0% ` Taylor Blau
2023-05-08 22:26 0% ` [PATCH 0/3] dropping "verbose" test " Taylor Blau
2023-05-10 1:56 1% What's cooking in git.git (May 2023, #03; Tue, 9) Junio C Hamano
2023-05-12 0:39 1% What's cooking in git.git (May 2023, #04; Thu, 11) Junio C Hamano
2023-05-16 3:42 1% [ANNOUNCE] Git v2.41.0-rc0 Junio C Hamano
2023-05-17 0:30 1% What's cooking in git.git (May 2023, #05; Tue, 16) Junio C Hamano
2023-05-19 17:39 1% [ANNOUNCE] Git v2.41.0-rc1 Junio C Hamano
2023-05-24 21:41 1% [ANNOUNCE] Git v2.41.0-rc2 Junio C Hamano
2023-06-01 10:11 1% [ANNOUNCE] Git v2.41.0 Junio C Hamano
2023-08-08 14:53 10% [PATCH] fix `git mv existing-dir non-existing-dir`* Sebastian Thiel via GitGitGadget
2023-08-08 17:36 0% ` Junio C Hamano
2023-08-09 7:47 9% ` [PATCH v2] fix `git mv existing-dir non-existing-dir` in some environments Sebastian Thiel via GitGitGadget
2023-10-30 14:11 [PATCH v3] bugreport: reject positional arguments Phillip Wood
2023-10-31 5:23 2% ` [PATCH 0/2] Deprecate test_i18ngrep further Junio C Hamano
2023-10-31 5:23 1% ` [PATCH 2/2] tests: teach callers of test_i18ngrep to use test_grep Junio C Hamano
2024-01-05 17:41 [BUG] mv: can trigger assertion failure with three parameters (builtin/mv.c:481) Kristoffer Haugsbakk
2024-02-18 12:42 12% ` Kristoffer Haugsbakk
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).