rebase: operate on a detached HEAD
The interactive version of rebase does all the operations on a detached HEAD, so that after a successful rebase, <branch>@{1} is the pre-rebase state. The reflogs of "HEAD" still show all the actions in detail. This teaches the non-interactive version to do the same. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Nov 8, 2007 at 18:19 UTC
6fd2f5e60d4d574ff9e5dd8ce1e229328c785d69
2 files changed
+57
-6
git-rebase.sh
+51
-5
@@ -87,7 +87,7 @@ call_merge () {
87
cmt="$(cat "$dotest/cmt.$1")"
88
echo "$cmt" > "$dotest/current"
89
hd=$(git rev-parse --verify HEAD)
90
- cmt_name=$(git symbolic-ref HEAD)
90
+ cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
91
msgnum=$(cat "$dotest/msgnum")
92
end=$(cat "$dotest/end")
93
eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
@@ -115,7 +115,24 @@ call_merge () {
115
esac
116
}
117
118
+move_to_original_branch () {
119
+ test -z "$head_name" &&
120
+ head_name="$(cat "$dotest"/head-name)" &&
121
+ onto="$(cat "$dotest"/onto)" &&
122
+ orig_head="$(cat "$dotest"/orig-head)"
123
+ case "$head_name" in
124
+ refs/*)
125
+ message="rebase finished: $head_name onto $onto"
126
+ git update-ref -m "$message" \
127
+ $head_name $(git rev-parse HEAD) $orig_head &&
128
+ git symbolic-ref HEAD $head_name ||
129
+ die "Could not move back to $head_name"
130
+ ;;
131
+ esac
132
+}
133
+
134
finish_rb_merge () {
135
+ move_to_original_branch
136
rm -r "$dotest"
137
echo "All done."
138
}
@@ -173,16 +190,23 @@ do
190
finish_rb_merge
191
exit
192
fi
176
- git am -3 --skip --resolvemsg="$RESOLVEMSG"
193
+ head_name=$(cat .dotest/head-name) &&
194
+ onto=$(cat .dotest/onto) &&
195
+ orig_head=$(cat .dotest/orig-head) &&
196
+ git am -3 --skip --resolvemsg="$RESOLVEMSG" &&
197
+ move_to_original_branch
198
exit
199
;;
200
--abort)
201
git rerere clear
202
if test -d "$dotest"
203
then
204
+ move_to_original_branch
205
rm -r "$dotest"
206
elif test -d .dotest
207
then
208
+ dotest=.dotest
209
+ move_to_original_branch
210
rm -r .dotest
211
else
212
die "No rebase in progress?"
@@ -318,6 +342,19 @@ then
342
GIT_PAGER='' git diff --stat --summary "$mb" "$onto"
343
fi
344
345
+# move to a detached HEAD
346
+orig_head=$(git rev-parse HEAD^0)
347
+head_name=$(git symbolic-ref HEAD 2> /dev/null)
348
+case "$head_name" in
349
+'')
350
+ head_name="detached HEAD"
351
+ ;;
352
+*)
353
+ git checkout "$orig_head" > /dev/null 2>&1 ||
354
+ die "could not detach HEAD"
355
+ ;;
356
+esac
357
+
358
# Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.
359
echo "First, rewinding head to replay your work on top of it..."
360
git-reset --hard "$onto"
@@ -327,14 +364,21 @@ git-reset --hard "$onto"
364
if test "$mb" = "$branch"
365
then
366
echo >&2 "Fast-forwarded $branch_name to $onto_name."
367
+ move_to_original_branch
368
exit 0
369
fi
370
371
if test -z "$do_merge"
372
then
373
git format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
336
- git am $git_am_opt --binary -3 -k --resolvemsg="$RESOLVEMSG"
337
- exit $?
374
+ git am $git_am_opt --binary -3 -k --resolvemsg="$RESOLVEMSG" &&
375
+ move_to_original_branch
376
+ ret=$?
377
+ test 0 != $ret -a -d .dotest &&
378
+ echo $head_name > .dotest/head-name &&
379
+ echo $onto > .dotest/onto &&
380
+ echo $orig_head > .dotest/orig-head
381
+ exit $ret
382
fi
383
384
# start doing a rebase with git-merge
@@ -343,8 +387,10 @@ fi
387
mkdir -p "$dotest"
388
echo "$onto" > "$dotest/onto"
389
echo "$onto_name" > "$dotest/onto_name"
346
-prev_head=`git rev-parse HEAD^0`
390
+prev_head=$orig_head
391
echo "$prev_head" > "$dotest/prev_head"
392
+echo "$orig_head" > "$dotest/orig-head"
393
+echo "$head_name" > "$dotest/head-name"
394
395
msgnum=0
396
for cmt in `git rev-list --reverse --no-merges "$upstream"..ORIG_HEAD`
t/t3402-rebase-merge.sh
+6
-1
@@ -48,9 +48,14 @@ test_expect_success 'reference merge' '
48
git merge -s recursive "reference merge" HEAD master
49
'
50
51
+PRE_REBASE=$(git rev-parse test-rebase)
52
test_expect_success rebase '
53
git checkout test-rebase &&
53
- git rebase --merge master
54
+ GIT_TRACE=1 git rebase --merge master
55
+'
56
+
57
+test_expect_success 'test-rebase@{1} is pre rebase' '
58
+ test $PRE_REBASE = $(git rev-parse test-rebase@{1})
59
'
60
61
test_expect_success 'merge and rebase should match' '