summaryrefslogtreecommitdiff
path: root/script/update/project/trees
diff options
context:
space:
mode:
Diffstat (limited to 'script/update/project/trees')
-rwxr-xr-xscript/update/project/trees10
1 files changed, 3 insertions, 7 deletions
diff --git a/script/update/project/trees b/script/update/project/trees
index 27418f19..af8e4ed0 100755
--- a/script/update/project/trees
+++ b/script/update/project/trees
@@ -143,13 +143,9 @@ prepare_new_tree()
cp -R "${project}/${project}" "${project}/${tree}" || \
err "${project}/${tree}: cannot copy source tree"
- (
- cd "${project}/${tree}" || err "cannot cd to ${project}/${tree}"
- git reset --hard ${rev} || \
- err "cannot reset ${project} revision for tree, ${tree}"
- git submodule update --init --checkout || \
- err "cannot update ${project} submodules for tree, ${tree}"
- )
+ git_reset_rev "${project}/${tree}" "${rev}" "err" || \
+ err "prepare_new_trees ${project}/${tree}: cannot reset <- ${rev}"
+
git_am_patches "${PWD}/${project}/${tree}" \
"${PWD}/${cfgsdir}/${tree}/patches" "err" || \
err "prepare_new_trees ${project}/${tree}: cannot apply patches"