diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-10-20 08:03:45 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-10-20 08:45:57 +0100 |
| commit | 182ee8e4163b79984b6c775688f1b27e9a62d514 (patch) | |
| tree | 4cf8f6c60acd0ff1d3a5ba8caeed42d8cbfcf264 /include/git.sh | |
| parent | 54eb347a300c45f8c6c846ed96398c29a0db52a2 (diff) | |
update/trees: don't run make if mode=fetch
this fixes a regression caused by a previous revision
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/git.sh')
| -rwxr-xr-x | include/git.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/git.sh b/include/git.sh index 2976ff33..7f4b1f40 100755 --- a/include/git.sh +++ b/include/git.sh @@ -13,9 +13,11 @@ fetch_project_trees() [ -d "src/${project}/${project}" ] || fetch_from_upstream fetch_config [ -z "${rev}" ] && err "fetch_project_trees $target: undefined rev" - [ -d "src/${project}/${tree}" ] && \ + if [ -d "src/${project}/${tree}" ]; then printf "download/%s %s (%s): exists\n" \ - "${project}" "${tree}" "${_target}" 1>&2 && return 0 + "${project}" "${tree}" "${_target}" 1>&2 + return 0 + fi prepare_new_tree } @@ -60,9 +62,10 @@ prepare_new_tree() git_reset_rev "src/${project}/${tree}" "${rev}" ( x_ cd "src/${project}/${tree}" - [ ! -f ".gitmodules" ] || \ - git submodule update --init --checkout || \ - err "prepare_new_tree ${project}/${tree}: can't update git modules" + if [ -f ".gitmodules" ]; then + git submodule update --init --checkout || \ + err "prepare_new_tree ${project}/${tree}: !submodules" + fi ) git_am_patches "$PWD/src/$project/$tree" "$PWD/$cfgsdir/$tree/patches" } |