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 gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com 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 Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Tue, Jun 4, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: You didn't answer, what happens when you run --skip-empty and --allow-empty? I'll answer to a slightly different

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 gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Tue, Jun 4, 2013 at 1:30 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: You didn't answer, what happens when you run

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

2013-06-04 Thread Antoine Pelisse
On Mon, Jun 3, 2013 at 11:10 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. Signed-off-by: Felipe Contreras

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 gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin.

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

2013-06-04 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com 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,

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

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

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

2013-06-03 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c| 2 ++

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 gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c

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

2013-06-03 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---