mirror of
https://github.com/git/git.git
synced 2024-11-30 13:33:44 +08:00
a52f07afcb
Extend the the release_revisions() function so that it frees the "mailmap" in the "struct rev_info". The log family of functions now calls the clear_mailmap() function added in fa8afd18e5a (revisions API: provide and use a release_revisions(), 2021-09-19), allowing us to whitelist some tests with "TEST_PASSES_SANITIZE_LEAK=true". Unfortunately having a pointer to a mailmap in "struct rev_info" instead of an embedded member that we "own" get a bit messy, as can be seen in the change to builtin/commit.c. When we free() this data we won't be able to tell apart a pointer to a "mailmap" on the heap from one on the stack. As seen inea57bc0d41(log: add --use-mailmap option, 2013-01-05) the "log" family allocates it on the heap, but in the find_author_by_nickname() code added inea16794e43(commit: search author pattern against mailmap, 2013-08-23) we allocated it on the stack instead. Ideally we'd simply change that member to a "struct string_list mailmap" and never free() the "mailmap" itself, but that would be a much larger change to the revisions API. We have code that needs to hand an existing "mailmap" to a "struct rev_info", while we could change all of that, let's not go there now. The complexity isn't in the ownership of the "mailmap" per-se, but that various things assume a "rev_info.mailmap == NULL" means "doesn't want mailmap", if we changed that to an init'd "struct string_list we'd need to carefully refactor things to change those assumptions. Let's instead always free() it, and simply declare that if you add such a "mailmap" it must be allocated on the heap. Any modern libc will correctly panic if we free() a stack variable, so this should be safe going forward. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
96 lines
3.4 KiB
Bash
Executable File
96 lines
3.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='"-C <path>" option and its effects on other path-related options'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success '"git -C <path>" runs git from the directory <path>' '
|
|
test_create_repo dir1 &&
|
|
echo 1 >dir1/a.txt &&
|
|
msg="initial in dir1" &&
|
|
(cd dir1 && git add a.txt && git commit -m "$msg") &&
|
|
echo "$msg" >expected &&
|
|
git -C dir1 log --format=%s >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success '"git -C <path>" with an empty <path> is a no-op' '
|
|
(
|
|
mkdir -p dir1/subdir &&
|
|
cd dir1/subdir &&
|
|
git -C "" rev-parse --show-prefix >actual &&
|
|
echo subdir/ >expect &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2"' '
|
|
test_create_repo dir1/dir2 &&
|
|
echo 1 >dir1/dir2/b.txt &&
|
|
git -C dir1/dir2 add b.txt &&
|
|
msg="initial in dir1/dir2" &&
|
|
echo "$msg" >expected &&
|
|
git -C dir1/dir2 commit -m "$msg" &&
|
|
git -C dir1 -C dir2 log --format=%s >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Effect on --git-dir option: "-C c --git-dir=a.git" is equivalent to "--git-dir c/a.git"' '
|
|
mkdir c &&
|
|
mkdir c/a &&
|
|
mkdir c/a.git &&
|
|
(cd c/a.git && git init --bare) &&
|
|
echo 1 >c/a/a.txt &&
|
|
git --git-dir c/a.git --work-tree=c/a add a.txt &&
|
|
git --git-dir c/a.git --work-tree=c/a commit -m "initial" &&
|
|
git --git-dir=c/a.git log -1 --format=%s >expected &&
|
|
git -C c --git-dir=a.git log -1 --format=%s >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Order should not matter: "--git-dir=a.git -C c" is equivalent to "-C c --git-dir=a.git"' '
|
|
git -C c --git-dir=a.git log -1 --format=%s >expected &&
|
|
git --git-dir=a.git -C c log -1 --format=%s >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Effect on --work-tree option: "-C c/a.git --work-tree=../a" is equivalent to "--work-tree=c/a --git-dir=c/a.git"' '
|
|
rm c/a/a.txt &&
|
|
git --git-dir=c/a.git --work-tree=c/a status >expected &&
|
|
git -C c/a.git --work-tree=../a status >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Order should not matter: "--work-tree=../a -C c/a.git" is equivalent to "-C c/a.git --work-tree=../a"' '
|
|
git -C c/a.git --work-tree=../a status >expected &&
|
|
git --work-tree=../a -C c/a.git status >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Effect on --git-dir and --work-tree options - "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=c/a.git --work-tree=c/a"' '
|
|
git --git-dir=c/a.git --work-tree=c/a status >expected &&
|
|
git -C c --git-dir=a.git --work-tree=a status >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git -C c --work-tree=a"' '
|
|
git -C c --git-dir=a.git --work-tree=a status >expected &&
|
|
git --git-dir=a.git -C c --work-tree=a status >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Order should not matter: "-C c --git-dir=a.git --work-tree=a" is equivalent to "--git-dir=a.git --work-tree=a -C c"' '
|
|
git -C c --git-dir=a.git --work-tree=a status >expected &&
|
|
git --git-dir=a.git --work-tree=a -C c status >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Relative followed by fullpath: "-C ./here -C /there" is equivalent to "-C /there"' '
|
|
echo "initial in dir1/dir2" >expected &&
|
|
git -C dir1 -C "$(pwd)/dir1/dir2" log --format=%s >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|