mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
03267e8656
The read_cache() in prepare_to_commit() would end up clobbering the pointer we had for a previously populated "the_index.cache_tree" in the very common case of "git commit" stressed by e.g. the tests being changed here. We'd populate "the_index.cache_tree" by calling "update_main_cache_tree" in prepare_index(), but would not end up with a "fully prepared" index. What constitutes an existing index is clearly overly fuzzy, here we'll check "active_nr" (aka "the_index.cache_nr"), but our "the_index.cache_tree" might have been malloc()'d already. Thus the code added in11c8a74a64(commit: write cache-tree data when writing index anyway, 2011-12-06) would end up allocating the "cache_tree", and would interact here with code added in7168624c35(Do not generate full commit log message if it is not going to be used, 2007-11-28). The result was a very common memory leak. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>
62 lines
1.7 KiB
Bash
Executable file
62 lines
1.7 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='test handling of --alternate-refs traversal'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
# Avoid test_commit because we want a specific and known set of refs:
|
|
#
|
|
# base -- one
|
|
# \ \
|
|
# two -- merged
|
|
#
|
|
# where "one" and "two" are on separate refs, and "merged" is available only in
|
|
# the dependent child repository.
|
|
test_expect_success 'set up local refs' '
|
|
git checkout -b one &&
|
|
test_tick &&
|
|
git commit --allow-empty -m base &&
|
|
test_tick &&
|
|
git commit --allow-empty -m one &&
|
|
git checkout -b two HEAD^ &&
|
|
test_tick &&
|
|
git commit --allow-empty -m two
|
|
'
|
|
|
|
# We'll enter the child repository after it's set up since that's where
|
|
# all of the subsequent tests will want to run (and it's easy to forget a
|
|
# "-C child" and get nonsense results).
|
|
test_expect_success 'set up shared clone' '
|
|
git clone -s . child &&
|
|
cd child &&
|
|
git merge origin/one
|
|
'
|
|
|
|
test_expect_success 'rev-list --alternate-refs' '
|
|
git rev-list --remotes=origin >expect &&
|
|
git rev-list --alternate-refs >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'rev-list --not --alternate-refs' '
|
|
git rev-parse HEAD >expect &&
|
|
git rev-list HEAD --not --alternate-refs >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'limiting with alternateRefsPrefixes' '
|
|
test_config core.alternateRefsPrefixes refs/heads/one &&
|
|
git rev-list origin/one >expect &&
|
|
git rev-list --alternate-refs >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'log --source shows .alternate marker' '
|
|
git log --oneline --source --remotes=origin >expect.orig &&
|
|
sed "s/origin.* /.alternate /" <expect.orig >expect &&
|
|
git log --oneline --source --alternate-refs >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|