Re: [GSoC][PATCH 1/3] sequencer: add advice for revert

2019-06-10 Thread Phillip Wood
Hi Rohit On 10/06/2019 14:25, Rohit Ashiwal wrote: > Hi Phillip > > On 2019-06-10 10:39 UTC Phillip Wood wrote: >> >> Hi Rohit >> >> On 10/06/2019 06:13, Rohit Ashiwal wrote: >>> >>> [...] >>> Firstly, signature of `create_seq_dir` doesn't allow us to call >>> `sequencer_get_last_command()`. Cha

Re: [GSoC][PATCH 1/3] sequencer: add advice for revert

2019-06-10 Thread Junio C Hamano
Phillip Wood writes: >> 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. > > There is only one caller and it al

Re: [GSoC][PATCH 1/3] sequencer: add advice for revert

2019-06-10 Thread Rohit Ashiwal
Hi Phillip On 2019-06-10 10:39 UTC Phillip Wood wrote: > >Hi Rohit > >On 10/06/2019 06:13, Rohit Ashiwal wrote: >> >> [...] >> 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 tas

Re: [GSoC][PATCH 1/3] sequencer: add advice for revert

2019-06-10 Thread Phillip Wood
Hi Rohit On 10/06/2019 06:13, Rohit Ashiwal wrote: > 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 @@ sta

Re: [GSoC][PATCH 1/3] sequencer: add advice for revert

2019-06-09 Thread Rohit Ashiwal
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_di

Re: [GSoC][PATCH 1/3] sequencer: add advice for revert

2019-06-09 Thread Phillip Wood
Hi Rohit Congratulations on your first GSoC patch series! On 08/06/2019 20:19, Rohit Ashiwal wrote: > In the case of merge conflicts, while performing a revert, we are > currently advised to use `git cherry-pick --` > of which --continue is incompatible for continuing the revert. > Introduce a se