Logic is hard is hard

This commit is contained in:
Alex Malinovich 2016-11-29 19:35:56 -08:00
commit e71570687f

View file

@ -327,7 +327,7 @@ if [ "${AUTOUPDATE}" = "yes" ]; then
exit 1 exit 1
fi fi
if git fetch --quiet && git diff --quiet FETCH_HEAD; then if git fetch --quiet && ! git diff --quiet FETCH_HEAD; then
info "Auto-updating..." info "Auto-updating..."
if ! git merge --quiet FETCH_HEAD; then if ! git merge --quiet FETCH_HEAD; then
error 'Unable to update git, try running "git pull" manually to see what is wrong' error 'Unable to update git, try running "git pull" manually to see what is wrong'