From: Carl Fürstenberg <azatoth@gmail.com>
Date: Thu, 17 Mar 2011 19:40:07 +0000 (+0100)
Subject: merge doesn't work when init
X-Git-Tag: 1.5.2rc1~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8a1156da9b835d826bfb4b82c41bcdd0d87aff05;p=jquery.git

merge doesn't work when init

sadly the merge strategy doesn't work when doing an initial clone,
circumvent that
---

diff --git a/Makefile b/Makefile
index 99e742d6c..2c7bb8085 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: