Hi,
Jonathan Nieder writes:
Ramkumar Ramachandra wrote:
quoted
--- a/builtin/revert.c
+++ b/builtin/revert.c
[...]
quoted
@@ -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