blob: 700a3f7d4732655be4962de8f8688d0e9d89037a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
#!/bin/bash
# Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
#
# Python X2go is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Python X2go is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
set -xe
CHECKOUT=${1:-master}
[ -d .git ] && {
TIMESTAMP=$(date +%s)
CURRENT_BRANCH=$(git branch | grep "*" | awk '{print $2}')
# switch to branch given as $CHECKOUT, if it does not exist locally, create it...
git checkout $CHECKOUT &>/dev/null || git checkout -b $CHECKOUT >/dev/null
# switch to a tmp branch...
git checkout -b tmp-$TIMESTAMP &>/dev/null
# pull $CHECKOUT from origin into the tmp branch
LANG=en_US.UTF-8 git pull origin $CHECKOUT 2>/dev/null | egrep "^Already up-to-date.$" &>/dev/null && {
# drop the tmp branch
git checkout $CURRENT_BRANCH &>/dev/null
git branch -D tmp-$TIMESTAMP >/dev/null
exit 1
} || {
# drop the tmp branch
git checkout $CURRENT_BRANCH &>/dev/null
git branch -D tmp-$TIMESTAMP >/dev/null
exit 0
}
} || exit 0
|
