summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-16 00:38:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-16 00:38:47 (GMT)
commitdd2195eb80ee5753e41d9688ddf6758a142a14df (patch)
treeb0417d1e3110a601b958dcbedd2e9a8eb33fe5b2 /commit.c
parent69abb194eed5b2f06590d0145e4034300c3e7ac9 (diff)
parentfe0a3cb23c7930be419937825591388465ceb47f (diff)
downloadgit-dd2195eb80ee5753e41d9688ddf6758a142a14df.zip
git-dd2195eb80ee5753e41d9688ddf6758a142a14df.tar.gz
git-dd2195eb80ee5753e41d9688ddf6758a142a14df.tar.bz2
Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint
* 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 fedbd5e..6393e1b 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) {