Polish "Pass CI branch parameter to build scan"

snicoll · snicoll · commit 4ea739f91c8a · 2020-01-16T15:41:41.000+01:00
See gh-19658
diff --git a/gradle/build-scan-user-data.gradle b/gradle/build-scan-user-data.gradle
@@ -52,7 +52,7 @@ boolean isCi() {
 
 String getBranch() {
 	def branch = System.getenv('BRANCH')
-	if (branch != null && !branch.isEmpty()) {
+	if (branch) {
 		return branch
 	}
 	return execAndGetStdout('git', 'rev-parse', '--abbrev-ref', 'HEAD')

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ boolean isCi() {`
`52`	`52`
`53`	`53`	`String getBranch() {`
`54`	`54`	`def branch = System.getenv('BRANCH')`
`55`		`- if (branch != null && !branch.isEmpty()) {`
	`55`	`+ if (branch) {`
`56`	`56`	`return branch`
`57`	`57`	`}`
`58`	`58`	`return execAndGetStdout('git', 'rev-parse', '--abbrev-ref', 'HEAD')`