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>
This commit is contained in:

committed by
Junio C Hamano

parent
898f80736c
commit
4c6f781f9c
@ -1942,20 +1942,20 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
|
|||||||
if (rev.show_notes)
|
if (rev.show_notes)
|
||||||
load_display_notes(&rev.notes_opt);
|
load_display_notes(&rev.notes_opt);
|
||||||
|
|
||||||
if (!output_directory && !use_stdout)
|
if (use_stdout + !!output_directory > 1)
|
||||||
output_directory = config_output_directory;
|
die(_("--stdout and --output-directory are mutually exclusive"));
|
||||||
|
|
||||||
if (!use_stdout)
|
if (use_stdout) {
|
||||||
output_directory = set_outdir(prefix, output_directory);
|
|
||||||
else
|
|
||||||
setup_pager();
|
setup_pager();
|
||||||
|
} else {
|
||||||
if (output_directory) {
|
|
||||||
int saved;
|
int saved;
|
||||||
|
|
||||||
|
if (!output_directory)
|
||||||
|
output_directory = config_output_directory;
|
||||||
|
output_directory = set_outdir(prefix, output_directory);
|
||||||
|
|
||||||
if (rev.diffopt.use_color != GIT_COLOR_ALWAYS)
|
if (rev.diffopt.use_color != GIT_COLOR_ALWAYS)
|
||||||
rev.diffopt.use_color = GIT_COLOR_NEVER;
|
rev.diffopt.use_color = GIT_COLOR_NEVER;
|
||||||
if (use_stdout)
|
|
||||||
die(_("standard output, or directory, which one?"));
|
|
||||||
/*
|
/*
|
||||||
* We consider <outdir> as 'outside of gitdir', therefore avoid
|
* We consider <outdir> as 'outside of gitdir', therefore avoid
|
||||||
* applying adjust_shared_perm in s-c-l-d.
|
* applying adjust_shared_perm in s-c-l-d.
|
||||||
|
@ -1919,6 +1919,19 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' '
|
|||||||
test_path_is_dir patchset
|
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' '
|
test_expect_success 'format-patch --base' '
|
||||||
git checkout patchid &&
|
git checkout patchid &&
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user