diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-07 18:50:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-07 11:54:51 -0700 |
| commit | 5fda48d67c82e07950e0b0c21cd8c97daefd7be0 (patch) | |
| tree | 6e00623936013d4aaea619c55cd0d7c45fa96257 /t | |
| parent | ed5f07a6fdc5653e24a5bd6c216d12bc878496bd (diff) | |
| download | git-5fda48d67c82e07950e0b0c21cd8c97daefd7be0.tar.gz git-5fda48d67c82e07950e0b0c21cd8c97daefd7be0.tar.xz | |
Fix "apply --reverse" with regard to whitespace
"git apply" used to take check the whitespace in the wrong
direction.
Noticed by Daniel Barkalow.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4116-apply-reverse.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh index 2685b2263..11e02807a 100755 --- a/t/t4116-apply-reverse.sh +++ b/t/t4116-apply-reverse.sh @@ -82,4 +82,10 @@ test_expect_success 'apply in reverse without postimage' ' ) ' +test_expect_success 'reversing a whitespace introduction' ' + sed "s/a/a /" < file1 > file1.new && + mv file1.new file1 && + git diff | git apply --reverse --whitespace=error +' + test_done |