suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2025-01-23 14:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge now copies anchor names

Browse Source
This commit is contained in:
Mike Farah 2021-01-13 09:21:16 +11:00
parent 7518dac99c
commit 55712afea6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/yqlib/candidate_node.go
View File

@ -61,6 +61,7 @@ func (n *CandidateNode) UpdateFrom(other *CandidateNode) {
n.Node.Content = other.Node.Content n.Node.Content = other.Node.Content
n.Node.Value = other.Node.Value n.Node.Value = other.Node.Value
n.Node.Alias = other.Node.Alias n.Node.Alias = other.Node.Alias
n.Node.Anchor = other.Node.Anchor
} }
func (n *CandidateNode) UpdateAttributesFrom(other *CandidateNode) { func (n *CandidateNode) UpdateAttributesFrom(other *CandidateNode) {

4
pkg/yqlib/doc/Multiply.md
View File

@ -180,7 +180,7 @@ g: thongs
f: *cat f: *cat
``` ```
## Merge does not copy anchor names ## Merge copies anchor names
Given a sample.yml file of: Given a sample.yml file of:
```yaml ```yaml
a: a:
@ -197,7 +197,7 @@ yq eval '.c * .a' sample.yml
will output will output
```yaml ```yaml
g: thongs g: thongs
c: frog c: &cat frog
``` ```
## Merge with merge anchors ## Merge with merge anchors

4
pkg/yqlib/operator_multiply_test.go
View File

@ -132,11 +132,11 @@ b:
}, },
}, },
{ {
description: "Merge does not copy anchor names", description: "Merge copies anchor names",
document: `{a: {c: &cat frog}, b: {f: *cat}, c: {g: thongs}}`, document: `{a: {c: &cat frog}, b: {f: *cat}, c: {g: thongs}}`,
expression: `.c * .a`, expression: `.c * .a`,
expected: []string{ expected: []string{
"D0, P[c], (!!map)::{g: thongs, c: frog}\n", "D0, P[c], (!!map)::{g: thongs, c: &cat frog}\n",
}, },
}, },
{ {