diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-27 14:58:08 -0800 |
| commit | 2b0a564e02528e006d23e3318d0d2869fb239425 (patch) | |
| tree | 76f46ae7b059ac9ca0e8b725fa67f89a3c078f16 /t | |
| parent | e9ecee0423f2b24eb4e51d337044721c761cb4c3 (diff) | |
| parent | ad8261d21221d27638c75f47b39892db6f7972f6 (diff) | |
| download | git-2b0a564e02528e006d23e3318d0d2869fb239425.tar.gz git-2b0a564e02528e006d23e3318d0d2869fb239425.tar.xz | |
Merge branch 'jk/pull-rebase-using-fork-point'
* jk/pull-rebase-using-fork-point:
rebase: use reflog to find common base with upstream
pull: use merge-base --fork-point when appropriate
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3400-rebase.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index ebf93b069..998503db1 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -134,12 +134,14 @@ test_expect_success 'fail when upstream arg is missing and not configured' ' test_must_fail git rebase ' -test_expect_success 'default to @{upstream} when upstream arg is missing' ' +test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' ' git checkout -b default topic && git config branch.default.remote . && git config branch.default.merge refs/heads/master && git rebase && - test "$(git rev-parse default~1)" = "$(git rev-parse master)" + git rev-parse --verify master >expect && + git rev-parse default~1 >actual && + test_cmp expect actual ' test_expect_success 'rebase -q is quiet' ' |