blob: cf9697eba9a6aeb9579abe5b7b97b400aca8c7d0 [file] [log] [blame]
Junio C Hamanof5ed3b32008-02-21 11:33:56 -08001#!/bin/sh
2
3test_description='reset --hard unmerged'
4
Ævar Arnfjörð Bjarmasoneab4ac62021-10-07 12:01:35 +02005TEST_PASSES_SANITIZE_LEAK=true
Junio C Hamanof5ed3b32008-02-21 11:33:56 -08006. ./test-lib.sh
7
8test_expect_success setup '
9
10 mkdir before later &&
11 >before/1 &&
12 >before/2 &&
13 >hello &&
14 >later/3 &&
15 git add before hello later &&
16 git commit -m world &&
17
18 H=$(git rev-parse :hello) &&
19 git rm --cached hello &&
20 echo "100644 $H 2 hello" | git update-index --index-info &&
21
22 rm -f hello &&
23 mkdir -p hello &&
24 >hello/world &&
25 test "$(git ls-files -o)" = hello/world
26
27'
28
29test_expect_success 'reset --hard should restore unmerged ones' '
30
31 git reset --hard &&
32 git ls-files --error-unmatch before/1 before/2 hello later/3 &&
33 test -f hello
34
35'
36
Derrick Stolee845d15d2021-01-07 16:32:07 +000037test_expect_success 'reset --hard did not corrupt index or cache-tree' '
Junio C Hamanof5ed3b32008-02-21 11:33:56 -080038
39 T=$(git write-tree) &&
40 rm -f .git/index &&
41 git add before hello later &&
42 U=$(git write-tree) &&
43 test "$T" = "$U"
44
45'
46
47test_done