Skip to content

Commit fa25ef0

Browse files
committed
make: replace submodule update with reset
This is likely more common action. Also updating submodules usually involves updating our patches which can't be automated.
1 parent 7930789 commit fa25ef0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,6 @@ server: # Node http server npm i -g http-server
365365

366366

367367
SUBMODULES := brotli expat fontconfig freetype fribidi harfbuzz libass
368-
git-update: $(addprefix git-, $(SUBMODULES))
368+
git-smreset: $(addprefix git-, $(SUBMODULES))
369369

370-
$(foreach subm, $(SUBMODULES), $(eval $(call TR_GIT_SM_UPDATE,$(subm))))
370+
$(foreach subm, $(SUBMODULES), $(eval $(call TR_GIT_SM_RESET,$(subm))))

functions.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
## Clean and git related
1010

1111
# @arg1: submodule name
12-
define TR_GIT_SM_UPDATE
12+
define TR_GIT_SM_RESET
1313
git-$(1):
1414
cd lib/$(1) && \
1515
git reset --hard && \
16-
git clean -dfx && \
17-
git pull origin master
16+
git clean -dfx
17+
git submodule update --force lib/$(1)
1818
endef

0 commit comments

Comments
 (0)