Shell bug: avoid local=$(....) as it defeats set -e

[dgit.git] / tests / tests / inarchivecopy

diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy
index b1e0c5f26767a2fd211e32c1526145abd3fc69e7..3f848815d551d4fea97947e371356def45fb6663 100755 (executable)
--- a/tests/tests/inarchivecopy
+++ b/tests/tests/inarchivecopy
@@ -37,7 +37,7 @@ copy-check () {
         git merge --ff-only dgit/dgit/$tosuite
 
         copy-check-good
-        local fetched=$(t-sametree-parent HEAD)
+        local fetched; fetched=$(t-sametree-parent HEAD)
        cd ..
 
        rm -rf example.cloned
@@ -46,7 +46,7 @@ copy-check () {
        cd example.cloned
         t-refs-same-start
         copy-check-good
-        local cloned=$(t-sametree-parent HEAD)  
+        local cloned; cloned=$(t-sametree-parent HEAD)  
        cd ..
 
        rm -rf example.initd
@@ -57,7 +57,7 @@ copy-check () {
         t-dgit -p $p fetch $tosuite
         git reset --hard refs/remotes/dgit/dgit/$tosuite
         copy-check-good
-        local initd=$(t-sametree-parent HEAD)
+        local initd; initd=$(t-sametree-parent HEAD)
        cd ..
 
        t-refs-same-start