undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t6422: drop commented out code

Browse Source 
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>
This commit is contained in:
Andrei Rybak 2023-01-12 00:32:41 +01:00 committed by Junio C Hamano
parent b3594800eb
commit 5da4597297
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t6422-merge-rename-corner-cases.sh
View File

@ -1159,7 +1159,6 @@ test_conflicts_with_adds_and_renames() {
# 4) There should not be any three~* files in the working # 4) There should not be any three~* files in the working
# tree # tree
test_setup_collision_conflict () { test_setup_collision_conflict () {
#test_expect_success "setup simple $sideL/$sideR conflict" '
git init simple_${sideL}_${sideR} && git init simple_${sideL}_${sideR} &&
( (
cd simple_${sideL}_${sideR} && cd simple_${sideL}_${sideR} &&
@ -1236,7 +1235,6 @@ test_conflicts_with_adds_and_renames() {
fi && fi &&
test_tick && git commit -m R test_tick && git commit -m R
) )
#'
} }
test_expect_success "check simple $sideL/$sideR conflict" ' test_expect_success "check simple $sideL/$sideR conflict" '