Merge pull request #112 from crazy-max/fix-git-ref

crazy-max · web-flow · commit f05a598a081a · 2023-06-07T15:17:00.000+02:00
git: fall back to git tag in detached HEAD state
diff --git a/src/git.ts b/src/git.ts
@@ -61,7 +61,13 @@ export class Git {
   }
 
   public static async ref(): Promise<string> {
-    return await Git.exec(['symbolic-ref', 'HEAD']);
+    return await Git.exec(['symbolic-ref', 'HEAD']).catch(() => {
+      // if it fails (for example in a detached HEAD state), falls back to
+      // using git tag or describe to get the exact matching tag name.
+      return Git.tag().then(tag => {
+        return `refs/tags/${tag}`;
+      });
+    });
   }
 
   public static async fullCommit(): Promise<string> {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,13 @@ export class Git {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public static async ref(): Promise<string> {`
`64`		`- return await Git.exec(['symbolic-ref', 'HEAD']);`
	`64`	`+ return await Git.exec(['symbolic-ref', 'HEAD']).catch(() => {`
	`65`	`+ // if it fails (for example in a detached HEAD state), falls back to`
	`66`	`+ // using git tag or describe to get the exact matching tag name.`
	`67`	`+ return Git.tag().then(tag => {`
	`68`	+ return `refs/tags/${tag}`;
	`69`	`+ });`
	`70`	`+ });`
`65`	`71`	`}`
`66`	`72`
`67`	`73`	`public static async fullCommit(): Promise<string> {`