upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-05-28 04:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31119 from bpfoster/fix-subchart-value-removal
Some checks failed
build-test / build (push) Has been cancelled
Details
CodeQL / Analyze (push) Has been cancelled
Details
golangci-lint / golangci-lint (push) Has been cancelled
Details

Browse source 
fix: null merge
This commit is contained in:
Terry Howe 2025-12-13 08:48:29 -07:00 committed by GitHub
commit bfc4534772
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/chartutil/coalesce.go
View file

@ -283,6 +283,11 @@ func coalesceTablesFullKey(printf printFn, dst, src map[string]interface{}, pref
if dst == nil {
return src
}
for key, val := range dst {
if val == nil {
src[key] = nil
}
}
// Because dest has higher precedence than src, dest values override src
// values.
for key, val := range src {