Browse Source

Merge branch 'do/rebase-i-arbitrary'

* do/rebase-i-arbitrary:
  rebase--interactive: don't require what's rebased to be a branch

Conflicts:
	t/t3404-rebase-interactive.sh
maint
Junio C Hamano 15 years ago
parent
commit
df9930c129
  1. 2
      git-rebase--interactive.sh
  2. 9
      t/t3404-rebase-interactive.sh

2
git-rebase--interactive.sh

@ -823,8 +823,6 @@ first and then run 'git rebase --continue' again." @@ -823,8 +823,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

9
t/t3404-rebase-interactive.sh

@ -577,4 +577,13 @@ test_expect_success 'rebase -i can copy notes over a fixup' ' @@ -577,4 +577,13 @@ test_expect_success 'rebase -i can copy notes over a fixup' '
test_cmp expect output
'

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

Loading…
Cancel
Save