From: Matthias Lederhofer Date: Thu, 28 Sep 2006 19:55:35 +0000 (+0200) Subject: git-format-patch: fix bug using -o in subdirectories X-Git-Tag: v1.4.3-rc1~10 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77e565d8f76357781eb6236e031e8e0581de83a9;p=git.git git-format-patch: fix bug using -o in subdirectories This was introduced by me in commit v1.4.2.1-gc08e524. Signed-off-by: Matthias Lederhofer Signed-off-by: Junio C Hamano --- diff --git a/builtin-log.c b/builtin-log.c index 130b53a19..9d1ceae44 100644 --- 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?");