Reverse order of keydefpath checks (#17566)

If keydefpath is nothing, we can't call `isempty` on it, so we should check for that first. Fixes #17553
JuliaLang · Jul 22, 2016 · 3503a59 · 3503a59
1 parent 809138f
commit 3503a59
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/base/libgit2/callbacks.jl b/base/libgit2/callbacks.jl
@@ -114,7 +114,7 @@ function credentials_callback(cred::Ptr{Ptr{Void}}, url_ptr::Cstring,
             if keydefpath !== nothing && !isusedcreds
                 keydefpath # use cached value
             else
-                if isempty(keydefpath) || keydefpath === nothing
+                if keydefpath === nothing || isempty(keydefpath)
                     keydefpath = joinpath(homedir(),".ssh","id_rsa")
                 end
                 prompt("Private key location for '$schema$username@$host'", default=keydefpath)
@@ -130,7 +130,7 @@ function credentials_callback(cred::Ptr{Ptr{Void}}, url_ptr::Cstring,
             if keydefpath !== nothing && !isusedcreds
                 keydefpath # use cached value
             else
-                if isempty(keydefpath) || keydefpath === nothing
+                if keydefpath === nothing || isempty(keydefpath)
                     keydefpath = privatekey*".pub"
                 end
                 if isfile(keydefpath)