From 5d4fbcd313a7bd525722aa6a55c3610475636fa7 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 25 Jun 2015 13:46:06 +0100 Subject: fetch any new refs rather than pull This was causing issues on checkouts where a submodule was not pointing to a branch and it was trying to merge on the pull, we really only needed teh fetch anyway to get any new refs as the repos are checked out at a fixed hash. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6b4b5c8..648154b 100644 --- a/Makefile +++ b/Makefile @@ -139,14 +139,14 @@ clean: # check out last release tag on each submodule checkout-release: $(NSLIB_TARG) $(NETSURF_TARG) $(NSGENBIND_TARG) $(NSLIB_FB_TARG) $(NSLIB_SVGTINY_TARG) $(NSLIB_RO_TARG) - git pull --recurse-submodules + git fetch --recurse-submodules for x in $^; do cd $$x; (git checkout origin/HEAD && git checkout $$(git describe --abbrev=0 --match="release/*" )); cd ..; done # check out head on each submodule checkout-head: $(NSLIB_TARG) $(NETSURF_TARG) $(NSGENBIND_TARG) $(NSLIB_FB_TARG) $(NSLIB_SVGTINY_TARG) $(NSLIB_RO_TARG) git submodule init git submodule update - git pull --recurse-submodules + git fetch --recurse-submodules for x in $^; do cd $$x; git checkout origin/HEAD ; cd ..; done # Generate a dist tarball from the head of all submodules -- cgit v1.2.3