submodule: Use cat instead of echo to avoid DOS line-endings
[git/dscho.git] / t / t4151-am-abort.sh
blob1176bcccf3b3f3708df04f49bfd084190cd27600
1 #!/bin/sh
3 test_description='am --abort'
5 . ./test-lib.sh
7 test_expect_success setup '
8 for i in a b c d e f g
9 do
10 echo $i
11 done >file-1 &&
12 cp file-1 file-2 &&
13 test_tick &&
14 git add file-1 file-2 &&
15 git commit -m initial &&
16 git tag initial &&
17 for i in 2 3 4 5 6
19 echo $i >>file-1 &&
20 echo $i >otherfile-$i &&
21 git add otherfile-$i &&
22 test_tick &&
23 git commit -a -m $i || break
24 done &&
25 git format-patch --no-numbered initial &&
26 git checkout -b side initial &&
27 echo local change >file-2-expect
30 for with3 in '' ' -3'
32 test_expect_success "am$with3 stops at a patch that does not apply" '
34 git reset --hard initial &&
35 cp file-2-expect file-2 &&
37 test_must_fail git am$with3 000[1245]-*.patch &&
38 git log --pretty=tformat:%s >actual &&
39 for i in 3 2 initial
41 echo $i
42 done >expect &&
43 test_cmp expect actual
46 test_expect_success "am$with3 --skip continue after failed am$with3" '
47 test_must_fail git am$with3 --skip >output &&
48 test_i18ngrep "^Applying" output >output.applying &&
49 test_i18ngrep "^Applying: 6$" output.applying &&
50 test_i18ncmp file-2-expect file-2 &&
51 test ! -f .git/MERGE_RR
54 test_expect_success "am --abort goes back after failed am$with3" '
55 git am --abort &&
56 git rev-parse HEAD >actual &&
57 git rev-parse initial >expect &&
58 test_cmp expect actual &&
59 test_cmp file-2-expect file-2 &&
60 git diff-index --exit-code --cached HEAD &&
61 test ! -f .git/MERGE_RR
64 done
66 test_expect_success 'am --abort will keep the local commits intact' '
67 test_must_fail git am 0004-*.patch &&
68 test_commit unrelated &&
69 git rev-parse HEAD >expect &&
70 git am --abort &&
71 git rev-parse HEAD >actual &&
72 test_cmp expect actual
75 test_done