From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sun, 12 Jun 2005 16:37:49 +0000 (-0700)
Subject: git-apply: ignore empty git headers
X-Git-Tag: v0.99~293
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=206de27efac383cecc3d0f938e220dc359be36c1;p=git.git

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.
---

diff --git a/apply.c b/apply.c
index 20c41c514..01bcb947e 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);