From 7b06d1c161825e2dff7faae1a5dd1cf5e9b5f400 Mon Sep 17 00:00:00 2001 From: knoflook Date: Sun, 3 Oct 2021 10:09:22 +0200 Subject: [PATCH] fix: Tag.UpgradeElement() fails when missing minor or patch --- tagcmp.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tagcmp.go b/tagcmp.go index ae40544..bce89e0 100644 --- a/tagcmp.go +++ b/tagcmp.go @@ -177,31 +177,31 @@ func (curTag Tag) UpgradeElement(newTag Tag) (Tag, error) { if err != nil { return Tag{}, err } - curMinor, err := strconv.Atoi(curTag.Minor) - if err != nil { - return Tag{}, err - } - curPatch, err := strconv.Atoi(curTag.Patch) - if err != nil { - return Tag{}, err - } newMajor, err := strconv.Atoi(newTag.Major) if err != nil { return Tag{}, err } - newMinor, err := strconv.Atoi(newTag.Minor) - if err != nil { - return Tag{}, err - } - newPatch, err := strconv.Atoi(newTag.Patch) - if err != nil { - return Tag{}, err - } diff.Major = strconv.Itoa(newMajor - curMajor) if !curTag.MissingMinor { + curMinor, err := strconv.Atoi(curTag.Minor) + if err != nil { + return Tag{}, err + } + newMinor, err := strconv.Atoi(newTag.Minor) + if err != nil { + return Tag{}, err + } diff.Minor = strconv.Itoa(newMinor - curMinor) } if !curTag.MissingPatch { + curPatch, err := strconv.Atoi(curTag.Patch) + if err != nil { + return Tag{}, err + } + newPatch, err := strconv.Atoi(newTag.Patch) + if err != nil { + return Tag{}, err + } diff.Patch = strconv.Itoa(newPatch - curPatch) }