rebase: fix "rebase --continue" breakage
The --skip case was handled properly when rebasing without --merge, but the --continue case was not. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Nov 12, 2007 at 13:11 UTC
3f735b66543a2221c218fc522272d62a333ebfec
2 files changed
+22
-1
git-rebase.sh
+5
-1
@@ -170,7 +170,11 @@ do
170
finish_rb_merge
171
exit
172
fi
173
- git am --resolved --3way --resolvemsg="$RESOLVEMSG"
173
+ head_name=$(cat .dotest/head-name) &&
174
+ onto=$(cat .dotest/onto) &&
175
+ orig_head=$(cat .dotest/orig-head) &&
176
+ git am --resolved --3way --resolvemsg="$RESOLVEMSG" &&
177
+ move_to_original_branch
178
exit
179
;;
180
--skip)
t/t3403-rebase-skip.sh
+17
@@ -39,6 +39,19 @@ test_expect_success 'rebase --skip with am -3' '
39
git reset --hard HEAD &&
40
git rebase --skip
41
'
42
+
43
+test_expect_success 'rebase moves back to skip-reference' '
44
+ test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
45
+ git branch post-rebase &&
46
+ git reset --hard pre-rebase &&
47
+ ! git rebase master &&
48
+ echo "hello" > hello &&
49
+ git add hello &&
50
+ git rebase --continue &&
51
+ test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
52
+ git reset --hard post-rebase
53
+'
54
+
55
test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
56
57
test_expect_failure 'rebase with --merge' 'git rebase --merge master'
@@ -51,6 +64,10 @@ test_expect_success 'rebase --skip with --merge' '
64
test_expect_success 'merge and reference trees equal' \
65
'test -z "`git diff-tree skip-merge skip-reference`"'
66
67
+test_expect_success 'moved back to branch correctly' '
68
+ test refs/heads/skip-merge = $(git symbolic-ref HEAD)
69
+'
70
+
71
test_debug 'gitk --all & sleep 1'
72
73
test_done