summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-19 05:08:46 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-19 05:08:46 (GMT)
commit17250ac172b44acd3bdf4ddffb4ed6d915b69246 (patch)
tree1b78b659b0c4b807e44e77a5efb0623bb57cda85 /builtin-apply.c
parentf73a5e897609c895aa6c10f7a89428d1749d37ce (diff)
parentce74618d95088d99de53fb691f361da05932f705 (diff)
downloadgit-17250ac172b44acd3bdf4ddffb4ed6d915b69246.zip
git-17250ac172b44acd3bdf4ddffb4ed6d915b69246.tar.gz
git-17250ac172b44acd3bdf4ddffb4ed6d915b69246.tar.bz2
Merge early part of branch 'jc/diff-apply-patch'
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index cbe5977..0bdcf63 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -360,7 +360,7 @@ static int gitdiff_hdrend(const char *line, struct patch *patch)
static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
{
if (!orig_name && !isnull)
- return find_name(line, NULL, 1, 0);
+ return find_name(line, NULL, 1, TERM_TAB);
if (orig_name) {
int len;
@@ -370,7 +370,7 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
len = strlen(name);
if (isnull)
die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
- another = find_name(line, NULL, 1, 0);
+ another = find_name(line, NULL, 1, TERM_TAB);
if (!another || memcmp(another, name, len))
die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
free(another);