Skip to content

Commit

Permalink
entry
Browse files Browse the repository at this point in the history
  • Loading branch information
hilmarf committed Jan 8, 2025
1 parent d4c58c4 commit 024070b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions api/ocm/valuemergehandler/handlers/simplelistmerge/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ outer:
return modified, nil
}

func equal(c *Config, le, te Entry) bool {
func equal(c *Config, le, entry Entry) bool {
if c == nil || len(c.IgnoredFields) == 0 {
return reflect.DeepEqual(le, te)
return reflect.DeepEqual(le, entry)
}

if lm, ok := le.(map[string]interface{}); ok {
if tm, ok := te.(map[string]interface{}); ok {
if tm, ok := entry.(map[string]interface{}); ok {
for _, n := range c.IgnoredFields {
delete(lm, n)
delete(tm, n)
}
return reflect.DeepEqual(lm, tm)
}
}
return reflect.DeepEqual(le, te)
return reflect.DeepEqual(le, entry)
}

0 comments on commit 024070b

Please sign in to comment.