3 # Copyright (c) 2007 Junio C Hamano
6 test_description='per path merge controlled by merge attribute'
10 test_expect_success setup '
12 for f in text binary union
14 echo Initial >$f && git add $f || break
17 git commit -m Initial &&
20 for f in text binary union
22 echo Master >>$f && git add $f || break
25 git commit -m Master &&
28 for f in text binary union
30 echo Side >>$f && git add $f || break
38 test_expect_success merge '
42 echo "union merge=union"
47 echo Gaah, should have conflicted
54 test_expect_success 'check merge result in index' '
56 git ls-files -u | grep binary &&
57 git ls-files -u | grep text &&
58 ! (git ls-files -u | grep union)
62 test_expect_success 'check merge result in working tree' '
64 git cat-file -p HEAD:binary >binary-orig &&
65 grep "<<<<<<<" text &&
66 cmp binary-orig binary &&
67 ! grep "<<<<<<<" union &&
73 cat >./custom-merge <<\EOF
76 orig="$1" ours="$2" theirs="$3" exit="$4"
80 echo "theirs is $theirs"
92 chmod +x ./custom-merge
94 test_expect_success 'custom merge backend' '
96 echo "* merge=union" >.gitattributes &&
97 echo "text merge=custom" >>.gitattributes &&
99 git reset --hard anchor &&
100 git config --replace-all \
101 merge.driver "custom ./custom-merge %O %A %B 0" &&
106 sed -e 1,3d text >check-1 &&
107 o=$(git-unpack-file master^:text) &&
108 a=$(git-unpack-file side^:text) &&
109 b=$(git-unpack-file master:text) &&
110 sh -c "./custom-merge $o $a $b 0" &&
111 sed -e 1,3d $a >check-2 &&
112 cmp check-1 check-2 &&
116 test_expect_success 'custom merge backend' '
118 git reset --hard anchor &&
119 git config --replace-all \
120 merge.driver "custom ./custom-merge %O %A %B 1" &&
124 echo "Eh? should have conflicted"
127 echo "Ok, conflicted"
131 sed -e 1,3d text >check-1 &&
132 o=$(git-unpack-file master^:text) &&
133 a=$(git-unpack-file anchor:text) &&
134 b=$(git-unpack-file master:text) &&
135 sh -c "./custom-merge $o $a $b 0" &&
136 sed -e 1,3d $a >check-2 &&
137 cmp check-1 check-2 &&