diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-10 10:41:38 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-10 10:41:38 -0500 |
commit | 88ab83d4e04f2054713461c3f28d905b4c1c2ee2 (patch) | |
tree | 9a16fd35768ad78a6c28d85ad0191b3f9d6f03e4 /vendor/gopkg.in/yaml.v2/yaml.go | |
parent | 832639ca6d1d8004c46aaa4e6c021dfd5a314af3 (diff) | |
parent | 46b014bad5f1d471a2ebfd819dfdf33a184ea109 (diff) | |
download | podman-88ab83d4e04f2054713461c3f28d905b4c1c2ee2.tar.gz podman-88ab83d4e04f2054713461c3f28d905b4c1c2ee2.tar.bz2 podman-88ab83d4e04f2054713461c3f28d905b4c1c2ee2.zip |
Merge pull request #9298 from containers/dependabot/go_modules/github.com/spf13/cobra-1.1.2
Bump github.com/spf13/cobra from 1.1.1 to 1.1.2
Diffstat (limited to 'vendor/gopkg.in/yaml.v2/yaml.go')
-rw-r--r-- | vendor/gopkg.in/yaml.v2/yaml.go | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/vendor/gopkg.in/yaml.v2/yaml.go b/vendor/gopkg.in/yaml.v2/yaml.go index 89650e293..30813884c 100644 --- a/vendor/gopkg.in/yaml.v2/yaml.go +++ b/vendor/gopkg.in/yaml.v2/yaml.go @@ -175,7 +175,7 @@ func unmarshal(in []byte, out interface{}, strict bool) (err error) { // Zero valued structs will be omitted if all their public // fields are zero, unless they implement an IsZero // method (see the IsZeroer interface type), in which -// case the field will be included if that method returns true. +// case the field will be excluded if IsZero returns true. // // flow Marshal using a flow style (useful for structs, // sequences and maps). @@ -464,3 +464,15 @@ func isZero(v reflect.Value) bool { } return false } + +// FutureLineWrap globally disables line wrapping when encoding long strings. +// This is a temporary and thus deprecated method introduced to faciliate +// migration towards v3, which offers more control of line lengths on +// individual encodings, and has a default matching the behavior introduced +// by this function. +// +// The default formatting of v2 was erroneously changed in v2.3.0 and reverted +// in v2.4.0, at which point this function was introduced to help migration. +func FutureLineWrap() { + disableLineWrapping = true +} |