mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ph/rebase-original'

Browse Source 
* ph/rebase-original:
  rebase: find orig_head unambiguously
This commit is contained in:
Junio C Hamano
2013-04-26 15:28:34 -07:00
parent 019eb0dd35 ea70980030
commit d1ab71804f
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase.sh
View File

@ -473,7 +473,7 @@ case "$#" in
head_name="detached HEAD" head_name="detached HEAD"
branch_name=HEAD ;# detached branch_name=HEAD ;# detached
fi fi
orig_head=$(git rev-parse --verify "${branch_name}^0") || exit orig_head=$(git rev-parse --verify HEAD) || exit
;; ;;
*) *)
die "BUG: unexpected number of arguments left to parse" die "BUG: unexpected number of arguments left to parse"

7
t/t3400-rebase.sh
View File

@ -101,7 +101,14 @@ test_expect_success 'HEAD was detached during rebase' '
test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1}) test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
' '
test_expect_success 'rebase from ambiguous branch name' '
git checkout -b topic side &&
git rebase master
'
test_expect_success 'rebase after merge master' ' test_expect_success 'rebase after merge master' '
git checkout --detach refs/tags/topic &&
git branch -D topic &&
git reset --hard topic && git reset --hard topic &&
git merge master && git merge master &&
git rebase master && git rebase master &&