File tree 1 file changed +6
-2
lines changed
1 file changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -303,12 +303,16 @@ define define_module =
303
303
elif [ "$$$$(cat "$$@ " ) " != '$($1_repo ) |$($1_commit_hash ) ' ]; then \
304
304
echo "Switching $1 to $($1_repo ) at $($1_commit_hash ) " && \
305
305
git -C "$(build ) /$($1_base_dir ) " reset --hard HEAD^ && \
306
- git -C "$(build ) /$($1_base_dir ) " remote set-url origin $($1_repo ) && \
307
- git -C "$(build ) /$($1_base_dir ) " checkout origin > /dev/null 2>&1 && \
306
+ echo "git fetch $($1_repo ) $($1_commit_hash ) --recurse-submodules=no" && \
307
+ git -C "$(build ) /$($1_base_dir ) " fetch $($1_repo ) $($1_commit_hash ) --recurse-submodules=no && \
308
+ echo "git reset --hard $($1_commit_hash ) " && \
308
309
git -C "$(build ) /$($1_base_dir ) " reset --hard $($1_commit_hash ) && \
310
+ echo "git clean" && \
309
311
git -C "$(build ) /$($1_base_dir ) " clean -df && \
310
312
git -C "$(build ) /$($1_base_dir ) " clean -dffx payloads util/cbmem && \
313
+ echo "git submodule sync" && \
311
314
git -C "$(build ) /$($1_base_dir ) " submodule sync && \
315
+ echo "git submodule update" && \
312
316
git -C "$(build ) /$($1_base_dir ) " submodule update --init --checkout && \
313
317
echo -n '$($1_repo ) |$($1_commit_hash ) ' > "$$@ "; \
314
318
fi
You can’t perform that action at this time.
0 commit comments