From 024b7090acf00daca7565decc5af8af522232352 Mon Sep 17 00:00:00 2001 From: Rob Loranger Date: Tue, 10 Sep 2019 09:00:48 -0700 Subject: [PATCH] clean up CurrentUser global cfg logic --- config/user.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/user.go b/config/user.go index f39cb73..1a90c55 100644 --- a/config/user.go +++ b/config/user.go @@ -159,11 +159,10 @@ func CurrentUser(c *cli.Context) (string, error) { if err != nil { return "", err } - // only user global defaults when both are set and hosts match + // only use global defaults when both are set and no host flag if globalCFG.Default.User != "" && globalCFG.Default.Host != "" && - c.GlobalIsSet("host") && - globalCFG.Default.Host == c.GlobalString("host") { + !c.GlobalIsSet("host") { cfg = globalCFG } }