From f59830ae205ed037149c8a1f6fcd62dee778844e Mon Sep 17 00:00:00 2001
From: Catherine <whitequark@whitequark.org>
Date: Thu, 4 Dec 2025 16:50:35 +0000
Subject: [PATCH] Rename PATCH `Race-Free:` header to `Atomic:`.

Neither of these names is self-explanatory, and it is better to have
fewer distinct identifiers for the same concept.
---
 README.md                |  4 ++--
 src/pages.go             | 14 +++++++-------
 test/stresspatch/main.go |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 284d1e9..0dadb03 100644
--- a/README.md
+++ b/README.md
@@ -80,8 +80,8 @@ Features
         - A directory entry replaces any existing file or directory with the same name (if any), recursively removing the old contents.
         - A file or symlink entry replaces any existing file or directory with the same name (if any).
         - In any case, the parent of an entry must exist and be a directory.
-    - The request must have a `Race-Free: yes` or `Race-Free: no` header. Not every backend configuration makes it possible to perform atomic compare-and-swap operations; on backends without atomic CAS support, `Race-Free: yes` requests will fail, while `Race-Free: no` requests will provide a best-effort approximation.
-    - If a `PATCH` request loses a race against another content update request, it may return `409 Conflict`. This is true regardless of the `Race-Free:` header value. Whenever this happens, resubmit the request as-is.
+    - The request must have a `Atomic: yes` or `Atomic: no` header. Not every backend configuration makes it possible to perform atomic compare-and-swap operations; on backends without atomic CAS support, `Atomic: yes` requests will fail, while `Atomic: no` requests will provide a best-effort approximation.
+    - If a `PATCH` request loses a race against another content update request, it may return `409 Conflict`. This is true regardless of the `Atomic:` header value. Whenever this happens, resubmit the request as-is.
     - If the site has no contents after the update is applied, performs the same action as `DELETE`.
 * In response to a `DELETE` request, the server unpublishes a site. The URL of the request must be the root URL of the site that is being unpublished. Site data remains stored for an indeterminate period of time, but becomes completely inaccessible.
 * If a `Dry-Run: yes` header is provided with a `PUT`, `PATCH`, `DELETE`, or `POST` request, only the authorization checks are run; no destructive updates are made. Note that this functionality was added in _git-pages_ v0.2.0.
diff --git a/src/pages.go b/src/pages.go
index 4278ac2..49197cf 100644
--- a/src/pages.go
+++ b/src/pages.go
@@ -537,19 +537,19 @@ func patchPage(w http.ResponseWriter, r *http.Request) error {
 	// on the backend in use and its configuration, but for applications where a mostly-atomic
 	// compare-and-swap operation is good enough (e.g. generating page previews) we don't want
 	// to prevent the use of partial updates.
-	wantRaceFree := r.Header.Get("Race-Free")
+	wantAtomicCAS := r.Header.Get("Atomic")
 	hasAtomicCAS := backend.HasAtomicCAS(r.Context())
 	switch {
-	case wantRaceFree == "yes" && hasAtomicCAS || wantRaceFree == "no":
+	case wantAtomicCAS == "yes" && hasAtomicCAS || wantAtomicCAS == "no":
 		// all good
-	case wantRaceFree == "yes":
-		http.Error(w, "race free partial updates unsupported", http.StatusPreconditionFailed)
+	case wantAtomicCAS == "yes":
+		http.Error(w, "atomic partial updates unsupported", http.StatusPreconditionFailed)
 		return nil
-	case wantRaceFree == "":
-		http.Error(w, "must provide \"Race-Free: yes|no\" header", http.StatusPreconditionRequired)
+	case wantAtomicCAS == "":
+		http.Error(w, "must provide \"Atomic: yes|no\" header", http.StatusPreconditionRequired)
 		return nil
 	default:
-		http.Error(w, "malformed Race-Free: header", http.StatusBadRequest)
+		http.Error(w, "malformed Atomic: header", http.StatusBadRequest)
 		return nil
 	}
 
diff --git a/test/stresspatch/main.go b/test/stresspatch/main.go
index d2d04e5..c6d2bcb 100644
--- a/test/stresspatch/main.go
+++ b/test/stresspatch/main.go
@@ -57,7 +57,7 @@ func patchRequest(n int) int {
 		panic(err)
 	}
 
-	req.Header.Add("Race-Free", "no")
+	req.Header.Add("Atomic", "no")
 	req.Header.Add("Content-Type", "application/x-tar")
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {