From 548d1e20c11bef609045fef9e6a2c6cd9f634fc9 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 7 Jun 2024 12:58:28 +0100 Subject: [PATCH] git.sh: reduced indentation in fetch_submodule Signed-off-by: Leah Rowe --- include/git.sh | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/include/git.sh b/include/git.sh index 7f4af0c..17333a8 100755 --- a/include/git.sh +++ b/include/git.sh @@ -125,18 +125,17 @@ fetch_submodule() [ ! -f "$mcfgdir/module.cfg" ] || . "$mcfgdir/module.cfg" || \ $err "! . $mcfgdir/module.cfg" - if [ -n "$subrepo" ] || [ -n "$subrepo_bkup" ]; then - [ -n "$subrev" ] || $err "$1, $mdir: subrev not defined" + [ -n "$subrepo" ] || [ -n "$subrepo_bkup" ] || return 0 + [ -n "$subrev" ] || $err "$1, $mdir: subrev not defined" - rm -Rf "$tmpgit/$1" || $err "!rm '$mdir' '$1'" - for mod in "$subrepo" "$subrepo_bkup"; do - [ -z "$mod" ] && continue - git clone "$mod" "$tmpgit/$1" || rm -Rf "$tmpgit/$1" \ - || $err "!rm $mod $project $cfgdir $1" - [ -d "$tmpgit/$1" ] && break - done - [ -d "$tmpgit/$1" ] || $err "!clone $mod $project $mcfgdir $1" - fi + rm -Rf "$tmpgit/$1" || $err "!rm '$mdir' '$1'" + for mod in "$subrepo" "$subrepo_bkup"; do + [ -z "$mod" ] && continue + git clone "$mod" "$tmpgit/$1" || rm -Rf "$tmpgit/$1" \ + || $err "!rm $mod $project $cfgdir $1" + [ -d "$tmpgit/$1" ] && break + done + [ -d "$tmpgit/$1" ] || $err "!clone $mod $project $mcfgdir $1" } patch_submodule()