summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
blob: 2cf42c73f14ef5069d096fb29e67dac571227cfe (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
#!/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 'pull with -X' '
	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_done