@matheusbsbs / matheus-bagliano / commits / ce37596c13

builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Dec 21, 2012 at 21:27 UTC ce37596c137aef257b9b75dce1c6b2fd498bab23

1 file changed +6 -7

builtin/log.c

+6 -7

@@ -768,7 +768,6 @@ static void add_branch_description(struct strbuf *buf, const char *branch_name)

768 }

769

770 static void make_cover_letter(struct rev_info *rev, int use_stdout,

771 - int numbered_files,

771 struct commit *origin,

772 int nr, struct commit **list, struct commit *head,

773 const char *branch_name,

@@ -791,7 +790,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,

790 committer = git_committer_info(0);

791

792 if (!use_stdout &&

794 - reopen_stdout(NULL, numbered_files ? NULL : "cover-letter", rev, quiet))

793 + reopen_stdout(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))

794 return;

795

796 log_write_email_headers(rev, head, &pp.subject, &pp.after_subject,

@@ -1045,7 +1044,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)

1044 int nr = 0, total, i;

1045 int use_stdout = 0;

1046 int start_number = -1;

1048 - int numbered_files = 0; /* _just_ numbers */

1047 + int just_numbers = 0;

1048 int ignore_if_in_upstream = 0;

1049 int cover_letter = 0;

1050 int boundary_count = 0;

@@ -1070,7 +1069,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)

1069 N_("print patches to standard out")),

1070 OPT_BOOLEAN(0, "cover-letter", &cover_letter,

1071 N_("generate a cover letter")),

1073 - OPT_BOOLEAN(0, "numbered-files", &numbered_files,

1072 + OPT_BOOLEAN(0, "numbered-files", &just_numbers,

1073 N_("use simple number sequence for output file names")),

1074 OPT_STRING(0, "suffix", &fmt_patch_suffix, N_("sfx"),

1075 N_("use <sfx> instead of '.patch'")),

@@ -1338,12 +1337,12 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)

1337 const char *msgid = clean_message_id(in_reply_to);

1338 string_list_append(rev.ref_message_ids, msgid);

1339 }

1341 - rev.numbered_files = numbered_files;

1340 + rev.numbered_files = just_numbers;

1341 rev.patch_suffix = fmt_patch_suffix;

1342 if (cover_letter) {

1343 if (thread)

1344 gen_message_id(&rev, "cover");

1346 - make_cover_letter(&rev, use_stdout, numbered_files,

1345 + make_cover_letter(&rev, use_stdout,

1346 origin, nr, list, head, branch_name, quiet);

1347 total++;

1348 start_number--;

@@ -1390,7 +1389,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)

1389 }

1390

1391 if (!use_stdout &&

1393 - reopen_stdout(numbered_files ? NULL : commit, NULL, &rev, quiet))

1392 + reopen_stdout(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))

1393 die(_("Failed to create output files"));

1394 shown = log_tree_commit(&rev, commit);

1395 free(commit->buffer);