Skip to content

Commit 5da4597

Browse files
rybakgitster
authored andcommitted
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] da1e295 (t604[236]: do not run setup in separate tests, 2019-10-22) Signed-off-by: Andrei Rybak <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b359480 commit 5da4597

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

t/t6422-merge-rename-corner-cases.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,6 @@ test_conflicts_with_adds_and_renames() {
11591159
# 4) There should not be any three~* files in the working
11601160
# tree
11611161
test_setup_collision_conflict () {
1162-
#test_expect_success "setup simple $sideL/$sideR conflict" '
11631162
git init simple_${sideL}_${sideR} &&
11641163
(
11651164
cd simple_${sideL}_${sideR} &&
@@ -1236,7 +1235,6 @@ test_conflicts_with_adds_and_renames() {
12361235
fi &&
12371236
test_tick && git commit -m R
12381237
)
1239-
#'
12401238
}
12411239

12421240
test_expect_success "check simple $sideL/$sideR conflict" '

0 commit comments

Comments
 (0)