From: Jim Meyering <jim@meyering.net>
Date: Mon, 23 Oct 2006 20:22:25 +0000 (+0200)
Subject: xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
X-Git-Tag: v1.4.3.2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=67aef034551aed0cc417e8b758a59b9978c4f3f1;p=git.git

xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.

This removes trailing blanks from git-generated diff headers
the same way a similar patch did that for GNU diff:

  http://article.gmane.org/gmane.comp.gnu.utils.bugs/13839

That is, it removes trailing blanks on the hunk header line that
shows the function name.

Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 714c56354..154c26fdc 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -90,7 +90,7 @@ static void xdl_find_func(xdfile_t *xf, long i, char *buf, long sz, long *ll) {
 		     *rec == '#')) {	/* #define? */
 			if (len > sz)
 				len = sz;
-			if (len && rec[len - 1] == '\n')
+			while (0 < len && isspace((unsigned char)rec[len - 1]))
 				len--;
 			memcpy(buf, rec, len);
 			*ll = len;