aboutsummaryrefslogtreecommitdiff
path: root/t/t4116-apply-reverse.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-07 12:29:09 -0700
committerJunio C Hamano <gitster@pobox.com>2007-07-07 12:29:09 -0700
commit0707a9d6f200bbafc02d13dd7f2c12bb795999f6 (patch)
tree579501f90e8b0a2d46480df695a01f5d5e90aacf /t/t4116-apply-reverse.sh
parent4d3f4b80e49275c7eaf6ba0dbddd6180957926b9 (diff)
parent5fda48d67c82e07950e0b0c21cd8c97daefd7be0 (diff)
downloadgit-0707a9d6f200bbafc02d13dd7f2c12bb795999f6.tar.gz
git-0707a9d6f200bbafc02d13dd7f2c12bb795999f6.tar.xz
Merge branch 'maint'
* maint: Fix "apply --reverse" with regard to whitespace
Diffstat (limited to 't/t4116-apply-reverse.sh')
-rwxr-xr-xt/t4116-apply-reverse.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh
index a7f5905f1..9ae2b3a8e 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