diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-27 15:14:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-27 15:14:21 -0700 |
| commit | 3dcacd7797082cb8e6f3c10970e18dd843433e3a (patch) | |
| tree | 5dce98361218d7d04b7d3cced3170fb14e5cca63 /t | |
| parent | Merge branch 'cc/replace-graft' (diff) | |
| parent | rebase: omit patch-identical commits with --fork-point (diff) | |
| download | tgif-3dcacd7797082cb8e6f3c10970e18dd843433e3a.tar.xz | |
Merge branch 'jk/rebase-am-fork-point'
"git rebase --fork-point" did not filter out patch-identical
commits correctly.
* jk/rebase-am-fork-point:
rebase: omit patch-identical commits with --fork-point
rebase--am: use --cherry-pick instead of --ignore-if-in-upstream
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3400-rebase.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 80e0a951ea..47b5682662 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -169,6 +169,29 @@ test_expect_success 'default to common base in @{upstream}s reflog if no upstrea test_cmp expect actual ' +test_expect_success 'cherry-picked commits and fork-point work together' ' + git checkout default-base && + echo Amended >A && + git commit -a --no-edit --amend && + test_commit B B && + test_commit new_B B "New B" && + test_commit C C && + git checkout default && + git reset --hard default-base@{4} && + test_commit D D && + git cherry-pick -2 default-base^ && + test_commit final_B B "Final B" && + git rebase && + echo Amended >expect && + test_cmp A expect && + echo "Final B" >expect && + test_cmp B expect && + echo C >expect && + test_cmp C expect && + echo D >expect && + test_cmp D expect +' + test_expect_success 'rebase -q is quiet' ' git checkout -b quiet topic && git rebase -q master >output.out 2>&1 && |