Re: [msysgit? bug] CRLF in info/grafts causes parse error
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 14, 2009, 18:51 UTC
- Message-ID
- <7vbpk9ermw.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <ecf590a0d9e21f480529f64e465825c5.squirrel@intranet.linagora.com>
"Yann Dirson" <ydirson@linagora.com> writes:
Show 9 quoted lines
> When creating an info/grafts under windows, one typically gets a CRLF file. > Then: > > * gitk loudly complains about "bad graft data" > * "git log > /dev/null" does not report any problem > * "git log > foo" does report the problem on sdterr, but exit code is still 0 > > Recreating the graft as a LF file (eg with "echo" or "printf") causes the > graft to be properly interpreted.
I do not see any reason to forbid trailing CR at the end of the line (for that matter, any trailing whitespaces) in the said file.
How about doing this?
commit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/commit.c b/commit.c index fedbd5e..0db2124 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 (isspace(buf[len-1])) + buf[--len] = '\0'; if (buf[0] == '#' || buf[0] == '\0') return NULL; if ((len + 1) % 41) {