diff options
| -rwxr-xr-x | git-rebase.sh | 3 | ||||
| -rwxr-xr-x | t/t3400-rebase.sh | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 7185dc8438..8a3efa2983 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -534,7 +534,8 @@ esac if test "$fork_point" = t then - new_upstream=$(git merge-base --fork-point "$upstream_name" "$switch_to") + new_upstream=$(git merge-base --fork-point "$upstream_name" \ + "${switch_to:-HEAD}") if test -n "$new_upstream" then upstream=$new_upstream diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 998503db12..6d94b1fcd9 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -135,11 +135,19 @@ test_expect_success 'fail when upstream arg is missing and not configured' ' ' test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' ' + git checkout -b default-base master && git checkout -b default topic && git config branch.default.remote . && - git config branch.default.merge refs/heads/master && + git config branch.default.merge refs/heads/default-base && git rebase && - git rev-parse --verify master >expect && + git rev-parse --verify default-base >expect && + git rev-parse default~1 >actual && + test_cmp expect actual && + git checkout default-base && + git reset --hard HEAD^ && + git checkout default && + git rebase && + git rev-parse --verify default-base >expect && git rev-parse default~1 >actual && test_cmp expect actual ' |