summaryrefslogtreecommitdiff
path: root/t/t7060-wtstatus.sh
blob: 5ad2cd1d049271e4cfda6e5033d45d92d8268076 (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
#!/bin/sh
 
test_description='basic work tree status reporting'
 
. ./test-lib.sh
 
test_expect_success setup '
	test_commit A &&
	test_commit B oneside added &&
	git checkout A^0 &&
	test_commit C oneside created
'
 
test_expect_success 'A/A conflict' '
	git checkout B^0 &&
	test_must_fail git merge C
'
 
test_expect_success 'Report path with conflict' '
	git diff --cached --name-status >actual &&
	echo "U	oneside" >expect &&
	test_cmp expect actual
'
 
test_expect_success 'Report new path with conflict' '
	git diff --cached --name-status HEAD^ >actual &&
	echo "U	oneside" >expect &&
	test_cmp expect actual
'
 
test_done