Fix empty git branch and remote value issues

beikov · beikov · commit f0112a9aea0b · 2024-06-14T17:39:17.000+02:00
diff --git a/release/release.gradle b/release/release.gradle
@@ -233,14 +233,14 @@ def releaseChecksTask = tasks.register( "releaseChecks" ) {
         String gitBranchLocal
         String gitRemoteLocal
 
-        if (project.hasProperty('gitBranch')) {
+        if (project.hasProperty('gitBranch') && !project.property('gitBranch').isEmpty()) {
             gitBranchLocal = project.property('gitBranch')
         }
         else {
             gitBranchLocal = executeGitCommand( 'branch', '--show-current' ).trim()
         }
 
-        if (project.hasProperty('gitRemote')) {
+        if (project.hasProperty('gitRemote') && !project.hasProperty('gitRemote').isEmpty()) {
             gitRemoteLocal = project.property('gitRemote')
         }
         else {

Original file line number	Diff line number	Diff line change
`@@ -233,14 +233,14 @@ def releaseChecksTask = tasks.register( "releaseChecks" ) {`
`233`	`233`	`String gitBranchLocal`
`234`	`234`	`String gitRemoteLocal`
`235`	`235`
`236`		`- if (project.hasProperty('gitBranch')) {`
	`236`	`+ if (project.hasProperty('gitBranch') && !project.property('gitBranch').isEmpty()) {`
`237`	`237`	`gitBranchLocal = project.property('gitBranch')`
`238`	`238`	`}`
`239`	`239`	`else {`
`240`	`240`	`gitBranchLocal = executeGitCommand( 'branch', '--show-current' ).trim()`
`241`	`241`	`}`
`242`	`242`
`243`		`- if (project.hasProperty('gitRemote')) {`
	`243`	`+ if (project.hasProperty('gitRemote') && !project.hasProperty('gitRemote').isEmpty()) {`
`244`	`244`	`gitRemoteLocal = project.property('gitRemote')`
`245`	`245`	`}`
`246`	`246`	`else {`