diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-06 19:49:23 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-06 19:49:23 +0000 |
commit | a5ab9e488522b8fb74a6eadc4a7acf9199e782c4 (patch) | |
tree | ef0fc5429cc771663f1066d30707b9943308c42d /tests/tests | |
parent | 20d3465b51a39337e1117868f80fbc074d3f6b85 (diff) |
Shell bug: avoid local=$(....) as it defeats set -e
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
-rwxr-xr-x | tests/tests/drs-push-masterupdate | 2 | ||||
-rwxr-xr-x | tests/tests/inarchivecopy | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/tests/drs-push-masterupdate b/tests/tests/drs-push-masterupdate index c8a5c5a..8457b59 100755 --- a/tests/tests/drs-push-masterupdate +++ b/tests/tests/drs-push-masterupdate @@ -30,7 +30,7 @@ push_and_check () { } t-check-master-undisturbed () { - local master=`t-git-get-ref refs/heads/master` + local master; master=`t-git-get-ref refs/heads/master` if [ x$master != x$oldmaster ]; then fail "bad update to master"; fi } diff --git a/tests/tests/inarchivecopy b/tests/tests/inarchivecopy index b1e0c5f..3f84881 100755 --- 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 |