[PATCH v6 10/28] cherry-pick: add --action-name option
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Aug 30, 2013, 05:56 UTC
- Message-ID
- <1377842182-18724-11-git-send-email-felipe.contreras@gmail.com>
- In-Reply-To
- <1377842182-18724-1-git-send-email-felipe.contreras@gmail.com>
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@gmail.com> --- builtin/revert.c | 2 ++ git-rebase--interactive.sh | 4 ++-- sequencer.c | 6 +++++- sequencer.h | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c index d3ae2c4..ca28e52 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -124,6 +124,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) { @@ -134,6 +135,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) OPT_BOOLEAN(0, "allow-empty-message", &opts->allow_empty_message, N_("allow commits with empty messages")), OPT_BOOLEAN(0, "keep-redundant-commits", &opts->keep_redundant_commits, N_("keep redundant, empty commits")), OPT_BOOLEAN(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/git-rebase--interactive.sh b/git-rebase--interactive.sh index 83d6d46..e8143ae 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -251,7 +251,7 @@ pick_one () { test -d "$rewritten" && pick_one_preserving_merges "$@" && return - output eval git cherry-pick "$strategy_args" $empty_args $ff "$@" + output eval git cherry-pick "--action-name ''" "$strategy_args" $empty_args $ff "$@" } pick_one_preserving_merges () { @@ -361,7 +361,7 @@ pick_one_preserving_merges () { echo "$sha1 $(git rev-parse HEAD^0)" >> "$rewritten_list" ;; *) - output eval git cherry-pick "$strategy_args" "$@" || + output eval git cherry-pick "--action-name ''" "$strategy_args" "$@" || die_with_patch $sha1 "Could not pick $sha1" ;; esac diff --git a/sequencer.c b/sequencer.c index 56d791f..46848c4 100644 --- a/sequencer.c +++ b/sequencer.c @@ -829,7 +829,9 @@ static int populate_opts_cb(const char *key, const char *value, void *data) else if (!strcmp(key, "options.strategy-option")) { ALLOC_GROW(opts->xopts, opts->xopts_nr + 1, opts->xopts_alloc); opts->xopts[opts->xopts_nr++] = xstrdup(value); - } else + } else if (!strcmp(key, "options.action-name")) + git_config_string(&opts->action_name, key, value); + else return error(_("Invalid key: %s"), key); if (!error_flag) @@ -1006,6 +1008,8 @@ static void save_opts(struct replay_opts *opts) "options.strategy-option", opts->xopts[i], "^$", 0); } + 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.8.4-fc