summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2010-01-18 21:37:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-19 01:08:59 (GMT)
commitda915939fd7523cd145ba280cc974d46aa792331 (patch)
tree01bd424f3ff95bfe3d0a09d8946c73b062f159e4 /builtin-apply.c
parentb9cb07726a7a288244b585939850348f319e5e0c (diff)
downloadgit-da915939fd7523cd145ba280cc974d46aa792331.zip
git-da915939fd7523cd145ba280cc974d46aa792331.tar.gz
git-da915939fd7523cd145ba280cc974d46aa792331.tar.bz2
builtin-apply.c: fix the --- and +++ header filename consistency check
gitdiff_verify_name() only did a filename prefix check because of an off-by-one error. Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index 36e2f9d..8ca86f6 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -686,7 +686,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;