taigrr/yq
1
0
Fork 0
mirror of https://github.com/taigrr/yq synced 2025-01-18 04:53:17 -08:00
Code Issues Projects Releases Wiki Activity

Merge master fix

Browse Source
This commit is contained in:
Mike Farah 2020-09-13 10:59:40 +10:00
parent 3355e80d85
commit a8cfccd3af
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/utils.go
View File

@ -512,7 +512,7 @@ func readUpdateCommands(args []string, expectedArgs int, badArgsMessage string,
log.Debug("path %v", args[expectedArgs-2]) log.Debug("path %v", args[expectedArgs-2])
log.Debug("Value %v", args[expectedArgs-1]) log.Debug("Value %v", args[expectedArgs-1])
value := valueParser.Parse(args[expectedArgs-1], customTag, customStyle, anchorName, makeAlias) value := valueParser.Parse(args[expectedArgs-1], customTag, customStyle, anchorName, makeAlias)
updateCommands[0] = yqlib.UpdateCommand{Command: "update", Path: args[expectedArgs-2], Value: value, Overwrite: true, DontUpdateComments: true} updateCommands[0] = yqlib.UpdateCommand{Command: "update", Path: args[expectedArgs-2], Value: value, Overwrite: true, CommentsMergeStrategy: yqlib.IgnoreCommentsMergeStrategy}
} else if len(args) == expectedArgs-1 && allowNoValue { } else if len(args) == expectedArgs-1 && allowNoValue {
// don't update the value // don't update the value
updateCommands = make([]yqlib.UpdateCommand, 1) updateCommands = make([]yqlib.UpdateCommand, 1)

2
pkg/yqlib/update_navigation_strategy.go
View File

@ -29,7 +29,7 @@ func UpdateNavigationStrategy(updateCommand UpdateCommand, autoCreate bool) Navi
} }
node.Anchor = changesToApply.Anchor node.Anchor = changesToApply.Anchor
node.Alias = changesToApply.Alias node.Alias = changesToApply.Alias
if !updateCommand.DontUpdateComments { if updateCommand.CommentsMergeStrategy != IgnoreCommentsMergeStrategy {
node.HeadComment = changesToApply.HeadComment node.HeadComment = changesToApply.HeadComment
node.LineComment = changesToApply.LineComment node.LineComment = changesToApply.LineComment
node.FootComment = changesToApply.FootComment node.FootComment = changesToApply.FootComment