From ab72130650c7a43421f35b754d51632e3df70966 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon, 11 Jun 2018 15:51:38 -0400
Subject: Aliases do not work with IsSet

Have to specify all names.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #933
Approved by: baude
---
 cmd/podman/commit.go | 4 ++--
 cmd/podman/create.go | 2 +-
 cmd/podman/import.go | 2 +-
 cmd/podman/run.go    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/podman/commit.go b/cmd/podman/commit.go
index 90a003e8e..6da24fa92 100644
--- a/cmd/podman/commit.go
+++ b/cmd/podman/commit.go
@@ -79,7 +79,7 @@ func commitCmd(c *cli.Context) error {
 	switch c.String("format") {
 	case "oci":
 		mimeType = buildah.OCIv1ImageManifest
-		if c.IsSet("message") {
+		if c.IsSet("message") || c.IsSet("m") {
 			return errors.Errorf("messages are only compatible with the docker image format (-f docker)")
 		}
 	case "docker":
@@ -89,7 +89,7 @@ func commitCmd(c *cli.Context) error {
 	}
 	container := args[0]
 	reference := args[1]
-	if c.IsSet("change") {
+	if c.IsSet("change") || c.IsSet("c") {
 		for _, change := range c.StringSlice("change") {
 			splitChange := strings.Split(strings.ToUpper(change), "=")
 			if !util.StringInSlice(splitChange[0], libpod.ChangeCmds) {
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 35487a83a..8d66beab0 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -401,7 +401,7 @@ func parseCreateOpts(ctx context.Context, c *cli.Context, runtime *libpod.Runtim
 
 	// WORKING DIRECTORY
 	workDir := "/"
-	if c.IsSet("workdir") {
+	if c.IsSet("workdir") || c.IsSet("w") {
 		workDir = c.String("workdir")
 	} else if data.ContainerConfig.WorkingDir != "" {
 		workDir = data.ContainerConfig.WorkingDir
diff --git a/cmd/podman/import.go b/cmd/podman/import.go
index c2bcc8f5b..8a50d4fb9 100644
--- a/cmd/podman/import.go
+++ b/cmd/podman/import.go
@@ -80,7 +80,7 @@ func importCmd(c *cli.Context) error {
 	}
 
 	changes := v1.ImageConfig{}
-	if c.IsSet("change") {
+	if c.IsSet("change") || c.IsSet("c") {
 		changes, err = util.GetImageConfig(c.StringSlice("change"))
 		if err != nil {
 			return errors.Wrapf(err, "error adding config changes to image %q", source)
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index d6755df5e..3e7dc2303 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -173,7 +173,7 @@ func runCmd(c *cli.Context) error {
 	}
 
 	// If attach is set, clear stdin/stdout/stderr and only attach requested
-	if c.IsSet("attach") {
+	if c.IsSet("attach") || c.IsSet("a") {
 		outputStream = nil
 		errorStream = nil
 		inputStream = nil
-- 
cgit v1.2.3-54-g00ecf