Since 017678b (am/mailinfo: Disable scissors processing by default,
2009-08-26), git-am supported the --[no-]scissors option, passing it to
git-mailinfo.
Re-implement support for this option.
Signed-off-by: Paul Tan <pyokagan@xxxxxxxxx>
---
Notes:
There are tests for mailinfo --scissors, but not am --scissors, or
mailinfo.scissors.
builtin/am.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/builtin/am.c b/builtin/am.c
index 1991f36..42efce1 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -87,6 +87,12 @@ enum keep_type {
KEEP_NON_PATCH /* pass -b flag to git-mailinfo */
};
+enum scissors_type {
+ SCISSORS_UNSET = -1,
+ SCISSORS_TRUE, /* pass --scissors to git-mailinfo */
+ SCISSORS_FALSE /* pass --no-scissors to git-mailinfo */
+};
+
struct am_state {
/* state directory path */
struct strbuf dir;
@@ -116,6 +122,9 @@ struct am_state {
/* pass -m flag to git-mailinfo */
int message_id;
+ /* one of the enum scissors_type values */
+ int scissors;
+
/* override error message when patch failure occurs */
const char *resolvemsg;
@@ -145,6 +154,8 @@ static void am_state_init(struct am_state *state)
state->quiet = 1;
git_config_get_bool("am.messageid", &state->message_id);
+
+ state->scissors = SCISSORS_UNSET;
}
/**
@@ -358,6 +369,14 @@ static void am_load(struct am_state *state)
read_state_file(&sb, am_path(state, "messageid"), 2, 1);
state->message_id = !strcmp(sb.buf, "t");
+ read_state_file(&sb, am_path(state, "scissors"), 2, 1);
+ if (!strcmp(sb.buf, "t"))
+ state->scissors = SCISSORS_TRUE;
+ else if (!strcmp(sb.buf, "f"))
+ state->scissors = SCISSORS_FALSE;
+ else
+ state->scissors = SCISSORS_UNSET;
+
state->rebasing = !!file_exists(am_path(state, "rebasing"));
strbuf_release(&sb);
@@ -581,6 +600,21 @@ static void am_setup(struct am_state *state, enum patch_format patch_format,
write_file(am_path(state, "messageid"), 1, state->message_id ? "t" : "f");
+ switch (state->scissors) {
+ case SCISSORS_UNSET:
+ str = "";
+ break;
+ case SCISSORS_FALSE:
+ str = "f";
+ break;
+ case SCISSORS_TRUE:
+ str = "t";
+ break;
+ default:
+ die("BUG: invalid value for state->scissors");
+ }
+ write_file(am_path(state, "scissors"), 1, "%s", str);
+
if (state->rebasing)
write_file(am_path(state, "rebasing"), 1, "%s", "");
else
@@ -724,6 +758,19 @@ static int parse_patch(struct am_state *state, const char *patch)
if (state->message_id)
argv_array_push(&cp.args, "-m");
+ switch (state->scissors) {
+ case SCISSORS_UNSET:
+ break;
+ case SCISSORS_FALSE:
+ argv_array_push(&cp.args, "--no-scissors");
+ break;
+ case SCISSORS_TRUE:
+ argv_array_push(&cp.args, "--scissors");
+ break;
+ default:
+ die("BUG: invalid value for state->scissors");
+ }
+
argv_array_push(&cp.args, am_path(state, "msg"));
argv_array_push(&cp.args, am_path(state, "patch"));
@@ -1410,6 +1457,8 @@ static struct option am_options[] = {
{ OPTION_SET_INT, 0, "no-keep-cr", &opt_keep_cr, NULL,
N_("do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 0},
+ OPT_BOOL('c', "scissors", &state.scissors,
+ N_("strip everything before a scissors line")),
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 majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html