rebase -i: work on a detached HEAD
Earlier, rebase -i refused to rebase a detached HEAD. Now it no longer does. Incidentally, this fixes "git gc --auto" shadowing the true exit status. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Sep 25, 2007 at 16:43 UTC
73697a0b572f7f216d8355d83bf69e9b42e9a077
2 files changed
+23
-8
git-rebase--interactive.sh
+15
-8
@@ -317,17 +317,20 @@ do_next () {
317
else
318
NEWHEAD=$(git rev-parse HEAD)
319
fi &&
320
- message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
321
- git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
322
- git symbolic-ref HEAD $HEADNAME && {
320
+ case $HEADNAME in
321
+ refs/*)
322
+ message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
323
+ git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
324
+ git symbolic-ref HEAD $HEADNAME
325
+ ;;
326
+ esac && {
327
test ! -f "$DOTEST"/verbose ||
328
git diff --stat $(cat "$DOTEST"/head)..HEAD
329
} &&
330
rm -rf "$DOTEST" &&
331
+ git gc --auto &&
332
warn "Successfully rebased and updated $HEADNAME."
333
329
- git gc --auto
330
-
334
exit
335
}
336
@@ -367,7 +370,11 @@ do
370
371
HEADNAME=$(cat "$DOTEST"/head-name)
372
HEAD=$(cat "$DOTEST"/head)
370
- git symbolic-ref HEAD $HEADNAME &&
373
+ case $HEADNAME in
374
+ refs/*)
375
+ git symbolic-ref HEAD $HEADNAME
376
+ ;;
377
+ esac &&
378
output git reset --hard $HEAD &&
379
rm -rf "$DOTEST"
380
exit
@@ -445,8 +452,8 @@ do
452
test -z "$ONTO" && ONTO=$UPSTREAM
453
454
: > "$DOTEST"/interactive || die "Could not mark as interactive"
448
- git symbolic-ref HEAD > "$DOTEST"/head-name ||
449
- die "Could not get HEAD"
455
+ git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
456
+ echo "detached HEAD" > "$DOTEST"/head-name
457
458
echo $HEAD > "$DOTEST"/head
459
echo $UPSTREAM > "$DOTEST"/upstream
t/t3404-rebase-interactive.sh
+8
@@ -309,4 +309,12 @@ test_expect_success '--continue tries to commit, even for "edit"' '
309
test $parent = $(git rev-parse HEAD^)
310
'
311
312
+test_expect_success 'rebase a detached HEAD' '
313
+ grandparent=$(git rev-parse HEAD~2) &&
314
+ git checkout $(git rev-parse HEAD) &&
315
+ test_tick &&
316
+ FAKE_LINES="2 1" git rebase -i HEAD~2 &&
317
+ test $grandparent = $(git rev-parse HEAD~2)
318
+'
319
+
320
test_done