mirror of
https://github.com/git/git.git
synced 2024-11-30 13:33:44 +08:00
055e57b7b2
Fix a memory leak in code added in5d7eeee2ac
(git-show: grok blobs, trees and tags, too, 2006-12-14). As we iterate over a "<revision>..." command-line and encounter ad OBJ_COMMIT we want to use our "struct rev_info", but with a "pending" array of one element: the one commit we're showing in the loop. To do this5d7eeee2ac
saved away a pointer to rev.pending.objects and rev.pending.nr for its iteration. We'd then clobber those (and alloc) when we needed to show an OBJ_COMMIT. We'd therefore leak the "rev.pending" we started out with, and only free the new "rev.pending" in the "OBJ_COMMIT" case arm as prepare_revision_walk() would draw it down. Let's fix this memory leak. Now when we encounter an OBJ_COMMIT we save away the "rev.pending" before clearing it. We then add a single commit to it, which our indirect invocation of prepare_revision_walk() will remove. After that we restore the "rev.pending". Our "rev.pending" will then get free'd by the release_revisions() added inf6bfea0ad0
(revisions API users: use release_revisions() in builtin/log.c, 2022-04-13) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
197 lines
4.1 KiB
Bash
Executable File
197 lines
4.1 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Junio C Hamano
|
|
#
|
|
|
|
test_description='Try various core-level commands in subdirectory.
|
|
'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-read-tree.sh
|
|
|
|
test_expect_success setup '
|
|
long="a b c d e f g h i j k l m n o p q r s t u v w x y z" &&
|
|
test_write_lines $long >one &&
|
|
mkdir dir &&
|
|
test_write_lines x y z $long a b c >dir/two &&
|
|
cp one original.one &&
|
|
cp dir/two original.two
|
|
'
|
|
|
|
test_expect_success 'update-index and ls-files' '
|
|
git update-index --add one &&
|
|
case "$(git ls-files)" in
|
|
one) echo pass one ;;
|
|
*) echo bad one; return 1 ;;
|
|
esac &&
|
|
(
|
|
cd dir &&
|
|
git update-index --add two &&
|
|
case "$(git ls-files)" in
|
|
two) echo pass two ;;
|
|
*) echo bad two; exit 1 ;;
|
|
esac
|
|
) &&
|
|
case "$(git ls-files)" in
|
|
dir/two"$LF"one) echo pass both ;;
|
|
*) echo bad; return 1 ;;
|
|
esac
|
|
'
|
|
|
|
test_expect_success 'cat-file' '
|
|
two=$(git ls-files -s dir/two) &&
|
|
two=$(expr "$two" : "[0-7]* \\([0-9a-f]*\\)") &&
|
|
echo "$two" &&
|
|
git cat-file -p "$two" >actual &&
|
|
cmp dir/two actual &&
|
|
(
|
|
cd dir &&
|
|
git cat-file -p "$two" >actual &&
|
|
cmp two actual
|
|
)
|
|
'
|
|
rm -f actual dir/actual
|
|
|
|
test_expect_success 'diff-files' '
|
|
echo a >>one &&
|
|
echo d >>dir/two &&
|
|
case "$(git diff-files --name-only)" in
|
|
dir/two"$LF"one) echo pass top ;;
|
|
*) echo bad top; return 1 ;;
|
|
esac &&
|
|
# diff should not omit leading paths
|
|
(
|
|
cd dir &&
|
|
case "$(git diff-files --name-only)" in
|
|
dir/two"$LF"one) echo pass subdir ;;
|
|
*) echo bad subdir; exit 1 ;;
|
|
esac &&
|
|
case "$(git diff-files --name-only .)" in
|
|
dir/two) echo pass subdir limited ;;
|
|
*) echo bad subdir limited; exit 1 ;;
|
|
esac
|
|
)
|
|
'
|
|
|
|
test_expect_success 'write-tree' '
|
|
top=$(git write-tree) &&
|
|
echo $top &&
|
|
(
|
|
cd dir &&
|
|
sub=$(git write-tree) &&
|
|
echo $sub &&
|
|
test "z$top" = "z$sub"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'checkout-index' '
|
|
git checkout-index -f -u one &&
|
|
cmp one original.one &&
|
|
(
|
|
cd dir &&
|
|
git checkout-index -f -u two &&
|
|
cmp two ../original.two
|
|
)
|
|
'
|
|
|
|
test_expect_success 'read-tree' '
|
|
rm -f one dir/two &&
|
|
tree=$(git write-tree) &&
|
|
read_tree_u_must_succeed --reset -u "$tree" &&
|
|
cmp one original.one &&
|
|
cmp dir/two original.two &&
|
|
(
|
|
cd dir &&
|
|
rm -f two &&
|
|
read_tree_u_must_succeed --reset -u "$tree" &&
|
|
cmp two ../original.two &&
|
|
cmp ../one ../original.one
|
|
)
|
|
'
|
|
|
|
test_expect_success 'alias expansion' '
|
|
(
|
|
git config alias.test-status-alias status &&
|
|
cd dir &&
|
|
git status &&
|
|
git test-status-alias
|
|
)
|
|
'
|
|
|
|
test_expect_success !MINGW '!alias expansion' '
|
|
pwd >expect &&
|
|
(
|
|
git config alias.test-alias-directory !pwd &&
|
|
cd dir &&
|
|
git test-alias-directory >../actual
|
|
) &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'GIT_PREFIX for !alias' '
|
|
printf "dir/" >expect &&
|
|
(
|
|
git config alias.test-alias-directory "!sh -c \"printf \$GIT_PREFIX\"" &&
|
|
cd dir &&
|
|
git test-alias-directory >../actual
|
|
) &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'GIT_PREFIX for built-ins' '
|
|
# Use GIT_EXTERNAL_DIFF to test that the "diff" built-in
|
|
# receives the GIT_PREFIX variable.
|
|
echo "dir/" >expect &&
|
|
write_script diff <<-\EOF &&
|
|
printf "%s\n" "$GIT_PREFIX"
|
|
EOF
|
|
(
|
|
cd dir &&
|
|
echo "change" >two &&
|
|
GIT_EXTERNAL_DIFF=./diff git diff >../actual &&
|
|
git checkout -- two
|
|
) &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'no file/rev ambiguity check inside .git' '
|
|
git commit -a -m 1 &&
|
|
(
|
|
cd .git &&
|
|
git show -s HEAD
|
|
)
|
|
'
|
|
|
|
test_expect_success 'no file/rev ambiguity check inside a bare repo (explicit GIT_DIR)' '
|
|
test_when_finished "rm -fr foo.git" &&
|
|
git clone -s --bare .git foo.git &&
|
|
(
|
|
cd foo.git &&
|
|
# older Git needed help by exporting GIT_DIR=.
|
|
# to realize that it is inside a bare repository.
|
|
# We keep this test around for regression testing.
|
|
GIT_DIR=. git show -s HEAD
|
|
)
|
|
'
|
|
|
|
test_expect_success 'no file/rev ambiguity check inside a bare repo' '
|
|
test_when_finished "rm -fr foo.git" &&
|
|
git clone -s --bare .git foo.git &&
|
|
(
|
|
cd foo.git &&
|
|
git show -s HEAD
|
|
)
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'detection should not be fooled by a symlink' '
|
|
git clone -s .git another &&
|
|
ln -s another yetanother &&
|
|
(
|
|
cd yetanother/.git &&
|
|
git show -s HEAD
|
|
)
|
|
'
|
|
|
|
test_done
|