fix: fix review

Author: vdvukhzhilov

packages/git/src/collectGitFacts.ts

@@ -9,16 +9,39 @@ export type CollectGitFactsOptions = {
   ancestorLimit?: number;
 };
 
+const stripRemotePrefix = (upstreamRef: string): string => {
+  const slashIndex = upstreamRef.indexOf("/");
+
+  return slashIndex >= 0 ? upstreamRef.slice(slashIndex + 1) : upstreamRef;
+};
+
+const resolveBranch = (cwd?: string): string | undefined => {
+  const branchRaw = runGit(["rev-parse", "--abbrev-ref", "HEAD"], cwd);
+
+  if (!branchRaw || branchRaw === "HEAD") {
+    return undefined;
+  }
+
+  const upstreamBranch = runGit(["rev-parse", "--abbrev-ref", "@{u}"], cwd);
+
+  if (upstreamBranch) {
+    return stripRemotePrefix(upstreamBranch);
+  }
+
+  return branchRaw;
+};
+
 const collectLocalState = (cwd?: string): GitLocalState => {
   const statusPorcelain = runGit(["status", "--porcelain"], cwd) ?? "";
   const branchRaw = runGit(["rev-parse", "--abbrev-ref", "HEAD"], cwd);
   const detachedHead = branchRaw === "HEAD";
+  const headCommit = runGit(["rev-parse", "--verify", "HEAD"], cwd);
   const upstreamCommit = runGit(["rev-parse", "--verify", "@{u}"], cwd);
   const upstreamBranch = runGit(["rev-parse", "--abbrev-ref", "@{u}"], cwd);
 
   return {
     uncommittedChanges: statusPorcelain.length > 0,
-    unpublishedCommit: !upstreamCommit,
+    unpublishedCommit: !upstreamCommit || headCommit !== upstreamCommit,
     unpublishedBranch: !upstreamBranch,
     detachedHead,
   };
@@ -37,8 +60,7 @@ export const collectGitFacts = (options: CollectGitFactsOptions = {}): GitFacts
     return undefined;
   }
 
-  const branchRaw = runGit(["rev-parse", "--abbrev-ref", "HEAD"], cwd);
-  const branch = branchRaw && branchRaw !== "HEAD" ? branchRaw : undefined;
+  const branch = resolveBranch(cwd);
 
   const revList = runGit(["rev-list", "--first-parent", commit, `--max-count=${ancestorLimit + 1}`], cwd);
 
@@ -50,7 +72,7 @@ export const collectGitFacts = (options: CollectGitFactsOptions = {}): GitFacts
     .split("\n")
     .map((line) => line.trim())
     .filter(Boolean)
-    .filter((hash) => hash !== commit);
+    .slice(1);
 
   return {
     commit,

packages/git/test/collectGitFacts.test.ts

@@ -94,7 +94,7 @@ describe("collectGitFacts", () => {
       firstParentAncestors: [COMMIT_B, COMMIT_A],
       localState: {
         uncommittedChanges: false,
-        unpublishedCommit: false,
+        unpublishedCommit: true,
         unpublishedBranch: false,
         detachedHead: false,
       },
@@ -169,6 +169,92 @@ describe("collectGitFacts", () => {
     expect(collectGitFacts()?.localState?.uncommittedChanges).toBe(true);
   });
 
+  it("marks unpublished commit when HEAD is ahead of upstream", () => {
+    mockHappyGit();
+
+    expect(collectGitFacts()?.localState?.unpublishedCommit).toBe(true);
+  });
+
+  it("marks published commit when HEAD matches upstream", () => {
+    mockHappyGit();
+
+    runGit.mockImplementation((args: string[]) => {
+      const key = args.join(" ");
+
+      if (key === "rev-parse --verify @{u}") {
+        return COMMIT_C;
+      }
+
+      if (key === "rev-parse --is-inside-work-tree") {
+        return "true";
+      }
+
+      if (key === "rev-parse HEAD" || key === "rev-parse --verify HEAD") {
+        return COMMIT_C;
+      }
+
+      if (key === "rev-parse --abbrev-ref HEAD") {
+        return "main";
+      }
+
+      if (key.startsWith("rev-list --first-parent")) {
+        return [COMMIT_C, COMMIT_B].join("\n");
+      }
+
+      if (key === "status --porcelain") {
+        return "";
+      }
+
+      if (key === "rev-parse --abbrev-ref @{u}") {
+        return "origin/main";
+      }
+
+      return undefined;
+    });
+
+    expect(collectGitFacts()?.localState?.unpublishedCommit).toBe(false);
+  });
+
+  it("prefers upstream branch name over local branch name", () => {
+    mockHappyGit();
+
+    runGit.mockImplementation((args: string[]) => {
+      const key = args.join(" ");
+
+      if (key === "rev-parse --abbrev-ref HEAD") {
+        return "local-feature";
+      }
+
+      if (key === "rev-parse --abbrev-ref @{u}") {
+        return "origin/feature/foo";
+      }
+
+      if (key === "rev-parse --is-inside-work-tree") {
+        return "true";
+      }
+
+      if (key === "rev-parse HEAD" || key === "rev-parse --verify HEAD") {
+        return COMMIT_C;
+      }
+
+      if (key.startsWith("rev-list --first-parent")) {
+        return [COMMIT_C, COMMIT_B].join("\n");
+      }
+
+      if (key === "status --porcelain") {
+        return "";
+      }
+
+      if (key === "rev-parse --verify @{u}") {
+        return COMMIT_B;
+      }
+
+      return undefined;
+    });
+
+    expect(collectGitFacts()?.branch).toBe("feature/foo");
+  });
+
   it("marks unpublished commit and branch when upstream is missing", () => {
     mockHappyGit();