From 206de27efac383cecc3d0f938e220dc359be36c1 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 12 Jun 2005 09:37:49 -0700 Subject: git-apply: ignore empty git headers A meaningful (ie non-empty) git patch always has more information in the header than just the "diff --git" line itself: it needs to have either a patch associated with it (which implies "---" and "+++" lines in the header) or it needs to have rename/copy/delete/create information in it. Just ignore git patches which have no change information. Otherwise we'll end up with a patch that doesn't have filenames etc filled in, and we'll be unhappy. --- apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apply.c b/apply.c index 20c41c5143..01bcb947ed 100644 --- a/apply.c +++ b/apply.c @@ -568,7 +568,7 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc */ if (!memcmp("diff --git ", line, 11)) { int git_hdr_len = parse_git_header(line, len, size, patch); - if (git_hdr_len < 0) + if (git_hdr_len <= len) continue; if (!patch->old_name && !patch->new_name) die("git diff header lacks filename information (line %d)", linenr); -- cgit v1.2.3