File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -305,12 +305,16 @@ define define_module =
305305 elif [ "$$$$(cat "$$@ " ) " != '$($1_repo ) |$($1_commit_hash ) ' ]; then \
306306 echo "Switching $1 to $($1_repo ) at $($1_commit_hash ) " && \
307307 git -C "$(build ) /$($1_base_dir ) " reset --hard HEAD^ && \
308- git -C "$(build ) /$($1_base_dir ) " remote set-url origin $($1_repo ) && \
309- git -C "$(build ) /$($1_base_dir ) " checkout origin > /dev/null 2>&1 && \
308+ echo "git fetch $($1_repo ) $($1_commit_hash ) --recurse-submodules=no" && \
309+ git -C "$(build ) /$($1_base_dir ) " fetch $($1_repo ) $($1_commit_hash ) --recurse-submodules=no && \
310+ echo "git reset --hard $($1_commit_hash ) " && \
310311 git -C "$(build ) /$($1_base_dir ) " reset --hard $($1_commit_hash ) && \
312+ echo "git clean" && \
311313 git -C "$(build ) /$($1_base_dir ) " clean -df && \
312314 git -C "$(build ) /$($1_base_dir ) " clean -dffx payloads util/cbmem && \
315+ echo "git submodule sync" && \
313316 git -C "$(build ) /$($1_base_dir ) " submodule sync && \
317+ echo "git submodule update" && \
314318 git -C "$(build ) /$($1_base_dir ) " submodule update --init --checkout && \
315319 echo -n '$($1_repo ) |$($1_commit_hash ) ' > "$$@ "; \
316320 fi
You can’t perform that action at this time.
0 commit comments