diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-06 14:45:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-06 14:45:44 -0700 |
| commit | 89d3eafe9019b407d6b2cf8913c6845bde50b178 (patch) | |
| tree | fcfdaf135f8c67c35f093048e6d6b35e4caa883a /t/t3402-rebase-merge.sh | |
| parent | 54b0ac57ab90c233a5a076904173c82e3d7db509 (diff) | |
| parent | 79f43447d2b542d1e521987287822ff376d43e93 (diff) | |
| download | git-89d3eafe9019b407d6b2cf8913c6845bde50b178.tar.gz git-89d3eafe9019b407d6b2cf8913c6845bde50b178.tar.xz | |
Merge branch 'bw/rebase-merge-entire-branch'
"git rebase -m" could be asked to rebase an entire branch starting
from the root, but failed by assuming that there always is a parent
commit to the first commit on the branch.
* bw/rebase-merge-entire-branch:
git-rebase--merge: don't include absent parent as a base
Diffstat (limited to 't/t3402-rebase-merge.sh')
| -rwxr-xr-x | t/t3402-rebase-merge.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh index 8f64505e4..488945e00 100755 --- a/t/t3402-rebase-merge.sh +++ b/t/t3402-rebase-merge.sh @@ -85,6 +85,15 @@ test_expect_success 'rebase -Xtheirs' ' ! grep 11 original ' +test_expect_success 'rebase -Xtheirs from orphan' ' + git checkout --orphan orphan-conflicting master~2 && + echo "AB $T" >> original && + git commit -morphan-conflicting original && + git rebase -Xtheirs master && + grep AB original && + ! grep 11 original +' + test_expect_success 'merge and rebase should match' ' git diff-tree -r test-rebase test-merge >difference && if test -s difference |