diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-29 11:31:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 11:31:39 -0400 |
| commit | 59e6192eb6027ebf520a4b5ea4137d0a85f23c02 (patch) | |
| tree | d4641b6c3f7d6a1c7d4fa64df3994578ca0630be /cmd/podman/diff.go | |
| parent | 6ac009d5304127f6758be157c7302646e5a481e5 (diff) | |
| parent | 6fb5f01c736d5cbf11bc7eaad09f6f0c7fd1d0d4 (diff) | |
| download | podman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.tar.gz podman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.tar.bz2 podman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.zip | |
Merge pull request #6716 from jwhonce/issues/6598
Fixes --remote flag issues
Diffstat (limited to 'cmd/podman/diff.go')
| -rw-r--r-- | cmd/podman/diff.go | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go index d635ea57a..eaf6abf02 100644 --- a/cmd/podman/diff.go +++ b/cmd/podman/diff.go @@ -17,12 +17,11 @@ var ( // Command: podman _diff_ Object_ID diffDescription = `Displays changes on a container or image's filesystem. The container or image will be compared to its parent layer.` diffCmd = &cobra.Command{ - Use: "diff [flags] {CONTAINER_ID | IMAGE_ID}", - Args: validate.IDOrLatestArgs, - Short: "Display the changes of object's file system", - Long: diffDescription, - TraverseChildren: true, - RunE: diff, + Use: "diff [flags] {CONTAINER_ID | IMAGE_ID}", + Args: validate.IDOrLatestArgs, + Short: "Display the changes to the object's file system", + Long: diffDescription, + RunE: diff, Example: `podman diff imageID podman diff ctrID podman diff --format json redis:alpine`, @@ -40,10 +39,7 @@ func init() { flags.BoolVar(&diffOpts.Archive, "archive", true, "Save the diff as a tar archive") _ = flags.MarkHidden("archive") flags.StringVar(&diffOpts.Format, "format", "", "Change the output format") - - if !registry.IsRemote() { - flags.BoolVarP(&diffOpts.Latest, "latest", "l", false, "Act on the latest container podman is aware of") - } + validate.AddLatestFlag(diffCmd, &diffOpts.Latest) } func diff(cmd *cobra.Command, args []string) error { |