Skip to content

Commit c168437

Browse files
authored
Make HELM_DIFF_THREE_WAY_MERGE log less verbose (#342)
Ref #341
1 parent 45df27a commit c168437

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

cmd/upgrade.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,12 @@ func newChartCommand() *cobra.Command {
124124
diff.useUpgradeDryRun = os.Getenv("HELM_DIFF_USE_UPGRADE_DRY_RUN") == "true"
125125

126126
if !diff.threeWayMerge && !cmd.Flags().Changed("three-way-merge") {
127-
println("reading three way merge from env")
128-
diff.threeWayMerge = os.Getenv("HELM_DIFF_THREE_WAY_MERGE") == "true"
127+
enabled := os.Getenv("HELM_DIFF_THREE_WAY_MERGE") == "true"
128+
diff.threeWayMerge = enabled
129+
130+
if enabled {
131+
fmt.Println("Enabled three way merge via the envvar")
132+
}
129133
}
130134

131135
if q, _ := cmd.Flags().GetBool("suppress-secrets"); q {

0 commit comments

Comments
 (0)