diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-03 14:16:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-03 14:16:52 +0100 |
| commit | 0c6f1c4fb13e22ca8e97dd93fba9160d7ef573a1 (patch) | |
| tree | 1b651ab8c67e8e9f4ad8da27a879c19ee3b6b237 /vendor/github.com/jinzhu/copier | |
| parent | a6d1220ac08456dcc075b85b168def3ffeadb58d (diff) | |
| parent | bd9f8815e1fc56c188668509025741a93649ca05 (diff) | |
| download | podman-0c6f1c4fb13e22ca8e97dd93fba9160d7ef573a1.tar.gz podman-0c6f1c4fb13e22ca8e97dd93fba9160d7ef573a1.tar.bz2 podman-0c6f1c4fb13e22ca8e97dd93fba9160d7ef573a1.zip | |
Merge pull request #12486 from giuseppe/use-configured-compression-format
cmd, push: use the configured compression format
Diffstat (limited to 'vendor/github.com/jinzhu/copier')
| -rw-r--r-- | vendor/github.com/jinzhu/copier/copier.go | 13 | ||||
| -rw-r--r-- | vendor/github.com/jinzhu/copier/go.mod | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/vendor/github.com/jinzhu/copier/copier.go b/vendor/github.com/jinzhu/copier/copier.go index 412ff5497..6d21da869 100644 --- a/vendor/github.com/jinzhu/copier/copier.go +++ b/vendor/github.com/jinzhu/copier/copier.go @@ -348,10 +348,15 @@ func deepFields(reflectType reflect.Type) []reflect.StructField { for i := 0; i < reflectType.NumField(); i++ { v := reflectType.Field(i) - if v.Anonymous { - fields = append(fields, deepFields(v.Type)...) - } else { - fields = append(fields, v) + // PkgPath is the package path that qualifies a lower case (unexported) + // field name. It is empty for upper case (exported) field names. + // See https://golang.org/ref/spec#Uniqueness_of_identifiers + if v.PkgPath == "" { + if v.Anonymous { + fields = append(fields, deepFields(v.Type)...) + } else { + fields = append(fields, v) + } } } diff --git a/vendor/github.com/jinzhu/copier/go.mod b/vendor/github.com/jinzhu/copier/go.mod index 531422dcb..309801e9b 100644 --- a/vendor/github.com/jinzhu/copier/go.mod +++ b/vendor/github.com/jinzhu/copier/go.mod @@ -1,3 +1,3 @@ module github.com/jinzhu/copier -go 1.15 +go 1.13 |