diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2015-06-25 13:46:06 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-06-25 13:46:06 +0100 |
| commit | 5d4fbcd313a7bd525722aa6a55c3610475636fa7 (patch) | |
| tree | 99a245863e754b7c2bad906dbeda929bc2d8f3a9 | |
| parent | 187794acca5110783538f6cdc16a2dc80301badd (diff) | |
| download | netsurf-all-5d4fbcd313a7bd525722aa6a55c3610475636fa7.tar.gz netsurf-all-5d4fbcd313a7bd525722aa6a55c3610475636fa7.tar.bz2 | |
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.
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |