From: Junio C Hamano <junkio@cox.net>
Date: Tue, 27 Feb 2007 09:31:42 +0000 (-0800)
Subject: git-apply: do not fix whitespaces on context lines.
X-Git-Tag: v1.5.0.3~38
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=63e50d492c658b4a0d616f57f8b43a7a9ba1bbcc;p=git.git

git-apply: do not fix whitespaces on context lines.

Internal function apply_line() is called to copy both context lines
and added lines to the output buffer, while possibly fixing the
whitespace breakages depending on --whitespace=strip settings.
However, it did its fix-up on both context lines and added lines.

This resulted in two symptoms:

 (1) The number of lines reported to have been fixed up included
     these context lines.

 (2) However, the lines actually shown were limited to the added
     lines that had whitespace breakages.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-apply.c b/builtin-apply.c
index abe353871..bec95d6c8 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1539,7 +1539,8 @@ static int apply_line(char *output, const char *patch, int plen)
 	int need_fix_leading_space = 0;
 	char *buf;
 
-	if ((new_whitespace != strip_whitespace) || !whitespace_error) {
+	if ((new_whitespace != strip_whitespace) || !whitespace_error ||
+	    *patch != '+') {
 		memcpy(output, patch + 1, plen);
 		return plen;
 	}