builtin/am: allow disabling conflict advice
[alt-git.git] / t / t4109-apply-multifrag.sh
blob4dc6d8e7d3c8bb834fda0e777e3083283df00033
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
4 # Copyright (c) 2005 Robert Fitzsimons
7 test_description='git apply test patches with multiple fragments.'
10 TEST_PASSES_SANITIZE_LEAK=true
11 . ./test-lib.sh
13 cp "$TEST_DIRECTORY/t4109/patch1.patch" .
14 cp "$TEST_DIRECTORY/t4109/patch2.patch" .
15 cp "$TEST_DIRECTORY/t4109/patch3.patch" .
16 cp "$TEST_DIRECTORY/t4109/patch4.patch" .
18 test_expect_success 'git apply (1)' '
19 git apply patch1.patch patch2.patch &&
20 test_cmp "$TEST_DIRECTORY/t4109/expect-1" main.c
22 rm -f main.c
24 test_expect_success 'git apply (2)' '
25 git apply patch1.patch patch2.patch patch3.patch &&
26 test_cmp "$TEST_DIRECTORY/t4109/expect-2" main.c
28 rm -f main.c
30 test_expect_success 'git apply (3)' '
31 git apply patch1.patch patch4.patch &&
32 test_cmp "$TEST_DIRECTORY/t4109/expect-3" main.c
34 mv main.c main.c.git
36 test_done