fix: 修复diff细节

src/diffReview.ts

@@ -1,4 +1,5 @@
 import { ReviewResult, Reviewer } from "./Reviewer";
+import { findCommonAncestor } from "./findCommonAncestor";
 import { getCurrentBranch } from "./getCurrentBranch";
 import { AiReviewer } from "./reviewer/AiReviewer";
 import { ESLintReviewer } from "./reviewer/ESLintReviewer";
@@ -15,6 +16,8 @@ export async function diffReview(target: string, options: Options) {
  );
  }
 
+ target = findCommonAncestor(current, target) || target;
+
  return await Reviewer.review(current, target, {
  cwd: options.cwd ?? process.cwd(),
  patter: options.patter,

src/findCommonAncestor.ts

@@ -0,0 +1,15 @@
+import { execSync } from "child_process";
+
+export function findCommonAncestor(branch1: string, branch2: string) {
+ try {
+ // 执行 Git 命令获取共同节点的哈希值
+ const command = `git merge-base ${branch1} ${branch2}`;
+ const output = execSync(command, { encoding: "utf-8" });
+
+ // 返回共同节点的哈希值
+ return output.trim();
+ } catch (error) {
+ console.error("Error finding common ancestor:", error);
+ return undefined;
+ }
+}