summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Robert Fitzsimons <robfitz@273k.net>2005-08-28 15:24:27 +0000
committerLibravatar Junio C Hamano <junkio@cox.net>2005-08-28 14:24:01 -0700
commite70a165d3db26dbab62e3430553a21d5e97b74ec (patch)
tree79475a5075ab4c4a421a0c324419b297f6bbb809
parentTeach git-status-script about git-ls-files --others (diff)
downloadtgif-e70a165d3db26dbab62e3430553a21d5e97b74ec.tar.xz
[PATCH] Fix git patch header processing in git-apply.
Stop processing and return NULL if we encounter a '\n' character before we have two matching names in the git header. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index 7c1a8411f2..3ebbf6b1dc 100644
--- a/apply.c
+++ b/apply.c
@@ -387,7 +387,7 @@ static char *git_header_name(char *line)
default:
continue;
case '\n':
- break;
+ return NULL;
case '\t': case ' ':
second = name+len;
for (;;) {