From 6cb908bb823409661bfedab806da924d232bf200 Mon Sep 17 00:00:00 2001
From: Victor Vieux <victor.vieux@dotcloud.com>
Date: Tue, 13 Aug 2013 13:35:34 +0000
Subject: [PATCH 1/2] fix merge issue

---
 commands.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands.go b/commands.go
index 9b9dd51e7..d9d4f1b62 100644
--- a/commands.go
+++ b/commands.go
@@ -857,7 +857,7 @@ func (cli *DockerCli) CmdPush(args ...string) error {
 	}
 
 	if err := push(); err != nil {
-		if err == fmt.Errorf("Authentication is required.") {
+		if err.Error() == "Authentication is required." {
 			if err = cli.checkIfLogged("push"); err == nil {
 				return push()
 			}

From 2ba1300773857273585288c79aa65f011b045b4c Mon Sep 17 00:00:00 2001
From: Victor Vieux <victor.vieux@dotcloud.com>
Date: Tue, 13 Aug 2013 13:51:49 +0000
Subject: [PATCH 2/2] remove checkIfLogged

---
 commands.go | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/commands.go b/commands.go
index d9d4f1b62..8cefe3408 100644
--- a/commands.go
+++ b/commands.go
@@ -858,9 +858,11 @@ func (cli *DockerCli) CmdPush(args ...string) error {
 
 	if err := push(); err != nil {
 		if err.Error() == "Authentication is required." {
-			if err = cli.checkIfLogged("push"); err == nil {
-				return push()
+			fmt.Fprintln(cli.out, "\nPlease login prior to push:")
+			if err := cli.CmdLogin(""); err != nil {
+				return err
 			}
+			return push()
 		}
 		return err
 	}
@@ -1512,19 +1514,6 @@ func (cli *DockerCli) CmdCp(args ...string) error {
 	return nil
 }
 
-func (cli *DockerCli) checkIfLogged(action string) error {
-	// If condition AND the login failed
-	if cli.configFile.Configs[auth.IndexServerAddress()].Username == "" {
-		if err := cli.CmdLogin(""); err != nil {
-			return err
-		}
-		if cli.configFile.Configs[auth.IndexServerAddress()].Username == "" {
-			return fmt.Errorf("Please login prior to %s. ('docker login')", action)
-		}
-	}
-	return nil
-}
-
 func (cli *DockerCli) call(method, path string, data interface{}) ([]byte, int, error) {
 	var params io.Reader
 	if data != nil {