Skip to content

Commit 83d9092

Browse files
committed
Merge branch 'ee/clean-test-fixes'
* ee/clean-test-fixes: t7300: fix broken && chains
2 parents 699a0f3 + 1733ed3 commit 83d9092

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 &&
@@ -601,9 +597,7 @@ test_expect_success 'force removal of nested git work tree' '
601597
(
602598
cd foo &&
603599
git init &&
604-
>hello.world
605-
git add . &&
606-
git commit -a -m nested
600+
test_commit nested hello.world
607601
) &&
608602
(
609603
cd bar &&
@@ -612,9 +606,7 @@ test_expect_success 'force removal of nested git work tree' '
612606
(
613607
cd baz/boo &&
614608
git init &&
615-
>deeper.world
616-
git add . &&
617-
git commit -a -m deeply.nested
609+
test_commit deeply.nested deeper.world
618610
) &&
619611
git clean -f -f -d &&
620612
! test -d foo &&

0 commit comments

Comments
 (0)