summaryrefslogtreecommitdiff
path: root/t/t6417-merge-ours-theirs.sh
blob: 0aebc6c028e06c8d98600ecbe37c0b0989a89bd8 (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
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
#!/bin/sh
 
test_description='Merge-recursive ours and theirs variants'
. ./test-lib.sh
 
test_expect_success setup '
	for i in 1 2 3 4 5 6 7 8 9
	do
		echo "$i"
	done >file &&
	git add file &&
	cp file elif &&
	git commit -m initial &&
 
	sed -e "s/1/one/" -e "s/9/nine/" >file <elif &&
	git commit -a -m ours &&
 
	git checkout -b side HEAD^ &&
 
	sed -e "s/9/nueve/" >file <elif &&
	git commit -a -m theirs &&
 
	git checkout master^0
'
 
test_expect_success 'plain recursive - should conflict' '
	git reset --hard master &&
	test_must_fail git merge -s recursive side &&
	grep nine file &&
	grep nueve file &&
	! grep 9 file &&
	grep one file &&
	! grep 1 file
'
 
test_expect_success 'recursive favouring theirs' '
	git reset --hard master &&
	git merge -s recursive -Xtheirs side &&
	! grep nine file &&
	grep nueve file &&
	! grep 9 file &&
	grep one file &&
	! grep 1 file
'
 
test_expect_success 'recursive favouring ours' '
	git reset --hard master &&
	git merge -s recursive -X ours side &&
	grep nine file &&
	! grep nueve file &&
	! grep 9 file &&
	grep one file &&
	! grep 1 file
'
 
test_expect_success 'binary file with -Xours/-Xtheirs' '
	echo file binary >.gitattributes &&
 
	git reset --hard master &&
	git merge -s recursive -X theirs side &&
	git diff --exit-code side HEAD -- file &&
 
	git reset --hard master &&
	git merge -s recursive -X ours side &&
	git diff --exit-code master HEAD -- file
'
 
test_expect_success 'pull passes -X to underlying merge' '
	git reset --hard master && git pull -s recursive -Xours . side &&
	git reset --hard master && git pull -s recursive -X ours . side &&
	git reset --hard master && git pull -s recursive -Xtheirs . side &&
	git reset --hard master && git pull -s recursive -X theirs . side &&
	git reset --hard master && test_must_fail git pull -s recursive -X bork . side
'
 
test_expect_success SYMLINKS 'symlink with -Xours/-Xtheirs' '
	git reset --hard master &&
	git checkout -b two master &&
	ln -s target-zero link &&
	git add link &&
	git commit -m "add link pointing to zero" &&
 
	ln -f -s target-two link &&
	git commit -m "add link pointing to two" link &&
 
	git checkout -b one HEAD^ &&
	ln -f -s target-one link &&
	git commit -m "add link pointing to one" link &&
 
	# we expect symbolic links not to resolve automatically, of course
	git checkout one^0 &&
	test_must_fail git merge -s recursive two &&
 
	# favor theirs to resolve to target-two?
	git reset --hard &&
	git checkout one^0 &&
	git merge -s recursive -X theirs two &&
	git diff --exit-code two HEAD link &&
 
	# favor ours to resolve to target-one?
	git reset --hard &&
	git checkout one^0 &&
	git merge -s recursive -X ours two &&
	git diff --exit-code one HEAD link
 
'
 
test_done