commit 5fda48d67c82e07950e0b0c21cd8c97daefd7be0
author Johannes Schindelin <Johannes.Schindelin@gmx.de> Sat Jul 07 18:50:39 2007 +0100
committer Junio C Hamano <gitster@pobox.com> Sat Jul 07 11:54:51 2007 -0700
tree 6e00623936013d4aaea619c55cd0d7c45fa96257
parent ed5f07a6fdc5653e24a5bd6c216d12bc878496bd

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>

builtin-apply.c

diff --git a/builtin-apply.c b/builtin-apply.c
index 0399743..490e23e 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1003,12 +1003,16 @@
 			trailing++;
 			break;
 		case '-':
+			if (apply_in_reverse &&
+					new_whitespace != nowarn_whitespace)
+				check_whitespace(line, len);
 			deleted++;
 			oldlines--;
 			trailing = 0;
 			break;
 		case '+':
-			if (new_whitespace != nowarn_whitespace)
+			if (!apply_in_reverse &&
+					new_whitespace != nowarn_whitespace)
 				check_whitespace(line, len);
 			added++;
 			newlines--;