Ensure `git-pull` fails if `git-merge` fails.
[git/dscho.git] / t / t4104-apply-boundary.sh
blob2ff800c23f8f833393c9eb7f50c89bd1a790094f
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
6 test_description='git-apply boundary tests
9 . ./test-lib.sh
11 L="c d e f g h i j k l m n o p q r s t u v w x"
13 test_expect_success setup '
14 for i in b '"$L"' y
16 echo $i
17 done >victim &&
18 cat victim >original &&
19 git update-index --add victim &&
21 : add to the head
22 for i in a b '"$L"' y
24 echo $i
25 done >victim &&
26 cat victim >add-a-expect &&
27 git diff victim >add-a-patch.with &&
28 git diff --unified=0 >add-a-patch.without &&
30 : modify at the head
31 for i in a '"$L"' y
33 echo $i
34 done >victim &&
35 cat victim >mod-a-expect &&
36 git diff victim >mod-a-patch.with &&
37 git diff --unified=0 >mod-a-patch.without &&
39 : remove from the head
40 for i in '"$L"' y
42 echo $i
43 done >victim &&
44 cat victim >del-a-expect &&
45 git diff victim >del-a-patch.with
46 git diff --unified=0 >del-a-patch.without &&
48 : add to the tail
49 for i in b '"$L"' y z
51 echo $i
52 done >victim &&
53 cat victim >add-z-expect &&
54 git diff victim >add-z-patch.with &&
55 git diff --unified=0 >add-z-patch.without &&
57 : modify at the tail
58 for i in a '"$L"' y
60 echo $i
61 done >victim &&
62 cat victim >mod-z-expect &&
63 git diff victim >mod-z-patch.with &&
64 git diff --unified=0 >mod-z-patch.without &&
66 : remove from the tail
67 for i in b '"$L"'
69 echo $i
70 done >victim &&
71 cat victim >del-z-expect &&
72 git diff victim >del-z-patch.with
73 git diff --unified=0 >del-z-patch.without &&
75 : done
78 for with in with without
80 case "$with" in
81 with) u= ;;
82 without) u='--unidiff-zero ' ;;
83 esac
84 for kind in add-a add-z mod-a mod-z del-a del-z
86 test_expect_success "apply $kind-patch $with context" '
87 cat original >victim &&
88 git update-index victim &&
89 git apply --index '"$u$kind-patch.$with"' || {
90 cat '"$kind-patch.$with"'
91 (exit 1)
92 } &&
93 diff -u '"$kind"'-expect victim
95 done
96 done
98 for kind in add-a add-z mod-a mod-z del-a del-z
100 rm -f $kind-ng.without
101 sed -e "s/^diff --git /diff /" \
102 -e '/^index /d' \
103 <$kind-patch.without >$kind-ng.without
104 test_expect_success "apply non-git $kind-patch without context" '
105 cat original >victim &&
106 git update-index victim &&
107 git apply --unidiff-zero --index '"$kind-ng.without"' || {
108 cat '"$kind-ng.without"'
109 (exit 1)
110 } &&
111 diff -u '"$kind"'-expect victim
113 done
115 test_done