From 93b83333aad519c5555156576f0baa3be7b263f3 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Wed, 3 Jun 2009 01:01:57 +0200 Subject: [PATCH] only update submodule when it is not on a specific branch --- autogen.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 266a808478..27a3ca2fa8 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;