Re: [RFC PATCH] Option to allow cherry-pick to skip empty commits

2017-01-23 Thread Giuseppe Bilotta
On Mon, Jan 23, 2017 at 9:10 PM, Junio C Hamano wrote: > Giuseppe Bilotta writes: > >> ... I still don't see how to force a complete reread of the index >> after running a git reset (which I need for the --skip command), ... > > Do you mean

Re: [RFC PATCH] Option to allow cherry-pick to skip empty commits

2017-01-23 Thread Junio C Hamano
Giuseppe Bilotta writes: > ... I still don't see how to force a complete reread of the index > after running a git reset (which I need for the --skip command), ... Do you mean discard_index() or discard_cache() followed by read_index() or read_cache(), or do you mean

Re: [RFC PATCH] Option to allow cherry-pick to skip empty commits

2017-01-23 Thread Giuseppe Bilotta
On Mon, Jan 23, 2017 at 7:15 PM, Junio C Hamano wrote: > Giuseppe Bilotta writes: > >> By the way, I noticed going over the code that the -allow options are >> not stored, so that in case of interruption they will be reset, is >> this intentional or

Re: [RFC PATCH] Option to allow cherry-pick to skip empty commits

2017-01-23 Thread Junio C Hamano
Giuseppe Bilotta writes: > By the way, I noticed going over the code that the -allow options are > not stored, so that in case of interruption they will be reset, is > this intentional or a bug? I do not know offhand, but given the history of the two commands, I

Re: [RFC PATCH] Option to allow cherry-pick to skip empty commits

2017-01-23 Thread Giuseppe Bilotta
On Mon, Jan 23, 2017 at 12:27 AM, Junio C Hamano wrote: > Giuseppe Bilotta writes: >> +static int allow_or_skip_empty(struct replay_opts *opts, struct commit >> *commit) >> { >> int index_unchanged, empty_commit; >> >> /* >> - *

Re: [RFC PATCH] Option to allow cherry-pick to skip empty commits

2017-01-22 Thread Junio C Hamano
Giuseppe Bilotta writes: > This allows cherry-picking a set of commits, some of which may be > redundant, without stopping to ask for the user intervention. > > Signed-off-by: Giuseppe Bilotta > --- > Documentation/git-cherry-pick.txt |

[RFC PATCH] Option to allow cherry-pick to skip empty commits

2017-01-21 Thread Giuseppe Bilotta
This allows cherry-picking a set of commits, some of which may be redundant, without stopping to ask for the user intervention. Signed-off-by: Giuseppe Bilotta --- Documentation/git-cherry-pick.txt | 4 builtin/revert.c | 1 + sequencer.c