git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
071d3f734351f24aca5ecaf5f7c8d13e3bc983a3 blob 1053 bytes (raw)

 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
 
#!/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 &&
	test_must_fail git merge -s resolve master &&
	git ls-files -s >current &&
	test_cmp expect current
'

test_expect_success recursive '
	rm -f a* m* &&
	git reset --hard anchor &&
	test_must_fail git merge -s recursive master &&
	git ls-files -s >current &&
	test_cmp expect current
'

test_done
debug log:

solving 071d3f7343 ...
found 071d3f7343 in https://public-inbox.org/git/20200625121953.16991-2-alban.gruin@gmail.com/
found 4e6c7cb77e in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100755 4e6c7cb77e7dc42c9f21b8ca84f8a64b1ed7d3af	t/t6027-merge-binary.sh

applying [1/1] https://public-inbox.org/git/20200625121953.16991-2-alban.gruin@gmail.com/
diff --git a/t/t6027-merge-binary.sh b/t/t6027-merge-binary.sh
index 4e6c7cb77e..071d3f7343 100755

Checking patch t/t6027-merge-binary.sh...
Applied patch t/t6027-merge-binary.sh cleanly.

index at:
100755 071d3f734351f24aca5ecaf5f7c8d13e3bc983a3	t/t6027-merge-binary.sh

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).