[gst-cvs] gstreamer: Revert " only update submodule when it is not on a specific branch"
Tim Mueller
tpm at kemper.freedesktop.org
Wed Jun 3 01:51:34 PDT 2009
Module: gstreamer
Branch: master
Commit: b345a8d0dbb893d16192603b9894c79adc275ab6
URL: http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=b345a8d0dbb893d16192603b9894c79adc275ab6
Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date: Wed Jun 3 09:41:21 2009 +0100
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.
---
autogen.sh | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 9287ea2..feeaa3c 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;
More information about the Gstreamer-commits
mailing list