ask_human nudge to merge main

This commit is contained in:
Ian Gulliver
2026-10-20 08:58:59 -07:00
parent d530ec5edc
commit 3989c2f156
3 changed files with 28 additions and 3 deletions
+8
View File
@@ -177,6 +177,14 @@ func UnmergedChanges(worktree, target string) (Unmerged, error) {
return u, nil
}
func Behind(worktree, target string) (int, error) {
count, err := run(worktree, "rev-list", "--count", "HEAD.."+target)
if err != nil {
return 0, err
}
return strconv.Atoi(count)
}
func SquashCommit(repo, worktree, target, message string, env []string, sign func(payload []byte) ([]byte, error)) (string, error) {
checkedOut, err := run(repo, "symbolic-ref", "--short", "HEAD")
if err != nil {