Skip to content

Commit fb8880d

Browse files
committed
Merge branch 'ee/clean-test-fixes' into maint
* ee/clean-test-fixes: t7300: fix broken && chains
2 parents 5af77d1 + 1733ed3 commit fb8880d

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

t/t7300-clean.sh

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,7 @@ test_expect_success 'nested git work tree' '
432432
(
433433
cd foo &&
434434
git init &&
435-
>hello.world
436-
git add . &&
437-
git commit -a -m nested
435+
test_commit nested hello.world
438436
) &&
439437
(
440438
cd bar &&
@@ -443,9 +441,7 @@ test_expect_success 'nested git work tree' '
443441
(
444442
cd baz/boo &&
445443
git init &&
446-
>deeper.world
447-
git add . &&
448-
git commit -a -m deeply.nested
444+
test_commit deeply.nested deeper.world
449445
) &&
450446
git clean -f -d &&
451447
test -f foo/.git/index &&
@@ -461,9 +457,7 @@ test_expect_success 'force removal of nested git work tree' '
461457
(
462458
cd foo &&
463459
git init &&
464-
>hello.world
465-
git add . &&
466-
git commit -a -m nested
460+
test_commit nested hello.world
467461
) &&
468462
(
469463
cd bar &&
@@ -472,9 +466,7 @@ test_expect_success 'force removal of nested git work tree' '
472466
(
473467
cd baz/boo &&
474468
git init &&
475-
>deeper.world
476-
git add . &&
477-
git commit -a -m deeply.nested
469+
test_commit deeply.nested deeper.world
478470
) &&
479471
git clean -f -f -d &&
480472
! test -d foo &&

0 commit comments

Comments
 (0)