Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-apply: don't try to be clever about filenames and the index
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Tue, 31 May 2005 22:05:59 +0000
(15:05 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Tue, 31 May 2005 22:05:59 +0000
(15:05 -0700)
It just causes things like "git-apply --stat" to parse traditional
patch headers differently depending on what your index is, which
is nasty.
apply.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
9765800
)
diff --git
a/apply.c
b/apply.c
index 74908cd4d41a34a74449bee4884c0d2ea0e8fe1c..dba8292267abe48b6f671315a3366d28b33fe0e3 100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-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 2
-#define TERM_TAB 4
+#define TERM_SPACE 1
+#define TERM_TAB 2
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))
return 0;
if (c == '\t' && !(terminate & TERM_TAB))
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)) {
patch->is_new = 0;
patch->is_delete = 1;
} else if (is_dev_null(second)) {
patch->is_new = 0;
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;
} else {
patch->old_name = name;
} else {
- name = find_name(first, NULL, p_value, TERM_
EXIST | TERM_
SPACE | TERM_TAB);
- name = find_name(second, name, 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_SPACE | TERM_TAB);
patch->old_name = patch->new_name = name;
}
if (!name)
patch->old_name = patch->new_name = name;
}
if (!name)