[RFC/PATCH 08/18] revert: refactor code into a new pick_commits() function

[Christian Couder <chriscool@tuxfamily.org>]

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 builtin/revert.c |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/builtin/revert.c b/builtin/revert.c
index 443b529..1f20251 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -578,36 +578,28 @@ static void read_and_refresh_cache(const char *me)
 	rollback_lock_file(&index_lock);
 }
 
-static int revert_or_cherry_pick(int argc, const char **argv, int revert, int edit)
+static int pick_commits(struct args_info *infos)
 {
-	struct args_info infos;
 	struct rev_info revs;
 	struct commit *commit;
 
-	memset(&infos, 0, sizeof(infos));
-	git_config(git_default_config, NULL);
-	infos.action = revert ? REVERT : CHERRY_PICK;
-	me = revert ? "revert" : "cherry-pick";
-	setenv(GIT_REFLOG_ACTION, me, 0);
-	parse_args(argc, argv, &infos);
-
-	if (infos.allow_ff) {
-		if (infos.signoff)
+	if (infos->allow_ff) {
+		if (infos->signoff)
 			die("cherry-pick --ff cannot be used with --signoff");
-		if (infos.no_commit)
+		if (infos->no_commit)
 			die("cherry-pick --ff cannot be used with --no-commit");
-		if (infos.no_replay)
+		if (infos->no_replay)
 			die("cherry-pick --ff cannot be used with -x");
-		if (infos.edit)
+		if (infos->edit)
 			die("cherry-pick --ff cannot be used with --edit");
 	}
 
 	read_and_refresh_cache(me);
 
-	prepare_revs(&revs, &infos);
+	prepare_revs(&revs, infos);
 
 	while ((commit = get_revision(&revs))) {
-		int res = do_pick_commit(&infos, commit);
+		int res = do_pick_commit(infos, commit);
 		if (res)
 			return res;
 	}
@@ -615,6 +607,20 @@ static int revert_or_cherry_pick(int argc, const char **argv, int revert, int ed
 	return 0;
 }
 
+static int revert_or_cherry_pick(int argc, const char **argv, int revert, int edit)
+{
+	struct args_info infos;
+
+	git_config(git_default_config, NULL);
+	me = revert ? "revert" : "cherry-pick";
+	setenv(GIT_REFLOG_ACTION, me, 0);
+	memset(&infos, 0, sizeof(infos));
+	infos.action = revert ? REVERT : CHERRY_PICK;
+	parse_args(argc, argv, &infos);
+
+	return pick_commits(&infos);
+}
+
 int cmd_revert(int argc, const char **argv, const char *prefix)
 {
 	return revert_or_cherry_pick(argc, argv, 1, isatty(0));
-- 
1.7.3.2.504.g59d466