ryantm/nixpkgs-update
1
1
Fork 0
mirror of https://github.com/ryantm/nixpkgs-update.git synced 2024-12-17 08:21:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

move pruning to the correct spot

Browse Source
This commit is contained in:
Ryan Mulligan 2018-03-21 22:47:07 -07:00
parent af13129cdd
commit 4e6525addd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
up.sh
View File

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