From: Rohit Ashiwal Date: Mon, 10 Jun 2019 05:13:13 GMT Subject: Re: [GSoC][PATCH 1/3] sequencer: add advice for revert Message-ID: <20190610051313.16222-1-rohit.ashiwal265@gmail.com> In-Reply-To: <2007ef79-1791-4f77-f9e4-34c59b4f0c36@gmail.com> Hi Philip On 2019-06-09 17:52 UTC Phillip Wood wrote: > > Hi Rohit > > Congratulations on your first GSoC patch series! Thank you very much :) > On 08/06/2019 20:19, Rohit Ashiwal wrote: > > [...] > > @@ -2655,6 +2655,7 @@ static int create_seq_dir(void) > > if (file_exists(git_path_seq_dir())) { > > error(_("a cherry-pick or revert is already in progress")); > > advise(_("try \"git cherry-pick (--continue | --quit | --abort)\"")); > > + advise(_("or \"git revert (--continue | --quit | --abort)\"")); > > I agree that it's a good idea to add advice for revert as well, but it > would be better to call sequencer_get_last_command() to find out if > we're running cherry-pick or revert and tailor the advice appropriately. Firstly, signature of `create_seq_dir` doesn't allow us to call `sequencer_get_last_command()`. Changing that for the sake of a better error message is too much task for this patch as it is a subject of discussion on its own. (Also changing signature only makes sense if this patch series gets merged). FWIW, I think we should left this to further discussions for now and decide what to do later on. > Best Wishes > > Phillip Thanks Rohit