mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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
This commit is contained in:
commit
df9930c129
|
@ -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
|
||||
|
|
|
@ -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…
Reference in a new issue