summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas (at) apestaart (dot) org>2009-06-03 01:01:57 +0200
committerThomas Vander Stichele <thomas (at) apestaart (dot) org>2009-06-03 01:02:43 +0200
commit93b83333aad519c5555156576f0baa3be7b263f3 (patch)
tree628351ba109f29d34b020ee046a223520f4aebb5
parent08fb55c2e1053e19a6c88e365e567d3352e92ee4 (diff)
only update submodule when it is not on a specific branch
-rwxr-xr-xautogen.sh15
1 files changed, 14 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh
index 266a80847..27a3ca2fa 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,7 +11,20 @@ then
echo "+ Setting up common submodule"
git submodule init
fi
-git submodule update
+
+# only update if the submodule is tracking master at some version,
+# which means there is no branch name
+cd common
+branch=`git branch | grep ^* | cut -c 3-`
+cd ..
+
+if test "x$branch" == "x(no branch)"
+then
+ echo "+ Updating common submodule"
+ git submodule update common
+else
+ echo "+ Not updating common submodule on branch $branch"
+fi
# source helper functions
if test ! -f common/gst-autogen.sh;