From 5cf9735a9dec42ceed7db04b551b5c2f8762f3db Mon Sep 17 00:00:00 2001
From: Bernd Gutjahr <bernd.gutjahr@microfocus.com>
Date: Thu, 24 Sep 2020 12:53:24 +0200
Subject: [PATCH] improved coalesce readability by getting rid of continue
 statements

Signed-off-by: Bernd Gutjahr <bernd.gutjahr@microfocus.com>
---
 pkg/chartutil/coalesce.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkg/chartutil/coalesce.go b/pkg/chartutil/coalesce.go
index 7b1ee1d80..b49a31b01 100644
--- a/pkg/chartutil/coalesce.go
+++ b/pkg/chartutil/coalesce.go
@@ -120,13 +120,11 @@ func coalesceGlobals(dest, src map[string]interface{}) {
 					// top-down.
 					CoalesceTables(vv, destvmap)
 					dg[key] = vv
-					continue
 				}
 			}
 		} else if dv, ok := dg[key]; ok && istable(dv) {
 			// It's not clear if this condition can actually ever trigger.
 			log.Printf("key %s is table. Skipping", key)
-			continue
 		} else {
 			// TODO: Do we need to do any additional checking on the value?
 			dg[key] = val
@@ -159,15 +157,15 @@ func coalesceValues(c *chart.Chart, v map[string]interface{}) {
 				src, ok := val.(map[string]interface{})
 				if !ok {
 					// If the original value is nil, there is nothing to coalesce, so we don't print
-					// the warning but simply continue
+					// the warning
 					if val != nil {
 						log.Printf("warning: skipped value for %s: Not a table.", key)
 					}
-					continue
+				} else {
+					// Because v has higher precedence than nv, dest values override src
+					// values.
+					CoalesceTables(dest, src)
 				}
-				// Because v has higher precedence than nv, dest values override src
-				// values.
-				CoalesceTables(dest, src)
 			}
 		} else {
 			// If the key is not in v, copy it from nv.