Add merge_to_main tool to land work mid-task and keep going

2026-10-18 20:30:51 -07:00
parent 4c2dfb3409
commit 7138877156
5 changed files with 192 additions and 2 deletions
@@ -329,7 +329,11 @@ func CommitAll(dir, message, name, email string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	if status == "" {
+	merging, err := MergeInProgress(dir)
+	if err != nil {
+		return "", err
+	}
+	if status == "" && !merging {
 		return "", nil
 	}

@@ -350,6 +354,17 @@ func CommitAll(dir, message, name, email string) (string, error) {
 	return Head(dir)
 }

+func Merge(dir, rev, message, name, email string) error {
+	env := []string{
+		"GIT_AUTHOR_NAME=" + name,
+		"GIT_AUTHOR_EMAIL=" + email,
+		"GIT_COMMITTER_NAME=" + name,
+		"GIT_COMMITTER_EMAIL=" + email,
+	}
+	_, err := runEnv(dir, env, "merge", "--no-ff", "--quiet", "--message", message, rev)
+	return err
+}
+
 func run(dir string, args ...string) (string, error) {
 	return runEnv(dir, nil, args...)
 }