Fix up git-merge-one-file-script

diff --git a/apply.c b/apply.c
index cf55fda71edba2ea4a78d52e714e37f46fda9691..20c41c51433d18b21b914f0e700501c5244de6e0 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -435,6 +435,8 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch
                        { "new file mode ", gitdiff_newfile },
                        { "copy from ", gitdiff_copysrc },
                        { "copy to ", gitdiff_copydst },
+                       { "rename old ", gitdiff_renamesrc },
+                       { "rename new ", gitdiff_renamedst },
                        { "rename from ", gitdiff_renamesrc },
                        { "rename to ", gitdiff_renamedst },
                        { "similarity index ", gitdiff_similarity },
@@ -569,7 +571,7 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
                        if (git_hdr_len < 0)
                                continue;
                        if (!patch->old_name && !patch->new_name)
-                               die("git diff header lacks filename information");
+                               die("git diff header lacks filename information (line %d)", linenr);
                        *hdrsize = git_hdr_len;
                        return offset;
                }
@@ -628,8 +630,11 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
 
        if (patch->is_new != !oldlines)
                return error("new file depends on old contents");
-       if (patch->is_delete != !newlines)
-               return error("deleted file still has contents");
+       if (patch->is_delete != !newlines) {
+               if (newlines)
+                       return error("deleted file still has contents");
+               fprintf(stderr, "** warning: file %s becomes empty but is not deleted\n", patch->new_name);
+       }
 
        /* Parse the thing.. */
        line += len;
@@ -1186,6 +1191,9 @@ static void write_out_one_result(struct patch *patch)
 
 static void write_out_results(struct patch *list)
 {
+       if (!list)
+               die("No changes");
+
        while (list) {
                write_out_one_result(list);
                list = list->next;