From 7ac3e0e0bf4e4626c8a30cd5f24d969f9a1460e7 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Sun, 24 Aug 2025 15:37:09 +0200
Subject: [PATCH] cli/command/formatter: ContainerContext.Image: use early
 returns

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 cli/command/formatter/container.go | 36 ++++++++++++++++--------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/cli/command/formatter/container.go b/cli/command/formatter/container.go
index 471ecf3888..361890030c 100644
--- a/cli/command/formatter/container.go
+++ b/cli/command/formatter/container.go
@@ -170,24 +170,26 @@ func (c *ContainerContext) Image() string {
 	if c.c.Image == "" {
 		return "<no image>"
 	}
-	if c.trunc {
-		if trunc := TruncateID(c.c.ImageID); trunc == TruncateID(c.c.Image) {
-			return trunc
-		}
-		// truncate digest if no-trunc option was not selected
-		ref, err := reference.ParseNormalizedNamed(c.c.Image)
-		if err == nil {
-			if nt, ok := ref.(reference.NamedTagged); ok {
-				// case for when a tag is provided
-				if namedTagged, err := reference.WithTag(reference.TrimNamed(nt), nt.Tag()); err == nil {
-					return reference.FamiliarString(namedTagged)
-				}
-			} else {
-				// case for when a tag is not provided
-				named := reference.TrimNamed(ref)
-				return reference.FamiliarString(named)
-			}
+	if !c.trunc {
+		return c.c.Image
+	}
+	if trunc := TruncateID(c.c.ImageID); trunc == TruncateID(c.c.Image) {
+		return trunc
+	}
+	ref, err := reference.ParseNormalizedNamed(c.c.Image)
+	if err != nil {
+		return c.c.Image
+	}
+
+	if nt, ok := ref.(reference.NamedTagged); ok {
+		// strip the digest, but preserve the tag
+		if namedTagged, err := reference.WithTag(reference.TrimNamed(nt), nt.Tag()); err == nil {
+			return reference.FamiliarString(namedTagged)
 		}
+	} else {
+		// case for when a tag is not provided
+		named := reference.TrimNamed(ref)
+		return reference.FamiliarString(named)
 	}
 
 	return c.c.Image