Browse Source
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>maint
Junio C Hamano
17 years ago
2 changed files with 47 additions and 1 deletions
@ -0,0 +1,46 @@ |
|||||||
|
#!/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 |
Loading…
Reference in new issue