[PATCH v5 32/36] rebase: use 'cherrypick' mode instead of 'am'
Unless any specific 'git am' options are used.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/completion/git-prompt.sh | 2 ++
git-rebase.sh | 8 ++++----
t/t3407-rebase-abort.sh | 2 +-
t/t3420-rebase-autostash.sh | 2 +-
t/t5520-pull.sh | 2 +-
t/t9106-git-svn-commit-diff-clobber.sh | 2 +-
6 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 86a4f3f..3a14665 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -352,6 +352,8 @@ __git_ps1 ()
total=$(cat "$g/rebase-merge/end")
if [ -f "$g/rebase-merge/interactive" ]; then
r="|REBASE-i"
+ elif [ -f "$g/rebase-merge/cherrypick" ]; then
+ r="|REBASE"
else
r="|REBASE-m"
fi
diff --git a/git-rebase.sh b/git-rebase.sh
index 6be247d..f2efff9 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -416,13 +416,13 @@ elif test -n "$do_merge"
then
type=merge
state_dir="$merge_dir"
-elif test -n "$keep_empty"
+elif test -n "$git_am_opt"
then
- type=cherrypick
- state_dir="$merge_dir"
-else
type=am
state_dir="$apply_dir"
+else
+ type=cherrypick
+ state_dir="$merge_dir"
fi
if test -z "$rebase_root"
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh
index a6a6c40..2699b08 100755
--- a/t/t3407-rebase-abort.sh
+++ b/t/t3407-rebase-abort.sh
@@ -96,7 +96,7 @@ testrebase() {
'
}
-testrebase "" .git/rebase-apply
+testrebase "" .git/rebase-merge
testrebase " --merge" .git/rebase-merge
test_done
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 479cbb2..a5e69f3 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -141,7 +141,7 @@ testrebase() {
'
}
-testrebase "" .git/rebase-apply
+testrebase "" .git/rebase-merge
testrebase " --merge" .git/rebase-merge
testrebase " --interactive" .git/rebase-merge
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 6af6c63..ec2373b 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -244,7 +244,7 @@ test_expect_success 'setup for avoiding reapplying old patches' '
test_expect_success 'git pull --rebase does not reapply old patches' '
(cd dst &&
test_must_fail git pull --rebase &&
- test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
+ test 1 = $(cat .git/sequencer/todo | wc -l)
)
'
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh
index f6d7ac7..b9cec33 100755
--- a/t/t9106-git-svn-commit-diff-clobber.sh
+++ b/t/t9106-git-svn-commit-diff-clobber.sh
@@ -92,7 +92,7 @@ test_expect_success 'multiple dcommit from git svn will not clobber svn' "
test_expect_success 'check that rebase really failed' '
- test -d .git/rebase-apply
+ test -d .git/rebase-merge
'
test_expect_success 'resolve, continue the rebase and dcommit' "
--
1.8.3.698.g079b096
Felipe Contreras <felipe.contreras@gmail.com>