Teach 'git merge' that some merge strategies no longer exist
[git/jnareb-git.git] / t / t4109-apply-multifrag.sh
blobff5fdf35f99e4c50d1bd27eeacd816c37cc5bdfa
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-lib.sh
12 cp ../t4109/patch1.patch .
13 cp ../t4109/patch2.patch .
14 cp ../t4109/patch3.patch .
15 cp ../t4109/patch4.patch .
17 test_expect_success "S = git apply (1)" \
18 'git apply patch1.patch patch2.patch'
19 mv main.c main.c.git
21 test_expect_success "S = patch (1)" \
22 'cat patch1.patch patch2.patch | patch -p1'
24 test_expect_success "S = cmp (1)" \
25 'cmp main.c.git main.c'
27 rm -f main.c main.c.git
29 test_expect_success "S = git apply (2)" \
30 'git apply patch1.patch patch2.patch patch3.patch'
31 mv main.c main.c.git
33 test_expect_success "S = patch (2)" \
34 'cat patch1.patch patch2.patch patch3.patch | patch -p1'
36 test_expect_success "S = cmp (2)" \
37 'cmp main.c.git main.c'
39 rm -f main.c main.c.git
41 test_expect_success "S = git apply (3)" \
42 'git apply patch1.patch patch4.patch'
43 mv main.c main.c.git
45 test_expect_success "S = patch (3)" \
46 'cat patch1.patch patch4.patch | patch -p1'
48 test_expect_success "S = cmp (3)" \
49 'cmp main.c.git main.c'
51 test_done