2005-08-28 17:25:06 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
# Copyright (c) 2005 Robert Fitzsimons
|
|
|
|
#
|
|
|
|
|
2007-07-03 07:52:14 +02:00
|
|
|
test_description='git apply test patches with multiple fragments.
|
2005-08-28 17:25:06 +02:00
|
|
|
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2008-06-14 09:26:37 +02:00
|
|
|
cp ../t4109/patch1.patch .
|
|
|
|
cp ../t4109/patch2.patch .
|
|
|
|
cp ../t4109/patch3.patch .
|
|
|
|
cp ../t4109/patch4.patch .
|
2005-08-28 17:25:06 +02:00
|
|
|
|
2007-07-03 07:52:14 +02:00
|
|
|
test_expect_success "S = git apply (1)" \
|
|
|
|
'git apply patch1.patch patch2.patch'
|
2005-08-28 17:25:06 +02:00
|
|
|
mv main.c main.c.git
|
|
|
|
|
|
|
|
test_expect_success "S = patch (1)" \
|
|
|
|
'cat patch1.patch patch2.patch | patch -p1'
|
|
|
|
|
|
|
|
test_expect_success "S = cmp (1)" \
|
|
|
|
'cmp main.c.git main.c'
|
|
|
|
|
|
|
|
rm -f main.c main.c.git
|
|
|
|
|
2007-07-03 07:52:14 +02:00
|
|
|
test_expect_success "S = git apply (2)" \
|
|
|
|
'git apply patch1.patch patch2.patch patch3.patch'
|
2005-08-28 17:25:06 +02:00
|
|
|
mv main.c main.c.git
|
|
|
|
|
|
|
|
test_expect_success "S = patch (2)" \
|
|
|
|
'cat patch1.patch patch2.patch patch3.patch | patch -p1'
|
|
|
|
|
|
|
|
test_expect_success "S = cmp (2)" \
|
|
|
|
'cmp main.c.git main.c'
|
|
|
|
|
|
|
|
rm -f main.c main.c.git
|
|
|
|
|
2007-07-03 07:52:14 +02:00
|
|
|
test_expect_success "S = git apply (3)" \
|
|
|
|
'git apply patch1.patch patch4.patch'
|
2005-08-28 17:25:06 +02:00
|
|
|
mv main.c main.c.git
|
|
|
|
|
|
|
|
test_expect_success "S = patch (3)" \
|
|
|
|
'cat patch1.patch patch4.patch | patch -p1'
|
|
|
|
|
|
|
|
test_expect_success "S = cmp (3)" \
|
|
|
|
'cmp main.c.git main.c'
|
|
|
|
|
|
|
|
test_done
|
|
|
|
|