diff options
| author | Jeff King <peff@peff.net> | 2020-11-04 19:28:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-04 22:05:28 (GMT) |
| commit | 4c6f781f9c7ee7029c3f2fd20ddd76ce8b476bca (patch) | |
| tree | bb2b99abdf85a596bc7cbc7695e3fbf9e8984f38 /t/t4014-format-patch.sh | |
| parent | 898f80736c75878acc02dc55672317fcc0e0a5a6 (diff) | |
| download | git-4c6f781f9c7ee7029c3f2fd20ddd76ce8b476bca.zip git-4c6f781f9c7ee7029c3f2fd20ddd76ce8b476bca.tar.gz git-4c6f781f9c7ee7029c3f2fd20ddd76ce8b476bca.tar.bz2 | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4014-format-patch.sh')
| -rwxr-xr-x | t/t4014-format-patch.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 294e76c..e8d6156 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -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 && |