git-apply: creatign empty files is nonfatal

diff --git a/diff-tree.c b/diff-tree.c
index c3a5617c578d3a863b9759967e9583c0c5c944ea..6f8dc2024c289a92fe81014511a8377364340783 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -19,6 +19,7 @@ static int diff_break_opt = -1;
 static const char *orderfile = NULL;
 static const char *header = NULL;
 static const char *header_prefix = "";
+static enum cmit_fmt commit_format = CMIT_FMT_RAW;
 
 // What paths are we interested in?
 static int nr_paths = 0;
@@ -321,7 +322,7 @@ static char *generate_header(const char *commit, const char *parent, const char
 
        offset = sprintf(this_header, "%s%s (from %s)\n", header_prefix, commit, parent);
        if (verbose_header) {
-               offset += pretty_print_commit(msg, len, this_header + offset, sizeof(this_header) - offset);
+               offset += pretty_print_commit(commit_format, msg, len, this_header + offset, sizeof(this_header) - offset);
                this_header[offset++] = '\n';
                this_header[offset++] = 0;
        }
@@ -459,16 +460,19 @@ int main(int argc, const char **argv)
                }
                if (!strncmp(arg, "-M", 2)) {
                        detect_rename = DIFF_DETECT_RENAME;
-                       diff_score_opt = diff_scoreopt_parse(arg);
+                       if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_tree_usage);
                        continue;
                }
                if (!strncmp(arg, "-C", 2)) {
                        detect_rename = DIFF_DETECT_COPY;
-                       diff_score_opt = diff_scoreopt_parse(arg);
+                       if ((diff_score_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_tree_usage);
                        continue;
                }
                if (!strncmp(arg, "-B", 2)) {
-                       diff_break_opt = diff_scoreopt_parse(arg);
+                       if ((diff_break_opt = diff_scoreopt_parse(arg)) == -1)
+                               usage(diff_tree_usage);
                        continue;
                }
                if (!strcmp(arg, "-z")) {