[RFC/PATCH v2 3/8] rebase: cherry-pick: fix sequence continuation

From

Felipe Contreras <felipe.contreras@gmail.com>

Date

May 29, 2013, 04:16 UTC

Message-ID

<1369801000-3705-4-git-send-email-felipe.contreras@gmail.com>

In-Reply-To

<1369801000-3705-1-git-send-email-felipe.contreras@gmail.com>

We are not in am mode.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 git-rebase--cherrypick.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index 51354af..2fa4993 100644
--- a/git-rebase--cherrypick.sh
+++ b/git-rebase--cherrypick.sh
@@ -5,13 +5,15 @@
 
 case "$action" in
 continue)
-	git am --resolved --resolvemsg="$resolvemsg" &&
-	move_to_original_branch
+	git cherry-pick --continue &&
+	move_to_original_branch &&
+	rm -rf "$state_dir"
 	exit
 	;;
 skip)
-	git am --skip --resolvemsg="$resolvemsg" &&
-	move_to_original_branch
+	git cherry-pick --skip &&
+	move_to_original_branch &&
+	rm -rf "$state_dir"
 	exit
 	;;
 esac

-- 
1.8.3.rc3.312.g47657de