1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-29 21:37:53 +01:00
git/t/t7104-reset.sh
Junio C Hamano f5ed3b30e0 git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()
When invalidating unmerged entries in the index, we used to set
their ce_mode to 0 to note the fact that they do not matter
anymore which also made sure that later unpack_trees() call
would not reuse them.  Instead just remove them from the index.

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-21 11:45:22 -08:00

46 lines
825 B
Bash
Executable file

#!/bin/sh
test_description='reset --hard unmerged'
. ./test-lib.sh
test_expect_success setup '
mkdir before later &&
>before/1 &&
>before/2 &&
>hello &&
>later/3 &&
git add before hello later &&
git commit -m world &&
H=$(git rev-parse :hello) &&
git rm --cached hello &&
echo "100644 $H 2 hello" | git update-index --index-info &&
rm -f hello &&
mkdir -p hello &&
>hello/world &&
test "$(git ls-files -o)" = hello/world
'
test_expect_success 'reset --hard should restore unmerged ones' '
git reset --hard &&
git ls-files --error-unmatch before/1 before/2 hello later/3 &&
test -f hello
'
test_expect_success 'reset --hard did not corrupt index nor cached-tree' '
T=$(git write-tree) &&
rm -f .git/index &&
git add before hello later &&
U=$(git write-tree) &&
test "$T" = "$U"
'
test_done