Fix git reset
This commit is contained in:
@@ -32,8 +32,13 @@ git reset --hard HEAD
|
|||||||
git fetch
|
git fetch
|
||||||
[ "$?" != "0" ] && die "Can't fetch current repository"
|
[ "$?" != "0" ] && die "Can't fetch current repository"
|
||||||
|
|
||||||
git pull --force "origin"
|
git pull --force "origin" &> /dev/null
|
||||||
[ "$?" != "0" ] && die "Can't pull current repository"
|
#[ "$?" != "0" ] && die "Can't pull current repository"
|
||||||
|
|
||||||
|
CUR_BRANCH=$( git rev-parse --abbrev-ref HEAD )
|
||||||
|
|
||||||
|
git reset --hard origin/$CUR_BRANCH
|
||||||
|
[ "$?" != "0" ] && die "Can't reset current repository"
|
||||||
|
|
||||||
rm -f feeds.conf
|
rm -f feeds.conf
|
||||||
cp -f feeds.conf.default feeds.conf
|
cp -f feeds.conf.default feeds.conf
|
||||||
|
|||||||
Reference in New Issue
Block a user