Merge branch 'jc/gitpm'

diff --git a/builtin-log.c b/builtin-log.c
index 130b53a1960988aaf77014d39ee712a4848777b3..9d1ceae44c6a449d2329e897b9705a5b457187f0 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -270,8 +270,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 
        rev.extra_headers = extra_headers;
 
-       output_directory = prefix;
-
        /*
         * Parse the arguments before setup_revisions(), or something
         * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
@@ -350,6 +348,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        if (!rev.diffopt.output_format)
                rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
 
+       if (!output_directory)
+               output_directory = prefix;
+
        if (output_directory) {
                if (use_stdout)
                        die("standard output, or directory, which one?");