summaryrefslogtreecommitdiff
path: root/t/t6027-merge-binary.sh
blob: 4e6c7cb77e7dc42c9f21b8ca84f8a64b1ed7d3af (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
#!/bin/sh
 
test_description='ask merge-recursive to merge binary files'
 
. ./test-lib.sh
 
test_expect_success setup '
 
	cat "$TEST_DIRECTORY"/test-binary-1.png >m &&
	git add m &&
	git ls-files -s | sed -e "s/ 0	/ 1	/" >E1 &&
	test_tick &&
	git commit -m "initial" &&
 
	git branch side &&
	echo frotz >a &&
	git add a &&
	echo nitfol >>m &&
	git add a m &&
	git ls-files -s a >E0 &&
	git ls-files -s m | sed -e "s/ 0	/ 3	/" >E3 &&
	test_tick &&
	git commit -m "master adds some" &&
 
	git checkout side &&
	echo rezrov >>m &&
	git add m &&
	git ls-files -s m | sed -e "s/ 0	/ 2	/" >E2 &&
	test_tick &&
	git commit -m "side modifies" &&
 
	git tag anchor &&
 
	cat E0 E1 E2 E3 >expect
'
 
test_expect_success resolve '
 
	rm -f a* m* &&
	git reset --hard anchor &&
 
	if git merge -s resolve master
	then
		echo Oops, should not have succeeded
		false
	else
		git ls-files -s >current
		test_cmp expect current
	fi
'
 
test_expect_success recursive '
 
	rm -f a* m* &&
	git reset --hard anchor &&
 
	if git merge -s recursive master
	then
		echo Oops, should not have succeeded
		false
	else
		git ls-files -s >current
		test_cmp expect current
	fi
'
 
test_done