Record merge progress durably and finish pushed merges at startup

2026-10-16 13:01:17 -07:00
parent 51dfbf78a0
commit d9e0498d10
6 changed files with 211 additions and 42 deletions
@@ -251,8 +251,13 @@ func FastForward(repo, rev string) error {
 	return err
 }

-func FetchFastForward(repo, branch string) error {
+func Fetch(repo string) error {
 	_, err := run(repo, "fetch", Remote)
+	return err
+}
+
+func FetchFastForward(repo, branch string) error {
+	err := Fetch(repo)
 	if err != nil {
 		return err
 	}