diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-25 01:31:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-25 01:31:53 -0700 |
| commit | 8f5e3ca7d1d9c987c5a50934f1acdbad44163f3b (patch) | |
| tree | c1093f41bebfaa211a072faf887d7d283f493ae3 /t | |
| parent | b3601a633801861da9dc1e6b4f7d62b05ca1706c (diff) | |
| parent | 422a82f21370fe38b3e926a83b460bf2b1dd13ab (diff) | |
| download | git-8f5e3ca7d1d9c987c5a50934f1acdbad44163f3b.tar.gz | |
Merge branch 'maint'
* maint:
Fix severe breakage in "git-apply --whitespace=fix"
Diffstat (limited to 't')
| -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 5698a9a736..fac2093d7f 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 |