Re: [PATCH 2/5] rebase: fix 'cherry' mode storage
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 28, 2013, 22:29 UTC
- Message-ID
- <7v8v2yyc04.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1369747757-10192-3-git-send-email-felipe.contreras@gmail.com>
Felipe Contreras <felipe.contreras@gmail.com> writes:
> We don't use the 'rebase-apply'.
s/.$/; we will use rebase-merge instead./ I think.
Show 16 quoted lines
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> > --- > git-rebase--cherry.sh | 4 ++++ > git-rebase.sh | 5 ++++- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/git-rebase--cherry.sh b/git-rebase--cherry.sh > index cbf80f9..ab1f8b7 100644 > --- a/git-rebase--cherry.sh > +++ b/git-rebase--cherry.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"/cherry || die "Could not mark as cherry"
Style:
>"$state_dir/cherry-pick"
I am not sure if the user _cares_ that internally we use cherry-pick when s/he asks us to do a keep-empty, and I suspect "mark as cherry" incomprehensible. I do not even know what is going on at this point (yet).
I _suspect_ that you are using cherry-pick when --keep-empty is given, so it might even make sense to talk in the end-users' terms, i.e. call this "$state_dir/keep-empty" (I am not sure if calling this split half "git-rebase--keep-empty.sh" makes sense, yet).
Show 32 quoted lines
> + > # 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 2754985..b7759d5 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"/cherry > + then > + type=cherry > else > type=merge > fi > @@ -382,7 +385,7 @@ then > elif test -n "$keep_empty" > then > type=cherry > - state_dir="$apply_dir" > + state_dir="$merge_dir" > else > type=am > state_dir="$apply_dir"