On Wed, 11 May 2011, Ramkumar Ramachandra wrote:
> @@ -583,10 +589,12 @@ static int read_and_refresh_cache(const char *me)
> static int revert_or_cherry_pick(int argc, const char **argv)
> {
> struct rev_info revs;
> + struct commit *commit;
> + const char *me;
> int res;
>
> git_config(git_default_config, NULL);
> - me = action == REVERT ? "revert" : "cherry-pick";
> + me = (action == REVERT ? "revert" : "cherry-pick");
> setenv(GIT_REFLOG_ACTION, me, 0);
> parse_args(argc, argv);
Later in the series, you remove everything related to "me" that you add
here, having modified it once in the middle. Just go to
setenv(GIT_REFLOG_ACTION, action == REVERT ? "revert" : "cherry-pick");
and remove "me" from this function in this patch. For that matter,
squashing together the "opts" patch and this one would probably make them
make more sense: there's not much benefit to getting rid of some globals
when other globals remain that matter for the same reason. It also fixes
the annoyance that each place you introduce "me" in this patch needs to be
changed later in the series.
-Daniel
*This .sig left intentionally blank*
--
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