blob: de9b6ed5ba0d1753bbc45386bb3d4fe487ccc725 (
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
|
#!/bin/sh
test_description='git-merge
Testing a custom strategy.'
. ./test-lib.sh
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' '
echo c0 >c0.c &&
git add c0.c &&
git commit -m c0 &&
git tag c0 &&
echo c1 >c1.c &&
git add c1.c &&
git commit -m c1 &&
git tag c1 &&
git reset --hard c0 &&
echo c1c1 >c1.c &&
echo c2 >c2.c &&
git add c1.c c2.c &&
git commit -m c2 &&
git tag c2
'
test_expect_success 'merge c2 with a custom strategy' '
git reset --hard c1 &&
git merge -s theirs c2 &&
test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
test "$(git rev-parse c2^{tree})" = "$(git rev-parse HEAD^{tree})" &&
git diff --exit-code &&
git diff --exit-code c2 HEAD &&
git diff --exit-code c2 &&
test -f c0.c &&
grep c1c1 c1.c &&
test -f c2.c
'
test_done
|
