@dotinc/ogre 0.15.3 → 0.15.4

package/.tap/test-results/src/merge.test.ts.tap

@@ -2,7 +2,7 @@ TAP version 14
 # Subtest: merge with no commit fails
     ok 1 - expected to reject
     1..1
-ok 1 - merge with no commit fails # time=142.615ms
+ok 1 - merge with no commit fails # time=171.332ms
 
 # Subtest: merge fast-forward
     ok 1 - HEAD not pointing to new_branch
@@ -11,6 +11,6 @@ ok 1 - merge with no commit fails # time=142.615ms
     ok 4 - master is not at expected commit
     ok 5 - fast-forward failed, superfluous commit detected
     1..5
-ok 2 - merge fast-forward # time=16.056ms
+ok 2 - merge fast-forward # time=25.959ms
 
 1..2

package/.tap/test-results/src/repository.test.ts.tap

@@ -1,9 +1,9 @@
 TAP version 14
 # Subtest: diff is ok
     ok 1 - main is pointing at wrong commit
-    ok 2 - invalid \# of change entries: [{"op":"add","path":"/nested/0","value":{"uuid":"cf4e4336-0066-4a17-9b72-96c408c40429","name":"new name"}},{"op":"add","path":"/nested/1","value":{"uuid":"e8c30e3f-ff76-4052-85ff-7ba6343f035b","name":"first name"}}]
+    ok 2 - invalid \# of change entries: [{"op":"add","path":"/nested/0","value":{"uuid":"293cebbb-9f78-45ee-a07a-735bdfc8a9f9","name":"new name"}},{"op":"add","path":"/nested/1","value":{"uuid":"8817b9e4-0baf-499e-8ce6-49ae3862d18f","name":"first name"}}]
     1..2
-ok 1 - diff is ok # time=199.319ms
+ok 1 - diff is ok # time=181.102ms
 
 # Subtest: restore
     # Subtest: history check
@@ -16,7 +16,7 @@ ok 1 - diff is ok # time=199.319ms
         ok 7 - incorrect \# of commits
         ok 8 - incorrect \# of changelog entries
         1..8
-    ok 1 - history check # time=86.356ms
+    ok 1 - history check # time=77.498ms
     
     # Subtest: date stays date
         ok 1 - incorrect \# of commits
@@ -24,7 +24,7 @@ ok 1 - diff is ok # time=199.319ms
         ok 3 - restored object does not equal last version.
         ok 4 - incorrect \# of changelog entries
         1..4
-    ok 2 - date stays date # time=10.883ms
+    ok 2 - date stays date # time=9.386ms
     
     # Subtest: reconstruct with 2 commits
         ok 1 - main is pointing at wrong commit
@@ -33,17 +33,17 @@ ok 1 - diff is ok # time=199.319ms
         ok 4 - incorrect \# of commits
         ok 5 - incorrect \# of changelog entries
         1..5
-    ok 3 - reconstruct with 2 commits # time=11.138ms
+    ok 3 - reconstruct with 2 commits # time=8.567ms
     
     1..3
-ok 2 - restore # time=159.863ms
+ok 2 - restore # time=134.232ms
 
 # Subtest: history
     # Subtest: successful restore
         ok 1 - restored object does not equal last version.
         ok 2 - should not be the js ref
         1..2
-    ok 1 - successful restore # time=270.127ms
+    ok 1 - successful restore # time=253.739ms
     
     # Subtest: remoteRefs doesn't change on commit
         ok 1 - input history refs and remote before change should not be the same object
@@ -52,7 +52,7 @@ ok 2 - restore # time=159.863ms
         ok 4 - history refs must not be the same as static remotes
         ok 5 - histories must not match anymore
         1..5
-    ok 2 - remoteRefs doesn't change on commit # time=8.727ms
+    ok 2 - remoteRefs doesn't change on commit # time=14.737ms
     
     # Subtest: history contains HEAD ref
         ok 1 - should be equal
@@ -60,15 +60,15 @@ ok 2 - restore # time=159.863ms
         ok 3 - should be equal
         ok 4 - should be equal
         1..4
-    ok 3 - history contains HEAD ref # time=1.159ms
+    ok 3 - history contains HEAD ref # time=1.192ms
     
     # Subtest: empty history unreachable HEAD
         ok 1 - expected to throw
         1..1
-    ok 4 - empty history unreachable HEAD # time=1.218ms
+    ok 4 - empty history unreachable HEAD # time=1.567ms
     
     1..4
-ok 3 - history # time=358.304ms
+ok 3 - history # time=339.06ms
 
 # Subtest: reset
     # Subtest: discard uncommitted changes
@@ -76,7 +76,7 @@ ok 3 - history # time=358.304ms
         ok 2 - wrong \# of changes in diff
         ok 3 - failed to reset
         1..3
-    ok 1 - discard uncommitted changes # time=217.515ms
+    ok 1 - discard uncommitted changes # time=158.972ms
     
     # Subtest: reset to earlier commit
         ok 1 - should be equal
@@ -86,7 +86,7 @@ ok 3 - history # time=358.304ms
         ok 5 - failed to reset
         ok 6 - main should point to first hash
         1..6
-    ok 2 - reset to earlier commit # time=22.263ms
+    ok 2 - reset to earlier commit # time=21.585ms
     
     # Subtest: reset to earlier version tag
         ok 1 - should be equal
@@ -96,54 +96,54 @@ ok 3 - history # time=358.304ms
         ok 5 - failed to reset
         ok 6 - main should point to first hash
         1..6
-    ok 3 - reset to earlier version tag # time=9.324ms
+    ok 3 - reset to earlier version tag # time=7.045ms
     
     1..3
-ok 4 - reset # time=299.753ms
+ok 4 - reset # time=259.271ms
 
 # Subtest: status
     # Subtest: clean repo no change
         ok 1 - Shouldn't have pending changes
         1..1
-    ok 1 - clean repo no change # time=476.566ms
+    ok 1 - clean repo no change # time=437.377ms
     
     # Subtest: clean repo pending change
         ok 1 - Status doesn't contain the expected \# of changes: [{"op":"replace","path":"/name","value":"changed name"}]
         1..1
-    ok 2 - clean repo pending change # time=1.092ms
+    ok 2 - clean repo pending change # time=0.764ms
     
     # Subtest: reading status shouldn't clean observer
         ok 1 - Status doesn't contain the expected \# of changes: [{"op":"replace","path":"/name","value":"changed name"}]
         ok 2 - Status doesn't contain the expected \# of changes: [{"op":"replace","path":"/name","value":"changed name"}]
         ok 3 - why different pending changes??
         1..3
-    ok 3 - reading status shouldn't clean observer # time=1.654ms
+    ok 3 - reading status shouldn't clean observer # time=1.248ms
     
     # Subtest: after commit no change
         ok 1 - Shouldn't have pending changes
         1..1
-    ok 4 - after commit no change # time=15.047ms
+    ok 4 - after commit no change # time=7.633ms
     
     # Subtest: after commit pending change
         ok 1 - Shouldn't have pending changes
         ok 2 - Status doesn't contain changes
         1..2
-    ok 5 - after commit pending change # time=8.184ms
+    ok 5 - after commit pending change # time=4.985ms
     
     # Subtest: after commit pending change for rewrite array
         ok 1 - Shouldn't have pending changes
         ok 2 - Status doesn't contain changes
         1..2
-    ok 6 - after commit pending change for rewrite array # time=7.358ms
+    ok 6 - after commit pending change for rewrite array # time=8.616ms
     
     # Subtest: change of nested array element prop
         ok 1 - Shouldn't have pending changes
         ok 2 - Status doesn't contain changes
         1..2
-    ok 7 - change of nested array element prop # time=4.329ms
+    ok 7 - change of nested array element prop # time=3.596ms
     
     1..7
-ok 5 - status # time=585.67ms
+ok 5 - status # time=533.401ms
 
 # Subtest: apply
     # Subtest: single patch
@@ -153,7 +153,7 @@ ok 5 - status # time=585.67ms
         ok 4 - Status doesn't contain changes
         ok 5 - It should have the right changes
         1..5
-    ok 1 - single patch # time=207.337ms
+    ok 1 - single patch # time=163.461ms
     
     # Subtest: patch for undefined props with workaround
         ok 1 - Shouldn't have pending changes
@@ -161,7 +161,7 @@ ok 5 - status # time=585.67ms
         ok 3 - The final state should match up
         ok 4 - Status should contain 1 change
         1..4
-    ok 2 - patch for undefined props with workaround # time=2.919ms
+    ok 2 - patch for undefined props with workaround # time=2.697ms
     
     # Subtest: multiple patches
         ok 1 - Shouldn't have pending changes
@@ -170,10 +170,10 @@ ok 5 - status # time=585.67ms
         ok 4 - It should have the right changes
         ok 5 - The final state does not match up
         1..5
-    ok 3 - multiple patches # time=2.172ms
+    ok 3 - multiple patches # time=1.831ms
     
     1..3
-ok 6 - apply # time=311.126ms
+ok 6 - apply # time=234.711ms
 
 # Subtest: pending changes - push helpers
     # Subtest: 1 commit & 1 ref update
@@ -182,7 +182,7 @@ ok 6 - apply # time=311.126ms
         ok 3 - wrong pending commit
         ok 4 - wrong pending ref update
         1..4
-    ok 1 - 1 commit & 1 ref update # time=675.386ms
+    ok 1 - 1 commit & 1 ref update # time=632.334ms
     
     # Subtest: 2 commit & 1 ref update
         ok 1 - incorrect number of pending commits
@@ -190,7 +190,7 @@ ok 6 - apply # time=311.126ms
         ok 3 - wrong pending commits
         ok 4 - wrong pending ref update
         1..4
-    ok 2 - 2 commit & 1 ref update # time=9.24ms
+    ok 2 - 2 commit & 1 ref update # time=8.541ms
     
     # Subtest: 1 commit & 2 ref updates
         ok 1 - incorrect number of pending commits
@@ -198,7 +198,7 @@ ok 6 - apply # time=311.126ms
         ok 3 - wrong pending commits
         ok 4 - wrong pending ref update
         1..4
-    ok 3 - 1 commit & 2 ref updates # time=16.107ms
+    ok 3 - 1 commit & 2 ref updates # time=13.569ms
     
     # Subtest: 2 commit & 2 ref updates
         ok 1 - incorrect number of pending commits
@@ -206,7 +206,7 @@ ok 6 - apply # time=311.126ms
         ok 3 - wrong pending commits
         ok 4 - wrong pending ref update
         1..4
-    ok 4 - 2 commit & 2 ref updates # time=32.931ms
+    ok 4 - 2 commit & 2 ref updates # time=33.024ms
     
     # Subtest: 3 commit & 2 ref updates
         ok 1 - incorrect number of pending commits
@@ -214,7 +214,7 @@ ok 6 - apply # time=311.126ms
         ok 3 - wrong pending commits
         ok 4 - wrong pending ref update
         1..4
-    ok 5 - 3 commit & 2 ref updates # time=16.636ms
+    ok 5 - 3 commit & 2 ref updates # time=11.833ms
     
     # Subtest: 3 commit & 3 ref updates
         ok 1 - incorrect number of pending commits
@@ -222,7 +222,7 @@ ok 6 - apply # time=311.126ms
         ok 3 - wrong pending commits
         ok 4 - wrong pending ref update
         1..4
-    ok 6 - 3 commit & 3 ref updates # time=10.661ms
+    ok 6 - 3 commit & 3 ref updates # time=11.692ms
     
     # Subtest: after merge 1 commit & 3 ref updates
         ok 1 - incorrect number of pending commits
@@ -230,7 +230,7 @@ ok 6 - apply # time=311.126ms
         ok 3 - wrong pending commits
         ok 4 - wrong pending ref update
         1..4
-    ok 7 - after merge 1 commit & 3 ref updates # time=8.026ms
+    ok 7 - after merge 1 commit & 3 ref updates # time=10.797ms
     
     # Subtest: after merge 1 commit & 2 ref updates
         ok 1 - incorrect number of pending commits
@@ -238,7 +238,7 @@ ok 6 - apply # time=311.126ms
         ok 3 - wrong pending commits
         ok 4 - wrong pending ref update
         1..4
-    ok 8 - after merge 1 commit & 2 ref updates # time=7.048ms
+    ok 8 - after merge 1 commit & 2 ref updates # time=9.483ms
     
     # Subtest: no merge 1 commit & 1 ref updates
         ok 1 - incorrect number of pending commits
@@ -246,7 +246,7 @@ ok 6 - apply # time=311.126ms
         ok 3 - wrong pending commits
         ok 4 - wrong pending ref update
         1..4
-    ok 9 - no merge 1 commit & 1 ref updates # time=6.097ms
+    ok 9 - no merge 1 commit & 1 ref updates # time=5.398ms
     
     # Subtest: no merge no commit & 1 ref updates
         ok 1 - incorrect number of pending commits
@@ -254,7 +254,7 @@ ok 6 - apply # time=311.126ms
         ok 3 - wrong pending commits
         ok 4 - wrong pending ref update
         1..4
-    ok 10 - no merge no commit & 1 ref updates # time=3.489ms
+    ok 10 - no merge no commit & 1 ref updates # time=3.725ms
     
     # Subtest: local remote state is updated after push
         ok 1 - incorrect number of pending commits
@@ -264,9 +264,9 @@ ok 6 - apply # time=311.126ms
 local remote state is updated after push
         ok 5 - remote should be different after push
         1..5
-    ok 11 - local remote state is updated after push # time=5.247ms
+    ok 11 - local remote state is updated after push # time=5.175ms
     
     1..11
-ok 7 - pending changes - push helpers # time=884.975ms
+ok 7 - pending changes - push helpers # time=840.222ms
 
 1..7

package/.tap/test-results/src/tag.test.ts.tap

@@ -2,18 +2,18 @@ TAP version 14
 # Subtest: cannot tag on an empty repo
     ok 1 - expected to throw
     1..1
-ok 1 - cannot tag on an empty repo # time=31.484ms
+ok 1 - cannot tag on an empty repo # time=32.148ms
 
 # Subtest: can create simple tag pointing to HEAD
     ok 1 - should be equal
     ok 2 - tag is not pointing to expected commit
     ok 3 - reference was not present in history
     1..3
-ok 2 - can create simple tag pointing to HEAD # time=130.111ms
+ok 2 - can create simple tag pointing to HEAD # time=100.589ms
 
 # Subtest: cannot create tag with whitespace
     ok 1 - expected to throw
     1..1
-ok 3 - cannot create tag with whitespace # time=7.08ms
+ok 3 - cannot create tag with whitespace # time=7.565ms
 
 1..3

package/.tap/test-results/src/utils.test.ts.tap

@@ -3,42 +3,42 @@ TAP version 14
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 1 - author <email@domain.info> # time=5.511ms
+ok 1 - author <email@domain.info> # time=3.785ms
 
 # Subtest: author with space <email@domain.info>
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 2 - author with space <email@domain.info> # time=1.578ms
+ok 2 - author with space <email@domain.info> # time=0.666ms
 
 # Subtest: author @handle
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 3 - author @handle # time=1.317ms
+ok 3 - author @handle # time=0.45ms
 
 # Subtest: author with space @handle
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 4 - author with space @handle # time=1.095ms
+ok 4 - author with space @handle # time=0.405ms
 
 # Subtest: email@domain.info
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 5 - email@domain.info # time=1.872ms
+ok 5 - email@domain.info # time=0.569ms
 
 # Subtest: @handle
     ok 1 - should be equal
     ok 2 - should be equal
     1..2
-ok 6 - @handle # time=0.722ms
+ok 6 - @handle # time=0.612ms
 
 # Subtest: empty author
     ok 1 - expected to throw
     1..1
-ok 7 - empty author # time=3.485ms
+ok 7 - empty author # time=2.33ms
 
 # Subtest: mapPath
     # Subtest: find root
@@ -46,7 +46,7 @@ ok 7 - empty author # time=3.485ms
         ok 2 - root is not ancestor of commit
         ok 3 - path does not contain the right commit
         1..3
-    ok 1 - find root # time=118.47ms
+    ok 1 - find root # time=115.819ms
     
     # Subtest: finds full path to root
         ok 1 - path does not contain 1 commit
@@ -54,13 +54,13 @@ ok 7 - empty author # time=3.485ms
         ok 3 - path does not contain the right commit at 0
         ok 4 - path does not contain the right commit at 1
         1..4
-    ok 2 - finds full path to root # time=4.551ms
+    ok 2 - finds full path to root # time=4.71ms
     
     # Subtest: parent-to-child no ancestor
         ok 1 - path contains a commit
         ok 2 - child must not be an ancestor of parent
         1..2
-    ok 3 - parent-to-child no ancestor # time=3.971ms
+    ok 3 - parent-to-child no ancestor # time=4.017ms
     
     # Subtest: finds path across 2 branches
         ok 1 - path does not contain 1 commit
@@ -68,9 +68,9 @@ ok 7 - empty author # time=3.485ms
         ok 3 - path does not contain the right commit at 0
         ok 4 - path does not contain the right commit at 1
         1..4
-    ok 4 - finds path across 2 branches # time=4.799ms
+    ok 4 - finds path across 2 branches # time=4.932ms
     
     1..4
-ok 8 - mapPath # time=156.145ms
+ok 8 - mapPath # time=148.136ms
 
 1..8

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v0.15.4 (Tue Mar 24 2026)
+
+#### 🐛 Bug Fix
+
+- fix: tags shouldn't be moved with detached HEAD ([@nadilas](https://github.com/nadilas))
+
+#### Authors: 1
+
+- [@nadilas](https://github.com/nadilas)
+
+---
+
 # v0.15.3 (Sun Mar 15 2026)
 
 #### 🐛 Bug Fix

package/lib/repository.js

@@ -1,5 +1,5 @@
 import { applyPatch, compare, deepClone, JsonPatchError, validate, } from "fast-json-patch";
-import { brancheNameToRef, cleanRefValue, commitAtRefIn, createHeadRefValue, getLastRefPathElement, headValueRefPrefix, immutableArrayCopy, immutableMapCopy, refKeysAtCommit, localHeadPathPrefix, mapPath, mutableMapCopy, REFS_HEAD_KEY, REFS_MAIN_KEY, shaishToCommit, tagToRef, validateBranchName, validateRef, } from "./utils.js";
+import { brancheNameToRef, cleanRefValue, commitAtRefIn, createHeadRefValue, getLastRefPathElement, headValueRefPrefix, immutableArrayCopy, immutableMapCopy, refKeysAtCommit, localHeadPathPrefix, mapPath, mutableMapCopy, REFS_HEAD_KEY, REFS_MAIN_KEY, shaishToCommit, isTagRef, tagToRef, validateBranchName, validateRef, } from "./utils.js";
 import * as jsondiffpatch from 'jsondiffpatch';
 /**
  * A repository recording and managing the state transitions of an object
@@ -249,7 +249,9 @@ export class Repository {
         else {
             const [commit, isRef, refKey] = shaishToCommit(shaish, this.refs, this.commits);
             await this.moveTo(commit);
-            this.moveRef(REFS_HEAD_KEY, isRef && refKey !== undefined ? refKey : commit);
+            // Only follow branch refs. Tags produce detached HEAD (like git).
+            const isBranchRef = isRef && refKey !== undefined && !isTagRef(refKey);
+            this.moveRef(REFS_HEAD_KEY, isBranchRef ? refKey : commit);
         }
     }
     async commit(message, author, amend) {

package/package.json

@@ -4,7 +4,7 @@
     "type": "git",
     "url": "https://github.com/dotindustries/ogre.git"
   },
-  "version": "0.15.3",
+  "version": "0.15.4",
   "description": "Git-like repository for in-memory object versioning",
   "private": false,
   "main": "lib/index.js",
@@ -49,5 +49,5 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "gitHead": "c746013dd91c5154a25d0d617189c04ed81d8106"
+  "gitHead": "603470971151a33246e87fff83410e61a46364d4"
 }

package/src/checkout.test.ts

@@ -109,6 +109,50 @@ test("checkout and create new branch with at least 1 commit", async (t) => {
   );
 });
 
+test("checkout tag leaves HEAD detached", async (t) => {
+  const [repo] = await getBaseline();
+  repo.data.name = "new name";
+  const commitHash = await repo.commit("tagged change", testAuthor);
+  repo.tag("1.0.0");
+
+  // Move main forward so tag and main diverge
+  repo.data.description = "newer change";
+  await repo.commit("after tag", testAuthor);
+
+  // Checkout the tag
+  await repo.checkout("1.0.0");
+  t.equal(repo.branch(), "HEAD", "HEAD should be detached after tag checkout");
+  t.equal(repo.head(), commitHash, "HEAD should point to tagged commit hash");
+});
+
+test("commit after tag checkout does not move tag", async (t) => {
+  const [repo] = await getBaseline();
+  repo.data.name = "tagged";
+  const taggedCommit = await repo.commit("tagged change", testAuthor);
+  repo.tag("1.0.0");
+
+  await repo.checkout("1.0.0");
+
+  // Commit on detached HEAD
+  repo.data.description = "detached work";
+  const detachedCommit = await repo.commit("detached commit", testAuthor);
+
+  // Tag should NOT have moved
+  t.equal(
+    repo.ref("refs/tags/1.0.0"),
+    taggedCommit,
+    "tag should still point to original commit",
+  );
+  // HEAD should point to the new detached commit
+  t.equal(repo.head(), detachedCommit, "HEAD should point to detached commit");
+  // refs/heads/main should not have changed
+  t.equal(
+    repo.ref("refs/heads/main"),
+    taggedCommit,
+    "main should not move",
+  );
+});
+
 test("replacing default branch on empty master removes main", async (t) => {
   const cx: ComplexObject = {
     nested: [],

package/src/repository.ts

@@ -24,6 +24,7 @@ import {
   REFS_HEAD_KEY,
   REFS_MAIN_KEY,
   shaishToCommit,
+  isTagRef,
   tagToRef,
   validateBranchName,
   validateRef,
@@ -435,10 +436,9 @@ export class Repository<T extends { [k: PropertyKey]: any }>
         this.commits,
       );
       await this.moveTo(commit);
-      this.moveRef(
-        REFS_HEAD_KEY,
-        isRef && refKey !== undefined ? refKey : commit,
-      );
+      // Only follow branch refs. Tags produce detached HEAD (like git).
+      const isBranchRef = isRef && refKey !== undefined && !isTagRef(refKey);
+      this.moveRef(REFS_HEAD_KEY, isBranchRef ? refKey : commit);
     }
   }