From: Christian Couder Date: Mon, 11 Apr 2011 03:24:20 GMT Subject: Re: [PATCH 02/11] revert: Lose global variables "commit" and "me" Message-ID: <201104110524.21104.chriscool@tuxfamily.org> In-Reply-To: <1302448317-32387-3-git-send-email-artagnon@gmail.com> On Sunday 10 April 2011 17:11:48 Ramkumar Ramachandra wrote: > @@ -546,10 +547,13 @@ static int prepare_revs(struct rev_info *revs) > return 0; > } > > -static int read_and_refresh_cache(const char *me) > +static int read_and_refresh_cache(void) > { > static struct lock_file index_lock; > int index_fd = hold_locked_index(&index_lock, 0); > + const char *me; > + > + me = (cmd_opts.action == REVERT ? "revert" : "cherry-pick"); It looks like this patch will not compile as cmd_opts is introduced in patch 03/11. > if (read_index_preload(&the_index, NULL) < 0) > return error(_("%s: failed to read the index"), me); > refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, Best regards, Christian.