[PATCH 3/5] rebase: fix sequence continuation
We are not in am mode. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase--cherry.sh | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/git-rebase--cherry.sh b/git-rebase--cherry.sh index ab1f8b7..ca78b1b 100644 --- a/git-rebase--cherry.sh +++ b/git-rebase--cherry.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 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/5] rebase: fix sequence continuation
Felipe Contreras felipe.contre...@gmail.com writes: We are not in am mode. That may make sense, but shouldn't this part be like so from the very beginning? In other words, this looks like an oops, 1/5 was buggy and this is a hotfix. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase--cherry.sh | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/git-rebase--cherry.sh b/git-rebase--cherry.sh index ab1f8b7..ca78b1b 100644 --- a/git-rebase--cherry.sh +++ b/git-rebase--cherry.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 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/5] rebase: fix sequence continuation
Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: We are not in am mode. That may make sense, but shouldn't this part be like so from the very beginning? In other words, this looks like an oops, 1/5 was buggy and this is a hotfix. How can 1/5 be introducing a bug? It's merely splitting the code without introducing *ANY* functional changes. The bug is already there in 'master'. -- Felipe Contreras -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
