diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-10-14 11:51:03 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-10-14 23:47:03 -0700 |
commit | fe0a3cb23c7930be419937825591388465ceb47f (patch) | |
tree | 722c7746cc498a2d190daef0716e8a0e2aa2a369 | |
parent | Merge branch 'maint-1.6.2' into maint-1.6.3 (diff) | |
download | tgif-fe0a3cb23c7930be419937825591388465ceb47f.tar.xz |
info/grafts: allow trailing whitespaces at the end of line
When creating an info/grafts under windows, one typically gets a CRLF file.
There is no good reason to forbid trailing CR at the end of the line (for
that matter, any trailing whitespaces); the code allowed only LF simply
because that was good enough for the platforms with LF line endings.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -136,8 +136,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) { |