blob: 81fb7c474c14c1d615be9de76e2bd2a032fefac8 (
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
|
#!/bin/sh
test_description="git merge
Testing a custom strategy.
* (HEAD, main) Merge commit 'c3'
|\
| * (tag: c3) c3
* | (tag: c1) c1
|/
| * tag: c2) c2
|/
* (tag: c0) c0
"
. ./test-lib.sh
test_expect_success 'set up custom strategy' '
cat >git-merge-theirs <<-EOF &&
#!$SHELL_PATH
eval git read-tree --reset -u \\\$\$#
EOF
chmod +x git-merge-theirs &&
PATH=.:$PATH &&
export PATH
'
test_expect_success 'setup' '
test_commit c0 c0.c &&
test_commit c1 c1.c &&
git reset --keep c0 &&
echo c1c1 >c1.c &&
git add c1.c &&
test_commit c2 c2.c &&
git reset --keep c0 &&
test_commit c3 c3.c
'
test_expect_success 'merge c2 with a custom strategy' '
git reset --hard c1 &&
git rev-parse c1 >head.old &&
git rev-parse c2 >second-parent.expected &&
git rev-parse c2^{tree} >tree.expected &&
git merge -s theirs c2 &&
git rev-parse HEAD >head.new &&
git rev-parse HEAD^1 >first-parent &&
git rev-parse HEAD^2 >second-parent &&
git rev-parse HEAD^{tree} >tree &&
git update-index --refresh &&
git diff --exit-code &&
git diff --exit-code c2 HEAD &&
git diff --exit-code c2 &&
! test_cmp head.old head.new &&
test_cmp head.old first-parent &&
test_cmp second-parent.expected second-parent &&
test_cmp tree.expected tree &&
test -f c0.c &&
grep c1c1 c1.c &&
test -f c2.c
'
test_expect_success 'trivial merge with custom strategy' '
git reset --hard c1 &&
git rev-parse c1 >head.old &&
git rev-parse c3 >second-parent.expected &&
git rev-parse c3^{tree} >tree.expected &&
git merge -s theirs c3 &&
git rev-parse HEAD >head.new &&
git rev-parse HEAD^1 >first-parent &&
git rev-parse HEAD^2 >second-parent &&
git rev-parse HEAD^{tree} >tree &&
git update-index --refresh &&
git diff --exit-code &&
git diff --exit-code c3 HEAD &&
git diff --exit-code c3 &&
! test_cmp head.old head.new &&
test_cmp head.old first-parent &&
test_cmp second-parent.expected second-parent &&
test_cmp tree.expected tree &&
test -f c0.c &&
! test -e c1.c &&
test -f c3.c
'
test_done
|
