diff options
| author | Pedro Côrte-Real <pedro@pedrocr.net> | 2013-12-29 14:06:55 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2013-12-29 14:09:24 +0000 |
| commit | e5067fd9aa3b2d7c9682b608e2c658f159f1c9cc (patch) | |
| tree | 279134b98fda8a3c806c3978b8787103176bbb2f /scripts | |
| parent | c3181fa5df967cc67f3323b20c3cc2f71aff4b03 (diff) | |
scripts: git-update.sh: fix for non-master branches
Pull from tracking branch instead of origin/master, so
that this works with e.g. 1.2 as well.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/git-update.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/git-update.sh b/scripts/git-update.sh index fba0c6e9f..e9c7494e6 100755 --- 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 |