summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Elfström <erik.elfstrom@gmail.com>2015-08-30 11:18:09 +0200
committerJunio C Hamano <gitster@pobox.com>2015-08-31 09:46:36 -0700
commit1733ed3d70f0a051b286eea9f7cac78977b40a0d (patch)
tree93d8703984cccd8b07e132c630f6ae2a728d97a0
parentae2f203ef7be7b33ff5ec61646c8662363eccd62 (diff)
downloadgit-ee/clean-test-fixes.tar.gz
t7300: fix broken && chainsee/clean-test-fixes
While we are here, remove some boilerplate by using test_commit. Signed-off-by: Erik Elfström <erik.elfstrom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t7300-clean.sh16
1 files changed, 4 insertions, 12 deletions
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index ccfb54de7a..954ec9c71e 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -404,9 +404,7 @@ test_expect_success 'nested git work tree' '
(
cd foo &&
git init &&
- >hello.world
- git add . &&
- git commit -a -m nested
+ test_commit nested hello.world
) &&
(
cd bar &&
@@ -415,9 +413,7 @@ test_expect_success 'nested git work tree' '
(
cd baz/boo &&
git init &&
- >deeper.world
- git add . &&
- git commit -a -m deeply.nested
+ test_commit deeply.nested deeper.world
) &&
git clean -f -d &&
test -f foo/.git/index &&
@@ -433,9 +429,7 @@ test_expect_success 'force removal of nested git work tree' '
(
cd foo &&
git init &&
- >hello.world
- git add . &&
- git commit -a -m nested
+ test_commit nested hello.world
) &&
(
cd bar &&
@@ -444,9 +438,7 @@ test_expect_success 'force removal of nested git work tree' '
(
cd baz/boo &&
git init &&
- >deeper.world
- git add . &&
- git commit -a -m deeply.nested
+ test_commit deeply.nested deeper.world
) &&
git clean -f -f -d &&
! test -d foo &&