From 2ec33cdd19bd80308fcef45828e37e79c4b56dc5 Mon Sep 17 00:00:00 2001 From: Dave Olszewski Date: Sun, 14 Mar 2010 21:48:22 -0700 Subject: rebase--interactive: don't require what's rebased to be a branch git rebase allows you to specify a non-branch commit-ish as the "branch" argument, which leaves HEAD detached when it's finished. This is occasionally useful, and this patch brings the same functionality to git rebase --interactive. Signed-off-by: Dave Olszewski Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 2 -- t/t3404-rebase-interactive.sh | 9 +++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 3e4fd1456f..d047dcb3e4 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -783,8 +783,6 @@ first and then run 'git rebase --continue' again." if test ! -z "$1" then - output git show-ref --verify --quiet "refs/heads/$1" || - die "Invalid branchname: $1" output git checkout "$1" || die "Could not checkout $1" fi diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 4e3513709e..05708c2462 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -553,4 +553,13 @@ test_expect_success 'reword' ' git show HEAD~2 | grep "C changed" ' +test_expect_success 'rebase while detaching HEAD' ' + git symbolic-ref HEAD && + grandparent=$(git rev-parse HEAD~2) && + test_tick && + FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0 && + test $grandparent = $(git rev-parse HEAD~2) && + test_must_fail git symbolic-ref HEAD +' + test_done -- cgit v1.2.1