So it can be used by other tools (e.g. git rebase), and the right action
is passed to the hooks and notes rewrite stuff.
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
builtin/revert.c | 2 ++
sequencer.c | 4 ++++
sequencer.h | 2 ++
3 files changed, 8 insertions(+)
diff --git a/builtin/revert.c b/builtin/revert.c
index 54fba63..a24b689 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -99,6 +99,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
OPT_END(),
OPT_END(),
OPT_END(),
+ OPT_END(),
};
if (opts->action == REPLAY_PICK) {
@@ -109,6 +110,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
OPT_BOOL(0, "allow-empty-message", &opts->allow_empty_message, N_("allow commits with empty messages")),
OPT_BOOL(0, "keep-redundant-commits", &opts->keep_redundant_commits, N_("keep redundant, empty commits")),
OPT_BOOL(0, "skip-empty", &opts->skip_empty, N_("skip empty commits")),
+ OPT_STRING(0, "action-name", &opts->action_name, N_("name"), N_("action name")),
OPT_END(),
};
if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra))
diff --git a/sequencer.c b/sequencer.c
index fc0dd04..ed59d75 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -832,6 +832,8 @@ static int populate_opts_cb(const char *key, const char *value, void *data)
opts->xopts[opts->xopts_nr++] = xstrdup(value);
} else if (!strcmp(key, "options.allow-rerere-auto"))
opts->allow_rerere_auto = git_config_int(key, value);
+ else if (!strcmp(key, "options.action-name"))
+ git_config_string(&opts->action_name, key, value);
else
return error(_("Invalid key: %s"), key);
@@ -1015,6 +1017,8 @@ static void save_opts(struct replay_opts *opts)
git_config_set_in_file(opts_file, "options.allow-rerere-auto", buf.buf);
strbuf_release(&buf);
}
+ if (opts->action_name)
+ git_config_set_in_file(opts_file, "options.action-name", opts->action_name);
}
static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts)
diff --git a/sequencer.h b/sequencer.h
index efec1b5..6dfffaa 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -48,6 +48,8 @@ struct replay_opts {
/* Only used by REPLAY_NONE */
struct rev_info *revs;
+
+ const char *action_name;
};
int sequencer_pick_revisions(struct replay_opts *opts);
--
1.9.2+fc1.2.gfbaae8c
--
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