]>
Commit | Line | Data |
---|---|---|
ff3412ee RF |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano | |
4 | # Copyright (c) 2005 Robert Fitzsimons | |
5 | # | |
6 | ||
ac2e28c0 | 7 | test_description='git apply test patches with multiple fragments.' |
ff3412ee | 8 | |
ff3412ee RF |
9 | . ./test-lib.sh |
10 | ||
ac2e28c0 JH |
11 | cp "$TEST_DIRECTORY/t4109/patch1.patch" . |
12 | cp "$TEST_DIRECTORY/t4109/patch2.patch" . | |
13 | cp "$TEST_DIRECTORY/t4109/patch3.patch" . | |
14 | cp "$TEST_DIRECTORY/t4109/patch4.patch" . | |
ff3412ee | 15 | |
ac2e28c0 JH |
16 | test_expect_success 'git apply (1)' ' |
17 | git apply patch1.patch patch2.patch && | |
18 | test_cmp "$TEST_DIRECTORY/t4109/expect-1" main.c | |
19 | ' | |
20 | rm -f main.c | |
ff3412ee | 21 | |
ac2e28c0 JH |
22 | test_expect_success 'git apply (2)' ' |
23 | git apply patch1.patch patch2.patch patch3.patch && | |
24 | test_cmp "$TEST_DIRECTORY/t4109/expect-2" main.c | |
25 | ' | |
26 | rm -f main.c | |
ff3412ee | 27 | |
ac2e28c0 JH |
28 | test_expect_success 'git apply (3)' ' |
29 | git apply patch1.patch patch4.patch && | |
30 | test_cmp "$TEST_DIRECTORY/t4109/expect-3" main.c | |
31 | ' | |
ff3412ee RF |
32 | mv main.c main.c.git |
33 | ||
ff3412ee RF |
34 | test_done |
35 |