deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge doesn't work when init

Browse source 
sadly the merge strategy doesn't work when doing an initial clone,
circumvent that
This commit is contained in:
Carl Fürstenberg 2011-03-17 20:40:07 +01:00
parent e2dd8916ee
commit 8a1156da9b
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -98,8 +98,16 @@ distclean: clean
@@rm -rf test/qunit src/sizzle @@rm -rf test/qunit src/sizzle
# change pointers for submodules and update them to what is specified in jQuery # change pointers for submodules and update them to what is specified in jQuery
# --merge doesn't work when doing an initial clone, thus test if we have non-existing
# submodules, then do an real update
update_submodules: update_submodules:
@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi @@if [ -d .git ]; then \
if git submodule status | grep -q -E '^-'; then \
git submodule update --init --recursive; \
else \
git submodule update --init --recursive --merge; \
fi; \
fi;
# update the submodules to the latest at the most logical branch # update the submodules to the latest at the most logical branch
pull_submodules: pull_submodules: