mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

scripts: git-update.sh: fix for non-master branches

Browse source 
Pull from tracking branch instead of origin/master, so
that this works with e.g. 1.2 as well.
This commit is contained in:
Pedro Côrte-Real 2013-12-29 14:06:55 +00:00 committed by Tim-Philipp Müller
parent c3181fa5df
commit e5067fd9aa
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/git-update.sh
View file

@ -35,12 +35,12 @@ for m in $CORE $MODULES $EXTRA_MODULES; do
echo "+ updating $m" echo "+ updating $m"
cd $m cd $m
git pull origin master git pull
if test $? -ne 0 if test $? -ne 0
then then
echo "$m: update (trying stash, pull, stash apply)" >> $ERROR_LOG echo "$m: update (trying stash, pull, stash apply)" >> $ERROR_LOG
git stash git stash
git pull origin master git pull
if test $? -ne 0 if test $? -ne 0
then then
echo "$m: update" >> $ERROR_LOG echo "$m: update" >> $ERROR_LOG