Commit `de43af4650`

de43af4650beeb1f1e230dcd24ab5372d4ebd190

parent: e7b249b38d

Verified · cmc ci/build: success

cmc <hello@cleberg.net> · 2026-08-28 19:26 UTC

mrs: a bare #N in a commit no longer suppresses the description's close

ProcessMRDescription shared its dedup key with ProcessCommitMessages —
the merged sha. A commit mentioning "#N" in passing recorded that key
first, so the description's "Closes #N" found it taken and gave up
without closing anything. krz/gitbay-ios#8 stayed open after the merge
request that fixed it, saying "Closes #8", landed.

The key is now per merge request. Acting once was never the key's job:
a commit that closes the issue leaves it closed, and the state check
already skips it.

Layout: unified · split

internal/control/commitrefs.go +14 −5

 // they are what lands — but the intent is written in the merge request
 // just as often, and a "Closes #N" there used to close nothing.
 //
-// The dedup key is the merged sha, shared with ProcessCommitMessages, so
+// Acting once is guaranteed by the state check, not by the dedup key: a
-// an issue named in both a commit and the description is acted on once.
+// commit that closed the issue leaves it closed, and this skips it. The
-func ProcessMRDescription(st *store.Store, repo store.Repo, mr store.MR, actorID int64, sha string) {
+// key is per merge request rather than the merged sha, because sharing
+// the sha let a bare "#N" in a commit message claim it first and silently
+// suppress the close.
+func ProcessMRDescription(st *store.Store, repo store.Repo, mr store.MR, actorID int64) {
 	for _, n := range closingRefs(mr.Title + "\n" + mr.Body) {
 		issue, err := st.IssueByNumber(repo.ID, n)
 		if err != nil || issue.State != "open" {
 			continue // no such issue, or a commit already closed it
 		}
-		fresh, err := st.TryRecordCommitRef(issue.ID, sha)
+		fresh, err := st.TryRecordCommitRef(issue.ID, mrRefKey(mr.Number))
 		if err != nil || !fresh {
-			continue
+			continue // this merge request already acted on this issue
 		}
 		if err := st.SetIssueState(issue.ID, "closed"); err != nil {
 			slog.Error("mr refs: closing issue", "issue", n, "err", err)
 	}
 }
+// mrRefKey namespaces a merge request's dedup record so it cannot
+// collide with a commit sha.
+func mrRefKey(number int64) string {
+	return fmt.Sprintf("mr-%d", number)
+}
 // closingRefs returns the issue numbers a text closes, in no order.
 func closingRefs(text string) []int64 {
 	seen := map[int64]bool{}

internal/control/control_test.go +17

	@@ -69,3 +69,20 @@ func TestBuildJobsIsAReadCommand(t *testing.T) {
69	t.Error("build jobs must not be SSHOnly; the web and the app need it")	69	t.Error("build jobs must not be SSHOnly; the web and the app need it")
70	}	70	}
71	}	71	}
		72
		73	// A merge request's dedup key must not collide with a commit sha. It did:
		74	// a bare "#N" in a commit message recorded (issue, sha) first, and the
		75	// description's "Closes #N" then found the key taken and silently gave
		76	// up. That is how krz/gitbay-ios#8 stayed open after its own MR merged.
		77	func TestMRDedupKeyCannotCollideWithASHA(t *testing.T) {
		78	key := mrRefKey(24)
		79	if key == "51b6a14eab49ab08e890597653fcf02f8f38f3d6" \|\| len(key) == 40 {
		80	t.Errorf("mrRefKey(24) = %q, which is shaped like a sha", key)
		81	}
		82	if key != "mr-24" {
		83	t.Errorf("mrRefKey(24) = %q, want \"mr-24\"", key)
		84	}
		85	if mrRefKey(24) == mrRefKey(25) {
		86	t.Error("different merge requests share a dedup key")
		87	}
		88	}

internal/control/mr.go +1 −1

	@@ -894,7 +894,7 @@ func runMRMerge(c *Ctx, args []string) int {
894	// when both name the same issue.	894	// when both name the same issue.
895	if mr.TargetRef == repo.DefaultBranch {	895	if mr.TargetRef == repo.DefaultBranch {
896	ProcessCommitMessages(c.Store, dir, repo, c.User.ID, targetSHA, newSHA)	896	ProcessCommitMessages(c.Store, dir, repo, c.User.ID, targetSHA, newSHA)
897	ProcessMRDescription(c.Store, repo, mr, c.User.ID, newSHA)	897	ProcessMRDescription(c.Store, repo, mr, c.User.ID)
898	RecordLandedCommits(c.Store, dir, repo, targetSHA, newSHA)	898	RecordLandedCommits(c.Store, dir, repo, targetSHA, newSHA)
899	}	899	}
900	c.Store.MarkMirrorsDirty(repo.ID, "push")	900	c.Store.MarkMirrorsDirty(repo.ID, "push")

Commit de43af4650

Commit `de43af4650`