Browse Source

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
maint
Junio C Hamano 15 years ago
parent
commit
dd2195eb80
  1. 4
      commit.c

4
commit.c

@ -132,8 +132,8 @@ struct commit_graft *read_graft_line(char *buf, int len) @@ -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) {

Loading…
Cancel
Save