summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-30 20:07:08 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-30 20:07:08 -0700
commit97d484bea211f6d16c52d153ae02ea7a42668330 (patch)
tree311122e566c95ac35f43a868f44250b4f99298f9 /commit.c
parent4b3c1800613fcebdb3c6d7e99bfd8e670ec67248 (diff)
parentfe0a3cb23c7930be419937825591388465ceb47f (diff)
downloadgit-97d484bea211f6d16c52d153ae02ea7a42668330.tar.gz
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
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/commit.c b/commit.c
index fedbd5e526..6393e1b362 100644
--- 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) {