suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-06-28 07:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for https://github.com/mikefarah/yq/issues/2677

Browse Source 
Depends on https://github.com/yaml/go-yaml/pull/348
This commit is contained in:
William Floyd 2026-05-12 14:59:57 -07:00
parent 862d805c80
commit db1456532e
No known key found for this signature in database
GPG Key ID: B3EEEDD81893CAF9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/yqlib/candidate_node.go
View File

@ -46,7 +46,11 @@ const (
func createStringScalarNode(stringValue string) *CandidateNode {
var node = &CandidateNode{Kind: ScalarNode}
node.Value = stringValue
node.Tag = "!!str"
if stringValue == "<<" {
node.Tag = "!!merge"
} else {
node.Tag = "!!str"
}
return node
}

2
pkg/yqlib/operator_multiply.go
View File

@ -189,7 +189,7 @@ func mergeObjects(d *dataTreeNavigator, context Context, lhs *CandidateNode, rhs
log.Debugf("going to applied assignment to LHS: %v with RHS: %v", NodeToString(lhs), NodeToString(candidate))
if candidate.Tag == "!!merge" {
if candidate.Tag == "!!merge" && !candidate.IsMapKey {
continue
}