From: Jeff King Date: Tue, 23 Jan 2007 03:38:28 +0000 (-0500) Subject: format-patch: fix bug with --stdout in a subdirectory X-Git-Tag: v1.5.0-rc3~78 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=90f70a910ac77cab7bc1b9a6c4b233add98a58c7;p=git.git format-patch: fix bug with --stdout in a subdirectory We set the output directory to the git subdirectory prefix if one has not already been specified. However, in the case of --stdout, we explicitly _don't_ want the output directory to be set. The result was that "git-format-patch --stdout" in a directory besides the project root produced the "standard output, or directory, which one?" error message. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/builtin-log.c b/builtin-log.c index 13a3f9b25..503cd1e2b 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -476,7 +476,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (!rev.diffopt.text) rev.diffopt.binary = 1; - if (!output_directory) + if (!output_directory && !use_stdout) output_directory = prefix; if (output_directory) {