Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-05 Thread Felipe Contreras
On Wed, Jun 5, 2013 at 1:13 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> On Tue, Jun 4, 2013 at 1:30 PM, Junio C Hamano wrote: >>> Felipe Contreras writes: >>> You didn't answer, what happens when you run --skip-empty and --allow-empty? >>> >>> I'll answer to a slightly

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-05 Thread Junio C Hamano
Felipe Contreras writes: > On Tue, Jun 4, 2013 at 1:30 PM, Junio C Hamano wrote: >> Felipe Contreras writes: >> >>> You didn't answer, what happens when you run --skip-empty and --allow-empty? >> >> I'll answer to a slightly different question: What should happen? >> >> I think it should error

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-05 Thread Felipe Contreras
On Tue, Jun 4, 2013 at 1:30 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> You didn't answer, what happens when you run --skip-empty and --allow-empty? > > I'll answer to a slightly different question: What should happen? > > I think it should error out, because --allow-empty is about

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-04 Thread Junio C Hamano
Felipe Contreras writes: > You didn't answer, what happens when you run --skip-empty and --allow-empty? I'll answer to a slightly different question: What should happen? I think it should error out, because --allow-empty is about "allowing empty commits to be preserved", and --skip-empty is abo

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-04 Thread Felipe Contreras
On Tue, Jun 4, 2013 at 12:35 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >>> I think just "Skip commits that are or become empty" without saying >>> "Instead of failing," is fine, too. >> >> I think "Instead of failing" makes perfect sense, because it's not our >> job to describe what

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-04 Thread Junio C Hamano
Felipe Contreras writes: >> I think just "Skip commits that are or become empty" without saying >> "Instead of failing," is fine, too. > > I think "Instead of failing" makes perfect sense, because it's not our > job to describe what other options do,... > ... > simply explain what this option > d

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-04 Thread Felipe Contreras
On Mon, Jun 3, 2013 at 4:45 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano wrote: >>> Felipe Contreras writes: >>> Pretty much what it says on the tin. Signed-off-by: Felipe Contreras --- Documentation/git-cher

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-03 Thread Antoine Pelisse
On Mon, Jun 3, 2013 at 11:10 PM, Felipe Contreras wrote: > On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano wrote: >> Felipe Contreras writes: >> >>> Pretty much what it says on the tin. >>> >>> Signed-off-by: Felipe Contreras >>> --- >>> Documentation/git-cherry-pick.txt | 3 +++ >>> builtin

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-03 Thread Junio C Hamano
Felipe Contreras writes: > On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano wrote: >> Felipe Contreras writes: >> >>> Pretty much what it says on the tin. >>> >>> Signed-off-by: Felipe Contreras >>> --- >>> Documentation/git-cherry-pick.txt | 3 +++ >>> builtin/revert.c|

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-03 Thread Felipe Contreras
On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> Pretty much what it says on the tin. >> >> Signed-off-by: Felipe Contreras >> --- >> Documentation/git-cherry-pick.txt | 3 +++ >> builtin/revert.c| 2 ++ >> sequencer.c

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-03 Thread Junio C Hamano
Junio C Hamano writes: > Felipe Contreras writes: > >> Pretty much what it says on the tin. >> >> Signed-off-by: Felipe Contreras >> --- >> Documentation/git-cherry-pick.txt | 3 +++ >> builtin/revert.c| 2 ++ >> sequencer.c | 6 ++ >> seque

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-03 Thread Junio C Hamano
Felipe Contreras writes: > Pretty much what it says on the tin. > > Signed-off-by: Felipe Contreras > --- > Documentation/git-cherry-pick.txt | 3 +++ > builtin/revert.c| 2 ++ > sequencer.c | 6 ++ > sequencer.h | 1

[PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-05-28 Thread Felipe Contreras
Pretty much what it says on the tin. Signed-off-by: Felipe Contreras --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c| 2 ++ sequencer.c | 6 ++ sequencer.h | 1 + t/t3508-cherry-pick-many-commits.sh | 1