path: root/t/
diff options
authorJeff King <>2020-11-04 19:28:31 (GMT)
committerJunio C Hamano <>2020-11-04 22:05:28 (GMT)
commit4c6f781f9c7ee7029c3f2fd20ddd76ce8b476bca (patch)
treebb2b99abdf85a596bc7cbc7695e3fbf9e8984f38 /t/
parent898f80736c75878acc02dc55672317fcc0e0a5a6 (diff)
format-patch: refactor output selection
The --stdout and --output-directory options are mutually exclusive, but it's hard to tell from reading the code. We have three separate conditionals that check for use_stdout, and it's only after we've set up the output_directory fully that we check whether the user also specified --stdout. Instead, let's check the exclusion explicitly first, then have a single conditional that handles stdout versus an output directory. This is slightly easier to follow now, and also will keep things sane when we add another output mode in a future patch. We'll add a few tests as well, covering the mutual exclusion and the fact that we are not confused by a configured output directory. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 13 insertions, 0 deletions
diff --git a/t/ b/t/
index 294e76c..e8d6156 100755
--- a/t/
+++ b/t/
@@ -1919,6 +1919,19 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' '
test_path_is_dir patchset
+test_expect_success 'format-patch forbids multiple outputs' '
+ rm -fr outdir &&
+ test_must_fail \
+ git format-patch --stdout --output-directory=outdir
+test_expect_success 'configured outdir does not conflict with output options' '
+ rm -fr outdir &&
+ test_config format.outputDirectory outdir &&
+ git format-patch --stdout &&
+ test_path_is_missing outdir
test_expect_success 'format-patch --base' '
git checkout patchid &&