kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

format-patch: tie file-opening logic to output_directory 

In format-patch we're either outputting to stdout or to individual files
in an output directory (which may be just "./"). Our logic for whether
to open a new file for each patch is checked with "!use_stdout", but it
is equally correct to check for a non-NULL output_directory.

The distinction will matter when we add a new single-stream output in a
future patch, when only one of the three methods will want individual
files. Let's swap the logic here in preparation.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2020-11-04 14:28:34 -05:00 committed by Junio C Hamano
parent 4c6f781f9c
commit 1e1693b2bb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/log.c
View File

@ -1153,7 +1153,7 @@ static void get_notes_args(struct strvec *arg, struct rev_info *rev)
} }
} }


static void make_cover_letter(struct rev_info *rev, int use_stdout, static void make_cover_letter(struct rev_info *rev, int use_separate_file,
struct commit *origin, struct commit *origin,
int nr, struct commit **list, int nr, struct commit **list,
const char *branch_name, const char *branch_name,
@ -1173,7 +1173,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,


committer = git_committer_info(0); committer = git_committer_info(0);


if (!use_stdout && if (use_separate_file &&
open_next_file(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet)) open_next_file(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))
die(_("failed to create cover-letter file")); die(_("failed to create cover-letter file"));


@ -2117,7 +2117,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (cover_letter) { if (cover_letter) {
if (thread) if (thread)
gen_message_id(&rev, "cover"); gen_message_id(&rev, "cover");
make_cover_letter(&rev, use_stdout, make_cover_letter(&rev, !!output_directory,
origin, nr, list, branch_name, quiet); origin, nr, list, branch_name, quiet);
print_bases(&bases, rev.diffopt.file); print_bases(&bases, rev.diffopt.file);
print_signature(rev.diffopt.file); print_signature(rev.diffopt.file);
@ -2172,7 +2172,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
gen_message_id(&rev, oid_to_hex(&commit->object.oid)); gen_message_id(&rev, oid_to_hex(&commit->object.oid));
} }


if (!use_stdout && if (output_directory &&
open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet)) open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
die(_("failed to create output files")); die(_("failed to create output files"));
shown = log_tree_commit(&rev, commit); shown = log_tree_commit(&rev, commit);
@ -2185,7 +2185,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
* the log; when using one file per patch, we do * the log; when using one file per patch, we do
* not want the extra blank line. * not want the extra blank line.
*/ */
if (!use_stdout) if (output_directory)
rev.shown_one = 0; rev.shown_one = 0;
if (shown) { if (shown) {
print_bases(&bases, rev.diffopt.file); print_bases(&bases, rev.diffopt.file);
@ -2196,7 +2196,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
else else
print_signature(rev.diffopt.file); print_signature(rev.diffopt.file);
} }
if (!use_stdout) if (output_directory)
fclose(rev.diffopt.file); fclose(rev.diffopt.file);
} }
stop_progress(&progress); stop_progress(&progress);