Since a078f73 (git-am: add --message-id/--no-message-id, 2014-11-25),
git-am.sh supported the --[no-]message-id options, and the
"am.messageid" setting which specifies the default option.
--[no-]message-id tells git-am whether or not the -m option should be
passed to git-mailinfo.
Re-implement this option in builtin/am.c.
Signed-off-by: Paul Tan <pyoka...@gmail.com>
---
Notes:
No test for am.messageid
builtin/am.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/builtin/am.c b/builtin/am.c
index b73549f..4cec380 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -113,6 +113,9 @@ struct am_state {
/* one of the enum keep_type values */
int keep;
+ /* pass -m flag to git-mailinfo */
+ int message_id;
+
/* override error message when patch failure occurs */
const char *resolvemsg;
@@ -140,6 +143,8 @@ static void am_state_init(struct am_state *state)
quiet = getenv("GIT_QUIET");
if (quiet && *quiet)
state->quiet = 1;
+
+ git_config_get_bool("am.messageid", &state->message_id);
}
/**
@@ -350,6 +355,9 @@ static void am_load(struct am_state *state)
else
state->keep = KEEP_FALSE;
+ read_state_file(&sb, am_path(state, "messageid"), 2, 1);
+ state->message_id = !strcmp(sb.buf, "t");
+
state->rebasing = !!file_exists(am_path(state, "rebasing"));
strbuf_release(&sb);
@@ -560,6 +568,8 @@ static void am_setup(struct am_state *state, enum
patch_format patch_format,
}
write_file(am_path(state, "keep"), 1, "%s", str);
+ write_file(am_path(state, "messageid"), 1, state->message_id ? "t" :
"f");
+
if (state->rebasing)
write_file(am_path(state, "rebasing"), 1, "%s", "");
else
@@ -700,6 +710,9 @@ static int parse_patch(struct am_state *state, const char
*patch)
die("BUG: invalid value for state->keep");
}
+ if (state->message_id)
+ argv_array_push(&cp.args, "-m");
+
argv_array_push(&cp.args, am_path(state, "msg"));
argv_array_push(&cp.args, am_path(state, "patch"));
@@ -1377,6 +1390,8 @@ static struct option am_options[] = {
N_("pass -k flag to git-mailinfo"), KEEP_TRUE),
OPT_SET_INT(0, "keep-non-patch", &state.keep,
N_("pass -b flag to git-mailinfo"), KEEP_NON_PATCH),
+ OPT_BOOL('m', "message-id", &state.message_id,
+ N_("pass -m flag to git-mailinfo")),
OPT_CALLBACK(0, "patch-format", &opt_patch_format, N_("format"),
N_("format the patch(es) are in"), parse_opt_patchformat),
OPT_STRING(0, "resolvemsg", &state.resolvemsg, NULL,
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
