@matheusbsbs / matheus-bagliano / commits / ea70980030

rebase: find orig_head unambiguously

When we 'git rebase $upstream', git uses 'rev-parse --verify $current_branch' to find ORIG_HEAD. But if $current_branch is ambiguous, 'rev-parse --verify' emits a warning and returns a SHA1 anyway. When the wrong ambiguous choice is used, git-rebase fails non-gracefully: it emits a warning about failing to lock $current_branch, an error about being unable to checkout $current_branch again, and it might even decide the rebase is a fast-forward when it is not. In the 'rebase $upstream' case, we already know the unambiguous spelling of $current_branch is "HEAD". Fix git-rebase to find $orig_head unambiguously. Add a test in t3400-rebase.sh which creates an ambiguous branch name and rebases it implicitly with 'git rebase $other'. Signed-off-by: Phil Hord <hordp@cisco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Phil Hord committed Apr 23, 2013 at 18:51 UTC ea709800302ecae8c2fbb03af01e36b7f9b4d042

2 files changed +8 -1

git-rebase.sh

+1 -1

@@ -464,7 +464,7 @@ case "$#" in

464 head_name="detached HEAD"

465 branch_name=HEAD ;# detached

466 fi

467 - orig_head=$(git rev-parse --verify "${branch_name}^0") || exit

467 + orig_head=$(git rev-parse --verify HEAD) || exit

468 ;;

469 *)

470 die "BUG: unexpected number of arguments left to parse"

t/t3400-rebase.sh

@@ -101,7 +101,14 @@ test_expect_success 'HEAD was detached during rebase' '

101 test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})

102 '

103

104 +test_expect_success 'rebase from ambiguous branch name' '

105 + git checkout -b topic side &&

106 + git rebase master

107 +'

108 +

109 test_expect_success 'rebase after merge master' '

110 + git checkout --detach refs/tags/topic &&

111 + git branch -D topic &&

112 git reset --hard topic &&

113 git merge master &&

114 git rebase master &&