Reading the Git configuration, setting environment variables, parsing
command-line arguments, and populating the options structure should be
done in cmd_cherry_pick/ cmd_revert. The job pick_commits of
simplified into setting up the revision walker and calling
do_pick_commit in a loop- later in the series, it will handle
failures, and serve as the starting point for continuation.
Based-on-patch-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
---
This patch is fairly straightforward.
builtin/revert.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index 8550927..288c898 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -603,19 +603,12 @@ static int read_and_refresh_cache(struct replay_opts *opts)
return 0;
}
-static int revert_or_cherry_pick(int argc, const char **argv,
- struct replay_opts *opts)
+static int pick_commits(struct replay_opts *opts)
{
struct rev_info revs;
struct commit *commit;
- const char *me;
int res;
- git_config(git_default_config, NULL);
- me = (opts->action == REVERT ? "revert" : "cherry-pick");
- setenv(GIT_REFLOG_ACTION, me, 0);
- parse_args(argc, argv, opts);
-
if (opts->allow_ff) {
if (opts->signoff)
die(_("cherry-pick --ff cannot be used with --signoff"));
@@ -642,18 +635,27 @@ int cmd_revert(int argc, const char **argv, const char *prefix)
{
struct replay_opts opts;
+ git_config(git_default_config, NULL);
memset(&opts, 0, sizeof(struct replay_opts));
if (isatty(0))
opts.edit = 1;
+
opts.action = REVERT;
- return revert_or_cherry_pick(argc, argv, &opts);
+ setenv(GIT_REFLOG_ACTION, "revert", 0);
+ parse_args(argc, argv, &opts);
+
+ return pick_commits(&opts);
}
int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
{
struct replay_opts opts;
+ git_config(git_default_config, NULL);
memset(&opts, 0, sizeof(struct replay_opts));
opts.action = CHERRY_PICK;
- return revert_or_cherry_pick(argc, argv, &opts);
+ setenv(GIT_REFLOG_ACTION, "cherry-pick", 0);
+ parse_args(argc, argv, &opts);
+
+ return pick_commits(&opts);
}
--
1.7.5.GIT
--
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