Andrew's git / gitweb.git / diff
?
t7300: fix broken && chains
authorErik Elfström <erik.elfstrom@gmail.com>
Sun, 30 Aug 2015 09:18:09 +0000 (11:18 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2015 16:46:36 +0000 (09:46 -0700)
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>
t/t7300-clean.sh patch | blob | history
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index ccfb54de7ad9473221390d019b109bcb010a2c76..954ec9c71ea2e1d53fd6cf670870d8e5cacaf094 100755 (executable)
--- 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 &&
        (
                cd foo &&
                git init &&
-               >hello.world
-               git add . &&
-               git commit -a -m nested
+               test_commit nested hello.world
        ) &&
        (
                cd bar &&
        ) &&
        (
                cd bar &&
@@ -415,9 +413,7 @@ test_expect_success 'nested git work tree' '
        (
                cd baz/boo &&
                git init &&
        (
                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 &&
        ) &&
        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 &&
        (
                cd foo &&
                git init &&
-               >hello.world
-               git add . &&
-               git commit -a -m nested
+               test_commit nested hello.world
        ) &&
        (
                cd bar &&
        ) &&
        (
                cd bar &&
@@ -444,9 +438,7 @@ test_expect_success 'force removal of nested git work tree' '
        (
                cd baz/boo &&
                git init &&
        (
                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 &&
        ) &&
        git clean -f -f -d &&
        ! test -d foo &&