Skip to content
Browse files
merge doesn't work when init
sadly the merge strategy doesn't work when doing an initial clone,
circumvent that
  • Loading branch information
azatoth committed Mar 18, 2011
1 parent e2dd891 commit 8a1156d
Showing 1 changed file with 9 additions and 1 deletion.
@@ -98,8 +98,16 @@ distclean: clean
@@rm -rf test/qunit src/sizzle

# 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
@@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; \

# update the submodules to the latest at the most logical branch

0 comments on commit 8a1156d

Please sign in to comment.