mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
d1c53f6703
In `do_write_index()`, we use a `struct hashfile` to write the index with a trailer hash. In case the write fails though, we never clean up the allocated `hashfile` state and thus leak memory. Refactor the code to have a common exit path where we can free this and other allocated memory. While at it, refactor our use of `strbuf`s such that we reuse the same buffer to avoid some unneeded allocations. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
57 lines
1.5 KiB
Bash
Executable file
57 lines
1.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='filter-branch removal of trees with null sha1'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup: base commits' '
|
|
test_commit one &&
|
|
test_commit two &&
|
|
test_commit three
|
|
'
|
|
|
|
test_expect_success 'setup: a commit with a bogus null sha1 in the tree' '
|
|
{
|
|
git ls-tree HEAD &&
|
|
printf "160000 commit $ZERO_OID\\tbroken\\n"
|
|
} >broken-tree &&
|
|
echo "add broken entry" >msg &&
|
|
|
|
tree=$(git mktree <broken-tree) &&
|
|
test_tick &&
|
|
commit=$(git commit-tree $tree -p HEAD <msg) &&
|
|
git update-ref HEAD "$commit"
|
|
'
|
|
|
|
# we have to make one more commit on top removing the broken
|
|
# entry, since otherwise our index does not match HEAD (and filter-branch will
|
|
# complain). We could make the index match HEAD, but doing so would involve
|
|
# writing a null sha1 into the index.
|
|
test_expect_success 'setup: bring HEAD and index in sync' '
|
|
test_tick &&
|
|
git commit -a -m "back to normal"
|
|
'
|
|
|
|
test_expect_success 'noop filter-branch complains' '
|
|
test_must_fail git filter-branch \
|
|
--force --prune-empty \
|
|
--index-filter "true"
|
|
'
|
|
|
|
test_expect_success 'filter commands are still checked' '
|
|
test_must_fail git filter-branch \
|
|
--force --prune-empty \
|
|
--index-filter "git rm --cached --ignore-unmatch three.t"
|
|
'
|
|
|
|
test_expect_success 'removing the broken entry works' '
|
|
echo three >expect &&
|
|
git filter-branch \
|
|
--force --prune-empty \
|
|
--index-filter "git rm --cached --ignore-unmatch broken" &&
|
|
git log -1 --format=%s >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|