move pruning to the correct spot

This commit is contained in:
Ryan Mulligan 2018-03-21 22:47:07 -07:00
parent af13129cdd
commit 4e6525addd

4
up.sh
View File

@ -64,13 +64,13 @@ case "$PACKAGE_NAME" in
*) true;;
esac || error_exit "Package on blacklist."
git fetch --prune --multiple upstream origin
if git branch --remote | grep "origin/auto-update/${PACKAGE_NAME}"
then
error_exit "Update branch already on origin."
fi
git fetch --prune --multiple upstream origin
git reset --hard
git checkout master
git reset --hard upstream/master