From 483c6ee6306aa1bfa7073d339a9b1b05abb1ffeb Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sat, 1 Dec 2018 10:25:10 +0000 Subject: [PATCH] Handle case of tag not already existing in release repo correctly --- release/do.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/do.groovy b/release/do.groovy index 187fb01..a43beda 100644 --- a/release/do.groovy +++ b/release/do.groovy @@ -137,7 +137,7 @@ def ArrayList maketaglist(String buildstamp, String otherreleasetags) { def boolean releasegittag(String postcommitshacode, String tag) { def boolean tagadded = false // Check if tag exists already - def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" > \"${gitrevparseoutputfile}\"", returnStatus: true).trim() + def int gitrevparsestatus = sh(script: "git rev-parse \"${tag}\" > \"${gitrevparseoutputfile}\"", returnStatus: true) if (gitrevparsestatus == 0) { // Tag exists def existingshacode = readFile(file: gitrevparseoutputfile).trim() if (existingshacode != postcommitshacode) { // If the existing tag is not associated with HEAD