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 c0cd1520db6ef1036678046fc5c8ada174155c49..7d9059ba94aaa4c7f3dc2c8059acb4aca2c3277b 100644 (file)
--- 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;
                        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;
                }
                        *hdrsize = git_hdr_len;
                        return offset;
                }