mirror of
https://github.com/mikefarah/yq.git
synced 2026-09-01 14:14:52 +08:00
enable more linters (#1043)
* enable revive linter * enable gochecknoinits linter * enable unconvert linter * enable unparam linter * enable asciicheck linter * enable depguard linter * enable nakedret linter * enable megacheck linter * enable nolintlint linter * enable predeclared linter * Update go.yml * Update go.yml
This commit is contained in:
@@ -109,12 +109,12 @@ func mergeObjects(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs
|
||||
TraversePreferences: traversePreferences{DontFollowAlias: true, IncludeMapKeys: true}}
|
||||
log.Debugf("merge - preferences.DeepMergeArrays %v", preferences.DeepMergeArrays)
|
||||
log.Debugf("merge - preferences.AppendArrays %v", preferences.AppendArrays)
|
||||
err := recursiveDecent(d, results, context.SingleChildContext(rhs), prefs)
|
||||
err := recursiveDecent(results, context.SingleChildContext(rhs), prefs)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var pathIndexToStartFrom int = 0
|
||||
var pathIndexToStartFrom int
|
||||
if results.Front() != nil {
|
||||
pathIndexToStartFrom = len(results.Front().Value.(*CandidateNode).Path)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user