diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:51 -0800 |
| commit | 41905647fc6c94632b48b7caf65eaf3ae18f6d70 (patch) | |
| tree | be9411ef291bc2d6eeeb98f87d89239776d3bca9 /builtin-apply.c | |
| parent | Merge branch 'jc/conflict-marker-size' (diff) | |
| parent | builtin-apply.c: fix the --- and +++ header filename consistency check (diff) | |
| download | tgif-41905647fc6c94632b48b7caf65eaf3ae18f6d70.tar.xz | |
Merge branch 'ag/patch-header-verify'
* ag/patch-header-verify:
builtin-apply.c: fix the --- and +++ header filename consistency check
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index b99db0b800..2a1004d025 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -692,7 +692,7 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, if (isnull) die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr); another = find_name(line, NULL, p_value, TERM_TAB); - if (!another || memcmp(another, name, len)) + if (!another || memcmp(another, name, len + 1)) die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr); free(another); return orig_name; |