From ac294f3fde191f836bcd715bb58fa771c9840af2 Mon Sep 17 00:00:00 2001 From: Siguza Date: Sat, 31 Dec 2022 22:09:25 +0100 Subject: [PATCH] Old git bad --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d9a8616a..f2a629bf 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ endif # Submodules # NOTE: Do not use &> or <<< here. Systems with annoying default shells will throw a fit if you do. ifndef IGNORE_SUBMODULE_HEAD -UNSYNCED_SUBMODULES := $(shell git config --file .gitmodules --get-regexp path | awk '{ print $$2 }' | while read -r module; do commit="$$(git ls-tree --object-only HEAD "$$module")"; if [ -e "$$module/.git" ] && ! git --git-dir "$$module/.git" --work-tree "$$module" merge-base --is-ancestor "$$commit" HEAD; then printf '%s, ' "$$module"; fi; done | sed -E 's/, $$//') +UNSYNCED_SUBMODULES := $(shell git config --file .gitmodules --get-regexp path | awk '{ print $$2 }' | while read -r module; do commit="$$(git ls-tree HEAD "$$module" | awk '{ print $$3 }')"; if [ -e "$$module/.git" ] && ! git --git-dir "$$module/.git" --work-tree "$$module" merge-base --is-ancestor "$$commit" HEAD; then printf '%s, ' "$$module"; fi; done | sed -E 's/, $$//') ifneq ($(UNSYNCED_SUBMODULES),) $(error The following submodules are out of date: $(UNSYNCED_SUBMODULES). Either run "git submodule update" or set IGNORE_SUBMODULE_HEAD) endif