summaryrefslogtreecommitdiff
path: root/t/t3035-merge-sparse.sh
blob: c4b4a94324a2e6c60ade51db7f7a9c1922920395 (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
47
48
49
50
51
52
53
54
55
56
57
58
#!/bin/sh
 
test_description='merge with sparse files'
 
. ./test-lib.sh
 
# test_file $filename $content
test_file () {
	echo "$2" > "$1" &&
	git add "$1"
}
 
# test_commit_this $message_and_tag
test_commit_this () {
	git commit -m "$1" &&
	git tag "$1"
}
 
test_expect_success 'setup' '
	test_file checked-out init &&
	test_file modify_delete modify_delete_init &&
	test_commit_this init &&
	test_file modify_delete modify_delete_theirs &&
	test_commit_this theirs &&
	git reset --hard init &&
	git rm modify_delete &&
	test_commit_this ours &&
	git config core.sparseCheckout true &&
	echo "/checked-out" >.git/info/sparse-checkout &&
	git reset --hard &&
	! git merge theirs
'
 
test_expect_success 'reset --hard works after the conflict' '
	git reset --hard
'
 
test_expect_success 'is reset properly' '
	git status --porcelain -- modify_delete >out &&
	test_must_be_empty out &&
	test_path_is_missing modify_delete
'
 
test_expect_success 'setup: conflict back' '
	! git merge theirs
'
 
test_expect_success 'Merge abort works after the conflict' '
	git merge --abort
'
 
test_expect_success 'is aborted properly' '
	git status --porcelain -- modify_delete >out &&
	test_must_be_empty out &&
	test_path_is_missing modify_delete
'
 
test_done