From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 17 Jun 2005 22:23:40 +0000 (-0700)
Subject: git-apply: use default name for mode change patches
X-Git-Tag: v0.99~257
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b7e8039a6f4a250bc0b9c9ca2d75b60368058413;p=git.git

git-apply: use default name for mode change patches

Pure mode changes won't have the file-name in the extended header lines,
so make sure we pick it up from the default name from the "diff --git"
line.
---

diff --git a/apply.c b/apply.c
index c0cd1520..7d9059ba 100644
--- a/apply.c
+++ b/apply.c
@@ -570,8 +570,11 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
 			int git_hdr_len = parse_git_header(line, len, size, patch);
 			if (git_hdr_len <= len)
 				continue;
-			if (!patch->old_name && !patch->new_name)
-				die("git diff header lacks filename information (line %d)", linenr);
+			if (!patch->old_name && !patch->new_name) {
+				if (!patch->def_name)
+					die("git diff header lacks filename information (line %d)", linenr);
+				patch->old_name = patch->new_name = patch->def_name;
+			}
 			*hdrsize = git_hdr_len;
 			return offset;
 		}