fix(branch): rev-parse in bare repo (#55)

Running git rev-parse in a bare repository would cause better-branch to fail with cryptic errors. This uses the cwd as an alternative when git root can't be found.
Everduin94 · Dec 14, 2023 · 4332e94 · 4332e94
1 parent 3472b40
commit 4332e94
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/utils.ts b/src/utils.ts
@@ -187,8 +187,19 @@ export function infer_type_from_branch(types: string[]): string {
   return found ?? "";
 }
 
+/*
+rev-parse will fail in a --bare repository root
+*/
 export function get_git_root(): string {
-  return execSync("git rev-parse --show-toplevel").toString().trim();
+  let path = ".";
+  try {
+    path = execSync("git rev-parse --show-toplevel").toString().trim();
+  } catch (err) {
+    p.log.warn(
+      "Could not find git root. If in a --bare repository, ignore this warning."
+    );
+  }
+  return path;
 }
 
 export function get_default_config_path(): string {