Fix empty git branch and remote value issues

beikov · mbellade · commit 2e92cfda9a33 · 2024-07-02T08:54:49.000+02:00
diff --git a/release/release.gradle b/release/release.gradle
@@ -225,14 +225,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.property('gitRemote').isEmpty()) {
             gitRemoteLocal = project.property('gitRemote')
         }
         else {

Original file line number	Diff line number	Diff line change
`@@ -225,14 +225,14 @@ def releaseChecksTask = tasks.register( "releaseChecks" ) {`
`225`	`225`	`String gitBranchLocal`
`226`	`226`	`String gitRemoteLocal`
`227`	`227`
`228`		`- if (project.hasProperty('gitBranch')) {`
	`228`	`+ if (project.hasProperty('gitBranch') && !project.property('gitBranch').isEmpty()) {`
`229`	`229`	`gitBranchLocal = project.property('gitBranch')`
`230`	`230`	`}`
`231`	`231`	`else {`
`232`	`232`	`gitBranchLocal = executeGitCommand( 'branch', '--show-current' ).trim()`
`233`	`233`	`}`
`234`	`234`
`235`		`- if (project.hasProperty('gitRemote')) {`
	`235`	`+ if (project.hasProperty('gitRemote') && !project.property('gitRemote').isEmpty()) {`
`236`	`236`	`gitRemoteLocal = project.property('gitRemote')`
`237`	`237`	`}`
`238`	`238`	`else {`