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

rebase -i: fix for optional [branch] parameter

Browse Source 
When calling "git rebase -i <upstream> <branch>", git should switch
to <branch> first.  This worked before, but I broke it by my
"Shut git rebase -i up" patch.

Fix that, and add a test to make sure that it does not break again.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Acked-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2007-08-01 23:31:03 +01:00 committed by Junio C Hamano
parent 434e6ef89d
commit c9e6589288
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--interactive.sh
View File

@ -405,6 +405,7 @@ do
require_clean_work_tree require_clean_work_tree
mkdir "$DOTEST" || die "Could not create temporary $DOTEST"
if test ! -z "$2" if test ! -z "$2"
then then
output git show-ref --verify --quiet "refs/heads/$2" || output git show-ref --verify --quiet "refs/heads/$2" ||
@ -418,7 +419,6 @@ do
test -z "$ONTO" && ONTO=$UPSTREAM test -z "$ONTO" && ONTO=$UPSTREAM
mkdir "$DOTEST" || die "Could not create temporary $DOTEST"
: > "$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 ||
die "Could not get HEAD" die "Could not get HEAD"

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

@ -98,6 +98,14 @@ test_expect_success 'no changes are a nop' '
test $(git rev-parse I) = $(git rev-parse HEAD) test $(git rev-parse I) = $(git rev-parse HEAD)
' '
test_expect_success 'test the [branch] option' '
git checkout -b dead-end &&
git rm file6 &&
git commit -m "stop here" &&
git rebase -i F branch2 &&
test $(git rev-parse I) = $(git rev-parse HEAD)
'
test_expect_success 'rebase on top of a non-conflicting commit' ' test_expect_success 'rebase on top of a non-conflicting commit' '
git checkout branch1 && git checkout branch1 &&
git tag original-branch1 && git tag original-branch1 &&