t6422: drop commented out code
In commit [1] tests in t6422-merge-rename-corner-cases.sh were refactored to not run setup steps separately. This included replacing all tests like test_expect_success "setup ..." ' <code of setup> ' with corresponding Shell functions test_setup_... () { <code of setup> } During this replacement first and last lines of one of such tests got left commented out in code. Drop these lines to avoid confusion. [1] da1e295e00 (t604[236]: do not run setup in separate tests, 2019-10-22) Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andrei Rybak committed
Jan 12, 2023 at 00:32 UTC
5da4597297b2c59da816176590ab8a722b51af53
1 file changed
-2
t/t6422-merge-rename-corner-cases.sh
-2
@@ -1159,7 +1159,6 @@ test_conflicts_with_adds_and_renames() {
1159
# 4) There should not be any three~* files in the working
1160
# tree
1161
test_setup_collision_conflict () {
1162
- #test_expect_success "setup simple $sideL/$sideR conflict" '
1162
git init simple_${sideL}_${sideR} &&
1163
(
1164
cd simple_${sideL}_${sideR} &&
@@ -1236,7 +1235,6 @@ test_conflicts_with_adds_and_renames() {
1235
fi &&
1236
test_tick && git commit -m R
1237
)
1239
- #'
1238
}
1239
1240
test_expect_success "check simple $sideL/$sideR conflict" '