3 # Copyright (c) 2006 Junio C Hamano
6 test_description
='git apply with new style GNU diff with empty context
12 test_expect_success setup
'
15 echo A; echo B; echo C;
18 cat file1 >file1.orig &&
21 echo Q | tr -d "\\012"
23 cat file2 >file2.orig &&
24 git add file1 file2 &&
25 sed -e "/^B/d" <file1.orig >file1 &&
27 echo Q | tr -d "\\012" >>file2 &&
28 cat file1 >file1.mods &&
29 cat file2 >file2.mods &&
31 sed -e "s/^ \$//" >diff.output
34 test_expect_success
'apply --numstat' '
36 git apply --numstat diff.output >actual &&
41 test_cmp expect actual
45 test_expect_success
'apply --apply' '
47 cat file1.orig >file1 &&
48 cat file2.orig >file2 &&
49 git update-index file1 file2 &&
50 git apply --index diff.output &&
51 test_cmp file1.mods file1 &&
52 test_cmp file2.mods file2