[PATCH v1 4/8] format-patch: add the option --confirm-overwrite
From: Firmin Martin <hidden>
Date: 2021-05-06 16:52:47
Subsystem:
the rest · Maintainer:
Linus Torvalds
This command line option acts in the same way as the configuration option format.confirmOverwrite. Signed-off-by: Firmin Martin <redacted> --- builtin/log.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/builtin/log.c b/builtin/log.c
index ec9848da70..0ce8778338 100644
--- a/builtin/log.c
+++ b/builtin/log.c@@ -1776,6 +1776,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) int quiet = 0; const char *reroll_count = NULL; char *cover_from_description_arg = NULL; + char *confirm_overwrite_arg = NULL; char *branch_name = NULL; char *base_commit = NULL; struct base_tree_info bases;
@@ -1818,6 +1819,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) OPT_STRING(0, "cover-from-description", &cover_from_description_arg, N_("cover-from-description-mode"), N_("generate parts of a cover letter based on a branch's description")), + OPT_STRING(0, "confirm-overwrite", &confirm_overwrite_arg, N_("when"), + N_("overwrite cover letter/patches with or without confirmation")), OPT_CALLBACK_F(0, "subject-prefix", &rev, N_("prefix"), N_("use [<prefix>] instead of [PATCH]"), PARSE_OPT_NONEG, subject_prefix_callback),
@@ -1919,6 +1922,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (cover_from_description_arg) cover_from_description_mode = parse_cover_from_description(cover_from_description_arg); + if (confirm_overwrite_arg) + confirm_overwrite = parse_confirm_overwrite(confirm_overwrite_arg); + if (reroll_count) { struct strbuf sprefix = STRBUF_INIT;
--
2.31.1.449.g4a44fa8106