t3427: fix erroneous assumption
Apart from the `setup` test case, `t3427-rebase-subtree.sh` is made up exclusively of demonstrations of breakages. The tricky thing about such demonstrations is that they are often buggy themselves. In this instance, somewhere over the course of the six iterations of the patch that eventually made it into Git's `master` as 5f35900849e (contrib/subtree: Add a test for subtree rebase that loses commits, 2016-06-28), the commit message "files_subtree/master4" was changed to just "master4", but the test cases still expected the old commit message. Let's fix this, at long last. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jul 31, 2019 at 08:18 UTC
a9c71073dace0d1ddbd12291604d191064b1ae94
1 file changed
+3
-3
t/t3427-rebase-subtree.sh
+3
-3
@@ -68,7 +68,7 @@ test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit'
68
reset_rebase &&
69
git checkout -b rebase-preserve-merges to-rebase &&
70
git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
71
- verbose test "$(commit_message HEAD~)" = "files_subtree/master4" &&
71
+ verbose test "$(commit_message HEAD~)" = "master4" &&
72
verbose test "$(commit_message HEAD)" = "files_subtree/master5"
73
'
74
@@ -77,7 +77,7 @@ test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --
77
reset_rebase &&
78
git checkout -b rebase-keep-empty to-rebase &&
79
git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
80
- verbose test "$(commit_message HEAD~2)" = "files_subtree/master4" &&
80
+ verbose test "$(commit_message HEAD~2)" = "master4" &&
81
verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
82
verbose test "$(commit_message HEAD)" = "Empty commit"
83
'
@@ -87,7 +87,7 @@ test_expect_failure 'Rebase -Xsubtree --onto commit' '
87
reset_rebase &&
88
git checkout -b rebase-onto to-rebase &&
89
git rebase -Xsubtree=files_subtree --onto files-master master &&
90
- verbose test "$(commit_message HEAD~2)" = "files_subtree/master4" &&
90
+ verbose test "$(commit_message HEAD~2)" = "master4" &&
91
verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
92
verbose test "$(commit_message HEAD)" = "Empty commit"
93
'