We don't use the 'rebase-apply'. Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> --- git-rebase--cherrypick.sh | 5 ++++- git-rebase.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh index 2c16995..e142cfb 100644 --- a/git-rebase--cherrypick.sh +++ b/git-rebase--cherrypick.sh @@ -18,12 +18,15 @@ esac test -n "$rebase_root" && root_flag=--root +mkdir -p "$state_dir" || die "Could not create temporary $state_dir" +: > "$state_dir"/cherrypick || die "Could not mark as cherrypick" + git cherry-pick --allow-empty "$revisions" ret=$? if test 0 != $ret then - test -d "$state_dir" && write_basic_state + write_basic_state return $ret fi diff --git a/git-rebase.sh b/git-rebase.sh index 2310638..b28addc 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -204,6 +204,9 @@ then then type=interactive interactive_rebase=explicit + elif test -f "$merge_dir"/cherrypick + then + type=cherrypick else type=merge fi @@ -415,7 +418,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.4-fc -- 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