t3600: stop losing return codes of git commands

When a command is in a non-assignment command substitution, the return
code will be lost in favour of the surrounding command's. As a result,
if a git command fails, we won't know about it. Rewrite instances of
this so that git commands are either run in an assignment-only command
substitution so that their return codes aren't lost.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index f6e659b7e97a529960c589d6c64080b68a145db4..0c3bf10eddf5e65c0eabdc2cf06d7ff69a65172c 100755 (executable)
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -304,7 +304,8 @@ EOF
 
 test_expect_success 'rm removes empty submodules from work tree' '
        mkdir submod &&
-       git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) submod &&
+       hash=$(git rev-parse HEAD) &&
+       git update-index --add --cacheinfo 160000 "$hash" submod &&
        git config -f .gitmodules submodule.sub.url ./. &&
        git config -f .gitmodules submodule.sub.path submod &&
        git submodule init &&
@@ -623,7 +624,8 @@ test_expect_success 'setup subsubmodule' '
        git submodule update &&
        (
                cd submod &&
-               git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod &&
+               hash=$(git rev-parse HEAD) &&
+               git update-index --add --cacheinfo 160000 "$hash" subsubmod &&
                git config -f .gitmodules submodule.sub.url ../. &&
                git config -f .gitmodules submodule.sub.path subsubmod &&
                git submodule init &&