Audit of a1d498b

2026-10-20 22:00:42 -07:00
parent a1d498bac8
commit ccbbb5807f
2 changed files with 6 additions and 22 deletions
@@ -148,30 +148,14 @@ func UnmergedChanges(worktree, target string) (Unmerged, error) {
 	if err != nil {
 		return u, err
 	}
-	base, err := run(worktree, "merge-base", target, "HEAD")
+	changes, err := Compare(worktree, target, "HEAD", tree, "")
 	if err != nil {
 		return u, err
 	}
-	numstat, err := run(worktree, "diff", "--numstat", base, tree)
-	if err != nil {
-		return u, err
-	}
-	for _, line := range strings.Split(numstat, "\n") {
-		if line == "" {
-			continue
-		}
-		fields := strings.SplitN(line, "\t", 3)
-		u.Files++
-		adds, err := strconv.Atoi(fields[0])
-		if err != nil {
-			continue
-		}
-		dels, err := strconv.Atoi(fields[1])
-		if err != nil {
-			continue
-		}
-		u.Insertions += adds
-		u.Deletions += dels
+	u.Files = len(changes.Files)
+	for _, file := range changes.Files {
+		u.Insertions += file.Additions
+		u.Deletions += file.Deletions
 	}

 	return u, nil