From cc4a70c806a74b3bf4acfd2983a61b2ef74bd6f9 Mon Sep 17 00:00:00 2001
From: Brent Baude <bbaude@redhat.com>
Date: Tue, 1 Mar 2022 13:15:03 -0600
Subject: Revert "Option --url and --connection should imply --remote."

This reverts commit ca980c2e024bd33f4be3a33bb1dbb22c86bfe072.

Signed-off-by: Brent Baude <bbaude@redhat.com>
---
 cmd/podman/registry/remote.go    |  8 --------
 docs/source/markdown/podman.1.md |  2 --
 test/system/001-basic.bats       | 11 -----------
 3 files changed, 21 deletions(-)

diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go
index 181ef6b4a..f05d8f7b4 100644
--- a/cmd/podman/registry/remote.go
+++ b/cmd/podman/registry/remote.go
@@ -30,12 +30,6 @@ func IsRemote() bool {
 		fs.Usage = func() {}
 		fs.SetInterspersed(false)
 		fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", remote, "")
-		connectionFlagName := "connection"
-		ignoredConnection := ""
-		fs.StringVarP(&ignoredConnection, connectionFlagName, "c", "", "")
-		urlFlagName := "url"
-		ignoredURL := ""
-		fs.StringVar(&ignoredURL, urlFlagName, "", "")
 
 		// The shell completion logic will call a command called "__complete" or "__completeNoDesc"
 		// This command will always be the second argument
@@ -45,8 +39,6 @@ func IsRemote() bool {
 			start = 2
 		}
 		_ = fs.Parse(os.Args[start:])
-		// --connection or --url implies --remote
-		remoteFromCLI.Value = remoteFromCLI.Value || fs.Changed(connectionFlagName) || fs.Changed(urlFlagName)
 	})
 	return podmanOptions.EngineMode == entities.TunnelMode || remoteFromCLI.Value
 }
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md
index 4d3e92dd2..b318001e4 100644
--- a/docs/source/markdown/podman.1.md
+++ b/docs/source/markdown/podman.1.md
@@ -42,7 +42,6 @@ and "$graphroot/networks" as rootless.
 
 #### **--connection**, **-c**
 Connection to use for remote podman, including Mac and Windows (excluding WSL2) machines, (Default connection is configured in `containers.conf`)
-Setting this option will switch the **--remote** option to true.
 Remote connections use local containers.conf for default.
 
 #### **--conmon**
@@ -109,7 +108,6 @@ environment variable is set, the **--remote** option defaults to true.
 
 #### **--url**=*value*
 URL to access Podman service (default from `containers.conf`, rootless `unix://run/user/$UID/podman/podman.sock` or as root `unix://run/podman/podman.sock`).
-Setting this option will switch the **--remote** option to true.
 
  - `CONTAINER_HOST` is of the format `<schema>://[<user[:<password>]@]<host>[:<port>][<path>]`
 
diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats
index 582efa058..748377e4b 100644
--- a/test/system/001-basic.bats
+++ b/test/system/001-basic.bats
@@ -126,17 +126,6 @@ See 'podman version --help'" "podman version --remote"
     if grep -- " --remote " <<<"$output"; then
         die "podman --help, with CONTAINER_CONNECTION set, is showing --remote"
     fi
-
-    # When it detects --url or --connection, --remote is not an option
-    run_podman --url foobar --help
-    if grep -- " --remote " <<<"$output"; then
-        die "podman --help, with --url set, is showing --remote"
-    fi
-
-    run_podman --connection foobar --help
-    if grep -- " --remote " <<<"$output"; then
-        die "podman --help, with --connection set, is showing --remote"
-    fi
 }
 
 # Check that just calling "podman-remote" prints the usage message even
-- 
cgit v1.2.3-54-g00ecf