Re: [RFC/PATCH v2 4/8] rebase: cherry-pick: fix abort of cherry mode

2013-05-29 Thread Stefano Lattarini
On 05/29/2013 06:16 AM, Felipe Contreras wrote: > Signed-off-by: Felipe Contreras > --- > git-rebase.sh | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/git-rebase.sh b/git-rebase.sh > index 76900a0..9b5d78b 100755 > --- a/git-rebase.sh > +++ b/git-rebase.sh > @@ -335,6 +335,7 @@ skip) >

Re: [RFC/PATCH v2 4/8] rebase: cherry-pick: fix abort of cherry mode

2013-05-28 Thread Felipe Contreras
On Wed, May 29, 2013 at 12:35 AM, Martin von Zweigbergk wrote: > Same here: should this have been in the first patch? If not, do you > know for how long it has been broken (since which commit)? Since day 1 of --keep-empty: 90e1818 git-rebase: add keep_empty flag -- Felipe Contreras -- To unsub

Re: [RFC/PATCH v2 4/8] rebase: cherry-pick: fix abort of cherry mode

2013-05-28 Thread Martin von Zweigbergk
Same here: should this have been in the first patch? If not, do you know for how long it has been broken (since which commit)? On Tue, May 28, 2013 at 9:16 PM, Felipe Contreras wrote: > Signed-off-by: Felipe Contreras > --- > git-rebase.sh | 1 + > 1 file changed, 1 insertion(+) > > diff --git

[RFC/PATCH v2 4/8] rebase: cherry-pick: fix abort of cherry mode

2013-05-28 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-rebase.sh b/git-rebase.sh index 76900a0..9b5d78b 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -335,6 +335,7 @@ skip) run_specific_rebase ;; abort) + test "$type" =