update/project/*: unified git reset handling

With this change, lbmk now also updates submodules on
simple git clones, not just multi-tree clones.

This is OK, because git does not return non-zero status
when git submodule update is ran, where git submodules
are not actually defined.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-09-25 12:17:02 +01:00
parent eae173ec13
commit 81d073d5a1
3 changed files with 19 additions and 12 deletions
+2 -5
View File
@@ -79,11 +79,8 @@ clone_project()
git clone ${url} "${tmp_dir}" || git clone ${bkup_url} "${tmp_dir}" || \
fail "clone_project: could not download ${name}"
(
cd "${tmp_dir}" || fail "clone_project: tmpdir not created"
git reset --hard ${revision} || \
fail "clone_project: Cannot reset revision"
)
git_reset_rev "${tmp_dir}" "${revision}" "fail" || \
fail "clone_project ${location}/: cannot reset <- ${revision}"
git_am_patches "${tmp_dir}" "${PWD}/config/${name}/patches" "fail" || \
fail "clone_project ${location}/: cannot apply patches"