Fix incorrect -dirty tag on versioning

TBlueF · TBlueF · commit 720dc87513df · 2025-02-18T11:58:25.000+01:00
diff --git a/api b/api
@@ -1 +1 @@
-Subproject commit 5dc74e299c5553627d33e0ad734f992c01bf2141
+Subproject commit 4c6ed2fcfb657ec7088549452ec335bb7eacca6c
diff --git a/buildSrc/src/main/kotlin/versioning.kt b/buildSrc/src/main/kotlin/versioning.kt
@@ -8,7 +8,8 @@ fun Project.gitHash(): String {
 }
 
 fun Project.gitClean(): Boolean {
-    return runCommand("git status --porcelain", "NOT_CLEAN").isEmpty()
+    if (runCommand("git update-index --refresh", "NOT-CLEAN").equals("NOT-CLEAN")) return false;
+    return runCommand("git diff-index HEAD --", "NOT-CLEAN").isEmpty();
 }
 
 fun Project.gitVersion(): String {
@@ -52,8 +53,10 @@ private fun Project.runCommand(cmd: String, fallback: String? = null): String {
                 throw TimeoutException("Failed to execute command: '$cmd'")
         }
         .run {
+            val exitCode = waitFor()
+            if (exitCode == 0) return inputStream.bufferedReader().readText().trim()
+
             val error = errorStream.bufferedReader().readText().trim()
-            if (error.isEmpty()) return inputStream.bufferedReader().readText().trim()
             logger.warn("Failed to execute command '$cmd': $error")
             if (fallback != null) return fallback
             throw IOException(error)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ fun Project.gitHash(): String {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`fun Project.gitClean(): Boolean {`
`11`		`- return runCommand("git status --porcelain", "NOT_CLEAN").isEmpty()`
	`11`	`+ if (runCommand("git update-index --refresh", "NOT-CLEAN").equals("NOT-CLEAN")) return false;`
	`12`	`+ return runCommand("git diff-index HEAD --", "NOT-CLEAN").isEmpty();`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`fun Project.gitVersion(): String {`
`@@ -52,8 +53,10 @@ private fun Project.runCommand(cmd: String, fallback: String? = null): String {`
`52`	`53`	`throw TimeoutException("Failed to execute command: '$cmd'")`
`53`	`54`	`}`
`54`	`55`	`.run {`
	`56`	`+ val exitCode = waitFor()`
	`57`	`+ if (exitCode == 0) return inputStream.bufferedReader().readText().trim()`
	`58`	`+`
`55`	`59`	`val error = errorStream.bufferedReader().readText().trim()`
`56`		`- if (error.isEmpty()) return inputStream.bufferedReader().readText().trim()`
`57`	`60`	`logger.warn("Failed to execute command '$cmd': $error")`
`58`	`61`	`if (fallback != null) return fallback`
`59`	`62`	`throw IOException(error)`