[pitivi] pitivi-git-environment: Fix the comment on how to run "master"
- From: Jean-François Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] pitivi-git-environment: Fix the comment on how to run "master"
- Date: Sat, 6 Dec 2014 01:19:01 +0000 (UTC)
commit bf7a2681fd85e4167deb56b38cecfc6f7a77419f
Author: Jean-François Fortin Tam <nekohayo gmail com>
Date: Fri Dec 5 19:08:21 2014 -0500
pitivi-git-environment: Fix the comment on how to run "master"
Also remove redundant code that was handled elsewhere
bin/pitivi-git-environment.sh | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/bin/pitivi-git-environment.sh b/bin/pitivi-git-environment.sh
index 830991a..fc51273 100755
--- a/bin/pitivi-git-environment.sh
+++ b/bin/pitivi-git-environment.sh
@@ -12,10 +12,11 @@
MYPITIVI=${MYPITIVI:-$HOME/pitivi-git}
-# Change this variable to 'master' if you prefer to work with the master branch.
-# When using "master", this script will automatically "pull --rebase" modules.
-# For now, we are using master until we depend on a released version.
-DEFAULT_GST_VERSION="1.4"
+# Change DEFAULT_GST_VERSION to a number greater than the last known release
+# if you prefer to work with the "master" branch of everything.
+# In that case, the script will automatically "pull --rebase" modules.
+DEFAULT_GST_VERSION="1.6"
+
GST_RELEASE_TAG=${GST_RELEASE_TAG:-$DEFAULT_GST_VERSION}
GST_MIN_VERSION=${GST_MIN_VERSION:-$DEFAULT_GST_VERSION}
@@ -414,13 +415,6 @@ if [ "$ready_to_run" != "1" ]; then
git checkout -- acinclude.m4
fi
- if [ $GST_RELEASE_TAG == "master" ]; then
- git pull --rebase
- if [ $? -ne 0 ]; then
- exit 1
- fi
- fi
-
if test ! -f ./configure || [ "$force_autogen" == "1" ]; then
# Allow passing per-module arguments when running autogen.
# For example, specify the following environment variable
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]