development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-apply: don't try to be clever about filenames and the index

Browse source 
It just causes things like "git-apply --stat" to parse traditional
patch headers differently depending on what your index is, which
is nasty.
This commit is contained in:
Linus Torvalds 2005-05-31 15:05:59 -07:00
parent 97658004c3
commit 381ca9a3bc
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apply.c
View file

@ -116,9 +116,8 @@ static int is_dev_null(const char *str)
return !memcmp("/dev/null", str, 9) && isspace(str[9]); return !memcmp("/dev/null", str, 9) && isspace(str[9]);
} }
#define TERM_EXIST 1 #define TERM_SPACE 1
#define TERM_SPACE 2 #define TERM_TAB 2
#define TERM_TAB 4
static int name_terminate(const char *name, int namelen, int c, int terminate) static int name_terminate(const char *name, int namelen, int c, int terminate)
{ {
@ -127,13 +126,6 @@ static int name_terminate(const char *name, int namelen, int c, int terminate)
if (c == '\t' && !(terminate & TERM_TAB)) if (c == '\t' && !(terminate & TERM_TAB))
return 0; return 0;
/*
* Do we want an existing name? Return false and
* continue if it's not there.
*/
if (terminate & TERM_EXIST)
return cache_name_pos(name, namelen) >= 0;
return 1; return 1;
} }
@ -205,11 +197,11 @@ static void parse_traditional_patch(const char *first, const char *second, struc
} else if (is_dev_null(second)) { } else if (is_dev_null(second)) {
patch->is_new = 0; patch->is_new = 0;
patch->is_delete = 1; patch->is_delete = 1;
name = find_name(first, NULL, p_value, TERM_EXIST | TERM_SPACE | TERM_TAB); name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
patch->old_name = name; patch->old_name = name;
} else { } else {
name = find_name(first, NULL, p_value, TERM_EXIST | TERM_SPACE | TERM_TAB); name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
name = find_name(second, name, p_value, TERM_EXIST | TERM_SPACE | TERM_TAB); name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
patch->old_name = patch->new_name = name; patch->old_name = patch->new_name = name;
} }
if (!name) if (!name)