Revision 1dad5c14f993dcd2d38ce7eb7ecedb624732d692 authored by SZEDER Gábor on 13 June 2012, 08:11:29 UTC, committed by Junio C Hamano on 13 June 2012, 17:24:46 UTC
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9bea2b5
t4109-apply-multifrag.sh
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
# Copyright (c) 2005 Robert Fitzsimons
#
test_description='git apply test patches with multiple fragments.'
. ./test-lib.sh
cp "$TEST_DIRECTORY/t4109/patch1.patch" .
cp "$TEST_DIRECTORY/t4109/patch2.patch" .
cp "$TEST_DIRECTORY/t4109/patch3.patch" .
cp "$TEST_DIRECTORY/t4109/patch4.patch" .
test_expect_success 'git apply (1)' '
git apply patch1.patch patch2.patch &&
test_cmp "$TEST_DIRECTORY/t4109/expect-1" main.c
'
rm -f main.c
test_expect_success 'git apply (2)' '
git apply patch1.patch patch2.patch patch3.patch &&
test_cmp "$TEST_DIRECTORY/t4109/expect-2" main.c
'
rm -f main.c
test_expect_success 'git apply (3)' '
git apply patch1.patch patch4.patch &&
test_cmp "$TEST_DIRECTORY/t4109/expect-3" main.c
'
mv main.c main.c.git
test_done
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...