undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'do/rebase-i-arbitrary'

Browse Source 
* 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:
Junio C Hamano 2010-04-03 12:28:38 -07:00
commit df9930c129
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--interactive.sh
View File

@ -823,8 +823,6 @@ first and then run 'git rebase --continue' again."
if test ! -z "$1" if test ! -z "$1"
then then
output git show-ref --verify --quiet "refs/heads/$1" ||
die "Invalid branchname: $1"
output git checkout "$1" || output git checkout "$1" ||
die "Could not checkout $1" die "Could not checkout $1"
fi fi

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

@ -577,4 +577,13 @@ test_expect_success 'rebase -i can copy notes over a fixup' '
test_cmp expect output 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 test_done