Re: [PATCH 08/14] revert: Separate cmdline parsing from functional code

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Jul 6, 2011, 09:34 UTC
Message-ID: <CALkWK0=eMfMYvysKpixUWt_nCmK3x8EUgKxnstJrAReN8Xi=FA@mail.gmail.com>
In-Reply-To: <20110706091334.GE15682@elie>

Hi,

Jonathan Nieder writes:

Show 21 quoted lines

> Ramkumar Ramachandra wrote:
>> --- a/builtin/revert.c
>> +++ b/builtin/revert.c
> [...]
>> @@ -612,7 +610,10 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
>>
>>       memset(&opts, 0, sizeof(struct replay_opts));
>>       opts.action = CHERRY_PICK;
>> -     res = revert_or_cherry_pick(argc, argv, &opts);
>> +     git_config(git_default_config, NULL);
>> +     me = "cherry-pick";
>> +     parse_args(argc, argv, &opts);
>> +     res = pick_commits(&opts);
>>       if (res < 0)
>>               die(_("%s failed"), me);
>>       return res;
>
> I'd put the "me =" line right after "opts.action =" if doing it this
> way.  This means callers to pick_commits() are responsible for setting
> the "me" variable and in particular it will not make sense to export
> that function to callers outside of this file any more, right?

Exactly.  Good point.

-- Ram