From 81d073d5a193f2a07ca8efbb1a337a69c1c6d778 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 25 Sep 2023 12:17:02 +0100 Subject: 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 --- script/update/project/repo | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'script/update/project/repo') diff --git a/script/update/project/repo b/script/update/project/repo index d6eb3130..7e65ef29 100755 --- a/script/update/project/repo +++ b/script/update/project/repo @@ -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" -- cgit v1.2.1