diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-01-28 02:13:15 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-01-28 02:13:15 +0300 |
| commit | 0226a19a7159e00ca7983e530db3e19574904e24 (patch) | |
| tree | 6ede03af702108619314f52632fdfb7b1513e333 /scripts/include/common.sh | |
| parent | 20af205803e349a183dd57a6704db88c0e40c284 (diff) | |
| download | spm-0226a19a7159e00ca7983e530db3e19574904e24.tar.gz spm-0226a19a7159e00ca7983e530db3e19574904e24.tar.bz2 spm-0226a19a7159e00ca7983e530db3e19574904e24.tar.xz spm-0226a19a7159e00ca7983e530db3e19574904e24.zip | |
Fix updating git branches.
Diffstat (limited to 'scripts/include/common.sh')
| -rw-r--r-- | scripts/include/common.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/include/common.sh b/scripts/include/common.sh index d446c1e..eac8ab2 100644 --- a/scripts/include/common.sh +++ b/scripts/include/common.sh @@ -277,6 +277,11 @@ function package_update_source { if [ -d .git ]; then echo "git fetch origin" git fetch origin + check_error $? + run_switch_branch + echo "git pull --rebase" + git pull --rebase + check_error $? return fi if [ -d .hg ]; then |