summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2009-06-03 09:41:21 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2009-06-03 09:49:59 +0100
commitb345a8d0dbb893d16192603b9894c79adc275ab6 (patch)
tree1f8812e61e0a335d8caa49ab10996ad6cc09b8b7 /autogen.sh
parentdf851d54ef4abbc3b28f78ab06517746d337bc1f (diff)
Revert "only update submodule when it is not on a specific branch"
This reverts commit 93b83333aad519c5555156576f0baa3be7b263f3. Reverting since this fails on a fresh checkout. Also, we shouldn't depend on possibly translated strings.
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh15
1 files changed, 1 insertions, 14 deletions
diff --git a/autogen.sh b/autogen.sh
index 9287ea20a..feeaa3c8f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,20 +11,7 @@ then
echo "+ Setting up common submodule"
git submodule init
fi
-
-# 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
+git submodule update
# source helper functions
if test ! -f common/gst-autogen.sh;