Merge branch 'jc/maint-1.6.3-graft-trailing-space'

* jc/maint-1.6.3-graft-trailing-space: info/grafts: allow trailing whitespaces at the end of line
git-mirror · Oct 31, 2009 · 97d484b · 97d484b
2 parents 4b3c180 + fe0a3cb
commit 97d484b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/commit.c b/commit.c
@@ -132,8 +132,8 @@ struct commit_graft *read_graft_line(char *buf, int len)
 	int i;
 	struct commit_graft *graft = NULL;
 
-	if (buf[len-1] == '\n')
-		buf[--len] = 0;
+	while (len && isspace(buf[len-1]))
+		buf[--len] = '\0';
 	if (buf[0] == '#' || buf[0] == '\0')
 		return NULL;
 	if ((len + 1) % 41) {