summaryrefslogtreecommitdiff
path: root/include/git.sh
diff options
context:
space:
mode:
Diffstat (limited to 'include/git.sh')
-rwxr-xr-xinclude/git.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/git.sh b/include/git.sh
index 476dd2b6..e2fd2129 100755
--- a/include/git.sh
+++ b/include/git.sh
@@ -118,8 +118,10 @@ fetch_submodule()
$err "! . $mcfgdir/module.cfg"
for xt in repo file; do
- eval "[ -n \"\$sub$xt\$sub${xt}_bkup\" ] && st=\"\$st \$xt\""
+ _seval="if [ -n \"\$sub$xt\" ] || [ -n \"\$sub${xt}_bkup\" ]"
+ eval "$_seval; then st=\"\$st \$xt\"; fi"
done
+
st="${st# }" && [ "$st" = "repo file" ] && $err "$mdir: repo+file"
[ -z "$st" ] && return 0 # subrepo/subfile not defined