Skip to content

Commit 578564e

Browse files
bpfosterscottrigby
authored andcommitted
fix null merge
(cherry-picked from commit c1175a4) Signed-off-by: Ben Foster <bpfoster@gmail.com> (cherry picked from commit f0b699e)
1 parent 7cfb6e4 commit 578564e

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

pkg/chartutil/coalesce.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,11 @@ func coalesceTablesFullKey(printf printFn, dst, src map[string]interface{}, pref
283283
if dst == nil {
284284
return src
285285
}
286+
for key, val := range dst {
287+
if val == nil {
288+
src[key] = nil
289+
}
290+
}
286291
// Because dest has higher precedence than src, dest values override src
287292
// values.
288293
for key, val := range src {

0 commit comments

Comments
 (0)