suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-09-01 14:14:52 +08:00
Code Issues Packages 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
Download Patch File Download Diff File Expand all files Collapse all files
cmd/utils.go
+1 -1
View File
@@ -512,7 +512,7 @@ func readUpdateCommands(args []string, expectedArgs int, badArgsMessage string,
log.Debug("path %v", args[expectedArgs-2])
log.Debug("Value %v", args[expectedArgs-1])
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 {
// don't update the value
updateCommands = make([]yqlib.UpdateCommand, 1)