projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c3181fa
)
scripts: git-update.sh: fix for non-master branches
author
Pedro Côrte-Real
<pedro@pedrocr.net>
Sun, 29 Dec 2013 14:06:55 +0000
(14:06 +0000)
committer
Tim-Philipp Müller
<tim@centricular.com>
Sun, 29 Dec 2013 14:09:24 +0000
(14:09 +0000)
Pull from tracking branch instead of origin/master, so
that this works with e.g. 1.2 as well.
scripts/git-update.sh
patch
|
blob
|
history
diff --git
a/scripts/git-update.sh
b/scripts/git-update.sh
index
fba0c6e
..
e9c7494
100755
(executable)
--- a/
scripts/git-update.sh
+++ b/
scripts/git-update.sh
@@
-35,12
+35,12
@@
for m in $CORE $MODULES $EXTRA_MODULES; do
echo "+ updating $m"
cd $m
- git pull
origin master
+ git pull
if test $? -ne 0
then
echo "$m: update (trying stash, pull, stash apply)" >> $ERROR_LOG
git stash
- git pull
origin master
+ git pull
if test $? -ne 0
then
echo "$m: update" >> $ERROR_LOG