summaryrefslogtreecommitdiff
path: root/t/t7104-reset-hard.sh
blob: 16faa0781373bb3769ce9f0fa0a09be8c2b2ed81 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
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 or cached-tree' '
 
	T=$(git write-tree) &&
	rm -f .git/index &&
	git add before hello later &&
	U=$(git write-tree) &&
	test "$T" = "$U"
 
'
 
test_done