undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge early part of branch 'jc/diff-apply-patch'

Browse Source
This commit is contained in:
Junio C Hamano 2006-10-18 22:08:46 -07:00
commit 17250ac172
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-apply.c
View File

@ -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) static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name, const char *oldnew)
{ {
if (!orig_name && !isnull) if (!orig_name && !isnull)
return find_name(line, NULL, 1, 0); return find_name(line, NULL, 1, TERM_TAB);
if (orig_name) { if (orig_name) {
int len; int len;
@ -370,7 +370,7 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
len = strlen(name); len = strlen(name);
if (isnull) if (isnull)
die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr); 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)) if (!another || memcmp(another, name, len))
die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr); die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
free(another); free(another);