Merge pull request #3376 from tomjonandy/fix/keychain-credentials

Fix issue where keychain github credentials wouldn't work

Author: MikeMcQuaid

Library/Homebrew/utils/github.rb

@@ -87,8 +87,8 @@ def api_credentials_from_keychain
   def api_credentials_type
     token, username = api_credentials
     return :none if !token || token.empty?
-    return :keychain if !username || username.empty?
-    :environment
+    return :environment if !username || username.empty?
+    :keychain
   end
 
   def api_credentials_error_message(response_headers, needed_scopes)