X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=Makefile;h=2c7bb8085ae9405007d3f950c4cacc13ef08362b;hb=1912ded3ee0065a71ee0d16c1e5aaba0daef82a0;hp=99e742d6c3e8856f0bc253d696132e91adddacfa;hpb=e2dd8916eef1daba1a56a5ff1fbb44cb3385f4f0;p=jquery.git

diff --git a/Makefile b/Makefile
index 99e742d..2c7bb80 100644
--- a/Makefile
+++ b/Makefile
@@ -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
 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
 pull_submodules: