diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-13 11:33:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-13 11:33:40 -0800 |
| commit | 5e72e7168c8eefa7bcb02b0499785db0578b549b (patch) | |
| tree | 50f59f9231f1cbacf281987a209ff45afdd05a05 /t | |
| parent | ca46578a1d6ee3f6e27eafa7902fd4e62d58db7d (diff) | |
| parent | bb3f45838b859c8b17a53a24579a304333868cc8 (diff) | |
| download | git-5e72e7168c8eefa7bcb02b0499785db0578b549b.tar.gz | |
Merge branch 'jk/pull-rebase-using-fork-point'
Finishing touches.
* jk/pull-rebase-using-fork-point:
rebase: fix fork-point with zero arguments
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3400-rebase.sh | 12 |
1 files changed, 10 insertions, 2 deletions
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 ' |