Re: [PATCH 12/18] revert: Make pick_commits functionally act on a commit list

From: Christian Couder <chriscool@tuxfamily.org>
Date: Jul 31, 2011, 12:08 UTC
Message-ID: <201107311408.40079.chriscool@tuxfamily.org>
In-Reply-To: <1311871951-3497-13-git-send-email-artagnon@gmail.com>

On Thursday 28 July 2011 18:52:25 Ramkumar Ramachandra wrote:

Show 12 quoted lines

>
> @@ -780,7 +789,13 @@ int cmd_revert(int argc, const char **argv, const char
> *prefix) opts.action = REVERT;
>  	git_config(git_default_config, NULL);
>  	parse_args(argc, argv, &opts);
> -	return pick_commits(&opts);
> +
> +	/*
> +	 * Decide what to do depending on the arguments; a fresh
> +	 * cherry-pick should be handled differently from an existing
> +	 * one that is being continued
> +	 */

It is strange to me that you add this comment only here and not below in cmd_cherry_pick(). So I'd suggest to put it before the definition of pick_revisions() instead.

Show 11 quoted lines

> +	return pick_revisions(&opts);
>  }
> 
>  int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
> @@ -791,5 +806,5 @@ int cmd_cherry_pick(int argc, const char **argv, const
> char *prefix) opts.action = CHERRY_PICK;
>  	git_config(git_default_config, NULL);
>  	parse_args(argc, argv, &opts);
> -	return pick_commits(&opts);
> +	return pick_revisions(&opts);
>  }

Thanks, Christian.