Actually, are all of 2/8 - 7/8 fixes for things that broke in patch 1/8? On Tue, May 28, 2013 at 9:16 PM, Felipe Contreras <felipe.contreras@xxxxxxxxx> wrote: > We don't use the 'rebase-apply'. > > Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> > --- > git-rebase--cherrypick.sh | 4 ++++ > git-rebase.sh | 5 ++++- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh > index cbf80f9..51354af 100644 > --- a/git-rebase--cherrypick.sh > +++ b/git-rebase--cherrypick.sh > @@ -18,6 +18,9 @@ esac > > test -n "$rebase_root" && root_flag=--root > > +mkdir "$state_dir" || die "Could not create temporary $state_dir" > +: > "$state_dir"/cherrypick || die "Could not mark as cherrypick" > + > # we have to do this the hard way. git format-patch completely squashes > # empty commits and even if it didn't the format doesn't really lend > # itself well to recording empty patches. fortunately, cherry-pick > @@ -32,3 +35,4 @@ then > fi > > move_to_original_branch > +rm -rf "$state_dir" > diff --git a/git-rebase.sh b/git-rebase.sh > index f929ca3..76900a0 100755 > --- a/git-rebase.sh > +++ b/git-rebase.sh > @@ -174,6 +174,9 @@ then > then > type=interactive > interactive_rebase=explicit > + elif test -f "$merge_dir"/cherrypick > + then > + type=cherrypick > else > type=merge > fi > @@ -382,7 +385,7 @@ then > elif test -n "$keep_empty" > then > type=cherrypick > - state_dir="$apply_dir" > + state_dir="$merge_dir" > else > type=am > state_dir="$apply_dir" > -- > 1.8.3.rc3.312.g47657de > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html