Linus Torvalds | b507b46 | 2006-10-19 19:26:08 -0700 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
| 3 | # Copyright (c) 2006 Junio C Hamano |
| 4 | # |
| 5 | |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 6 | test_description='git apply with new style GNU diff with empty context |
Linus Torvalds | b507b46 | 2006-10-19 19:26:08 -0700 | [diff] [blame] | 7 | |
| 8 | ' |
| 9 | |
| 10 | . ./test-lib.sh |
| 11 | |
| 12 | test_expect_success setup ' |
| 13 | { |
| 14 | echo; echo; |
| 15 | echo A; echo B; echo C; |
| 16 | echo; |
| 17 | } >file1 && |
| 18 | cat file1 >file1.orig && |
| 19 | { |
| 20 | cat file1 && |
| 21 | echo Q | tr -d "\\012" |
| 22 | } >file2 && |
Brandon Casey | 7235704 | 2009-05-06 13:29:14 -0500 | [diff] [blame] | 23 | cat file2 >file2.orig && |
Linus Torvalds | b507b46 | 2006-10-19 19:26:08 -0700 | [diff] [blame] | 24 | git add file1 file2 && |
| 25 | sed -e "/^B/d" <file1.orig >file1 && |
Brandon Casey | 325fb15 | 2009-05-06 13:29:15 -0500 | [diff] [blame] | 26 | cat file1 > file2 && |
Johannes Schindelin | 3007a78 | 2007-03-22 21:05:28 -0400 | [diff] [blame] | 27 | echo Q | tr -d "\\012" >>file2 && |
Linus Torvalds | b507b46 | 2006-10-19 19:26:08 -0700 | [diff] [blame] | 28 | cat file1 >file1.mods && |
| 29 | cat file2 >file2.mods && |
| 30 | git diff | |
| 31 | sed -e "s/^ \$//" >diff.output |
| 32 | ' |
| 33 | |
| 34 | test_expect_success 'apply --numstat' ' |
| 35 | |
| 36 | git apply --numstat diff.output >actual && |
| 37 | { |
| 38 | echo "0 1 file1" && |
| 39 | echo "0 1 file2" |
| 40 | } >expect && |
Junio C Hamano | 3af8286 | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 41 | test_cmp expect actual |
Linus Torvalds | b507b46 | 2006-10-19 19:26:08 -0700 | [diff] [blame] | 42 | |
| 43 | ' |
| 44 | |
| 45 | test_expect_success 'apply --apply' ' |
| 46 | |
| 47 | cat file1.orig >file1 && |
| 48 | cat file2.orig >file2 && |
| 49 | git update-index file1 file2 && |
| 50 | git apply --index diff.output && |
Junio C Hamano | 3af8286 | 2008-05-23 22:28:56 -0700 | [diff] [blame] | 51 | test_cmp file1.mods file1 && |
| 52 | test_cmp file2.mods file2 |
Linus Torvalds | b507b46 | 2006-10-19 19:26:08 -0700 | [diff] [blame] | 53 | ' |
| 54 | |
| 55 | test_done |