kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Johannes Schindelin 2007-09-25 16:43:15 +01:00 committed by Junio C Hamano
parent 61ab92df40
commit 73697a0b57
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
git-rebase--interactive.sh
View File

@ -317,17 +317,20 @@ do_next () {
else else
NEWHEAD=$(git rev-parse HEAD) NEWHEAD=$(git rev-parse HEAD)
fi && fi &&
case $HEADNAME in
refs/*)
message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" && message="$GIT_REFLOG_ACTION: $HEADNAME onto $SHORTONTO)" &&
git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD && git update-ref -m "$message" $HEADNAME $NEWHEAD $OLDHEAD &&
git symbolic-ref HEAD $HEADNAME && { git symbolic-ref HEAD $HEADNAME
;;
esac && {
test ! -f "$DOTEST"/verbose || test ! -f "$DOTEST"/verbose ||
git diff --stat $(cat "$DOTEST"/head)..HEAD git diff --stat $(cat "$DOTEST"/head)..HEAD
} && } &&
rm -rf "$DOTEST" && rm -rf "$DOTEST" &&
git gc --auto &&
warn "Successfully rebased and updated $HEADNAME." warn "Successfully rebased and updated $HEADNAME."


git gc --auto

exit exit
} }


@ -367,7 +370,11 @@ do


HEADNAME=$(cat "$DOTEST"/head-name) HEADNAME=$(cat "$DOTEST"/head-name)
HEAD=$(cat "$DOTEST"/head) HEAD=$(cat "$DOTEST"/head)
git symbolic-ref HEAD $HEADNAME && case $HEADNAME in
refs/*)
git symbolic-ref HEAD $HEADNAME
;;
esac &&
output git reset --hard $HEAD && output git reset --hard $HEAD &&
rm -rf "$DOTEST" rm -rf "$DOTEST"
exit exit
@ -445,8 +452,8 @@ do
test -z "$ONTO" && ONTO=$UPSTREAM test -z "$ONTO" && ONTO=$UPSTREAM


: > "$DOTEST"/interactive || die "Could not mark as interactive" : > "$DOTEST"/interactive || die "Could not mark as interactive"
git symbolic-ref HEAD > "$DOTEST"/head-name || git symbolic-ref HEAD > "$DOTEST"/head-name 2> /dev/null ||
die "Could not get HEAD" echo "detached HEAD" > "$DOTEST"/head-name


echo $HEAD > "$DOTEST"/head echo $HEAD > "$DOTEST"/head
echo $UPSTREAM > "$DOTEST"/upstream echo $UPSTREAM > "$DOTEST"/upstream

8
t/t3404-rebase-interactive.sh
View File

@ -309,4 +309,12 @@ test_expect_success '--continue tries to commit, even for "edit"' '
test $parent = $(git rev-parse HEAD^) test $parent = $(git rev-parse HEAD^)
' '


test_expect_success 'rebase a detached HEAD' '
grandparent=$(git rev-parse HEAD~2) &&
git checkout $(git rev-parse HEAD) &&
test_tick &&
FAKE_LINES="2 1" git rebase -i HEAD~2 &&
test $grandparent = $(git rev-parse HEAD~2)
'

test_done test_done