diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-07-31 15:18:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-31 19:24:07 (GMT) |
| commit | f67336dabf8b77f1eee0341790c8fbbe5c6d81dd (patch) | |
| tree | d0273c98e93bf7389ee8846626d741835d780071 /t/t3427-rebase-subtree.sh | |
| parent | a9c71073dace0d1ddbd12291604d191064b1ae94 (diff) | |
| download | git-f67336dabf8b77f1eee0341790c8fbbe5c6d81dd.zip git-f67336dabf8b77f1eee0341790c8fbbe5c6d81dd.tar.gz git-f67336dabf8b77f1eee0341790c8fbbe5c6d81dd.tar.bz2 | |
t3427: accommodate for the `rebase --merge` backend having been replaced
Since 68aa495b590 (rebase: implement --merge via the interactive
machinery, 2018-12-11), the job of the old `--merge` backend is now
performed by the `--interactive` backend, too.
One consequence is that empty commits are no longer rebased by default.
Meaning that the test case that calls `git rebase -Xsubtree` (which used
to be handled by the `--merge` backend) now needs to ask explicitly for
the empty commit to be rebased.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3427-rebase-subtree.sh')
| -rwxr-xr-x | t/t3427-rebase-subtree.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh index 94cc532..a734716 100755 --- a/t/t3427-rebase-subtree.sh +++ b/t/t3427-rebase-subtree.sh @@ -83,10 +83,10 @@ test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges -- ' # FAILURE: fatal: Could not parse object -test_expect_failure 'Rebase -Xsubtree --onto commit' ' +test_expect_failure 'Rebase -Xsubtree --keep-empty --onto commit' ' reset_rebase && git checkout -b rebase-onto to-rebase && - git rebase -Xsubtree=files_subtree --onto files-master master && + git rebase -Xsubtree=files_subtree --keep-empty --onto files-master master && verbose test "$(commit_message HEAD~2)" = "master4" && verbose test "$(commit_message HEAD~)" = "files_subtree/master5" && verbose test "$(commit_message HEAD)" = "Empty commit" |