From 04748a77664c89340b789ef0a25d65b78477dce0 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Wed, 15 May 2013 15:51:04 -0400
Subject: [PATCH] Fix logic flaw in builder.mergeConfig

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

diff --git a/builder.go b/builder.go
index 5c51d62b9e..85447b5131 100644
--- a/builder.go
+++ b/builder.go
@@ -45,7 +45,7 @@ func (builder *Builder) mergeConfig(userConf, imageConf *Config) {
 		userConf.PortSpecs = imageConf.PortSpecs
 	}
 	if !userConf.Tty {
-		userConf.Tty = userConf.Tty
+		userConf.Tty = imageConf.Tty
 	}
 	if !userConf.OpenStdin {
 		userConf.OpenStdin = imageConf.OpenStdin