feat(cli): show branch name if locally clean (#971)

Author: kguzek

src/utils/get-git-branch.ts

@@ -0,0 +1,20 @@
+import { execSync } from "node:child_process";
+import type { ExecSyncOptions } from "node:child_process";
+
+export function getGitBranch(options?: ExecSyncOptions): string | null {
+  try {
+    const result = execSync(
+      "git symbolic-ref --quiet --short HEAD || git rev-parse --short HEAD",
+      {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+        ...options,
+      },
+    );
+
+    const branch = result.toString().trim();
+    return branch === "" ? null : branch;
+  } catch {
+    return null;
+  }
+}

src/utils/is-git-clean.ts

@@ -3,8 +3,8 @@ import type { ExecSyncOptions } from "node:child_process";
 
 export function isGitClean(options?: ExecSyncOptions): boolean {
   try {
-    execSync("git diff-index --quiet HEAD --", { stdio: "ignore", ...options });
-    return true;
+    const diff = execSync("git status --porcelain", options);
+    return diff.toString().trim() === "";
   } catch {
     return false;
   }

src/utils/is-in-git-repo.ts

@@ -2,22 +2,25 @@ import * as p from "@clack/prompts";
 import { readFileSync } from "node:fs";
 import c from "picocolors";
 
+import { getGitBranch } from "./get-git-branch";
 import { isGitClean } from "./is-git-clean";
-import { isInGitRepo } from "./is-in-git-repo";
 
 export const printIntro = () => {
   const packageJsonUrl = new URL("../../package.json", import.meta.url);
   const packageJson = JSON.parse(readFileSync(packageJsonUrl, "utf8")) as {
     version?: string;
   };
-  const packageRoot = new URL("../", packageJsonUrl);
+  const packageRoot = new URL("./", packageJsonUrl);
   const execOptions = { cwd: packageRoot };
-  const clean = !isInGitRepo(execOptions) || isGitClean(execOptions);
   const version =
     packageJson.version == null || packageJson.version.trim() === ""
       ? c.red("(unknown version)")
       : c.green(c.bold(`v${packageJson.version}`));
-  const dirtyStatus = clean ? "" : c.white(" (dirty)");
+  const branchName = getGitBranch(execOptions);
+  const dirtyStatus =
+    branchName == null
+      ? ""
+      : c.white(` (${isGitClean(execOptions) ? branchName : "dirty"})`);
   p.intro(
     `  ${c.blueBright(c.bold("@solvro/config"))} ${version}${dirtyStatus}  `,
   );