diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-25 08:29:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-25 08:29:20 (GMT) |
| commit | 422a82f21370fe38b3e926a83b460bf2b1dd13ab (patch) | |
| tree | 744e121cdc79db2c8243555929e240aa170a187c /t/t4124-apply-ws-rule.sh | |
| parent | 01ae841ccf3aa5d5331a4e6aed6122fee6617740 (diff) | |
| download | git-422a82f21370fe38b3e926a83b460bf2b1dd13ab.zip git-422a82f21370fe38b3e926a83b460bf2b1dd13ab.tar.gz git-422a82f21370fe38b3e926a83b460bf2b1dd13ab.tar.bz2 | |
Fix severe breakage in "git-apply --whitespace=fix"
735c674 (Trailing whitespace and no newline fix, 2009-07-22) completely
broke --whitespace=fix, causing it to lose all the empty lines in a patch.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4124-apply-ws-rule.sh')
| -rwxr-xr-x | t/t4124-apply-ws-rule.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh index 5698a9a..fac2093 100755 --- a/t/t4124-apply-ws-rule.sh +++ b/t/t4124-apply-ws-rule.sh @@ -154,7 +154,9 @@ create_patch () { index e69de29..8bd6648 100644 --- a/target +++ b/target - @@ -0,0 +1 @@ + @@ -0,0 +1,3 @@ + +An empty line follows + + +A line with trailing whitespace and no newline_ \ No newline at end of file EOF @@ -162,8 +164,10 @@ create_patch () { test_expect_success 'trailing whitespace & no newline at the end of file' ' >target && - create_patch | git apply --whitespace=fix - && - grep "newline$" target + create_patch >patch-file && + git apply --whitespace=fix patch-file && + grep "newline$" target && + grep "^$" target ' test_done |