gip-remote 1.2.5 → 1.2.7

package/index.js

@@ -210,9 +210,26 @@ class Remote extends ReadyResource {
       }
     }
 
-    // 4b. Insert file records (idempotent w.r.t. (branch, path) — acts as
-    //     upsert for paths whose blob/mode/metadata changed).
+    // 4b. Insert/update file records — but ONLY for paths whose blob or mode
+    //     actually changed. Earlier versions blindly upserted every file in
+    //     the new tree on every push, which overwrote the commit metadata of
+    //     untouched files with HEAD's author/message/timestamp. The visible
+    //     symptom: a tree view shows every file as "last modified by the
+    //     latest commit", so per-file timestamps become useless.
+    //
+    //     Skipping unchanged rows preserves the metadata of the commit that
+    //     last *actually* modified the file. New paths and modified paths
+    //     still take the current commit's metadata as before.
     for (const file of files) {
+      const existing = await this._db.get('@gip/files', {
+        branch: refName,
+        path: file.path
+      })
+      if (existing && existing.oid === file.oid && existing.mode === file.mode) {
+        // Same blob, same mode → file is unchanged in this commit. Leave
+        // the existing row untouched so its commit metadata stays accurate.
+        continue
+      }
       await this._db.insert('@gip/files', {
         branch: refName,
         path: file.path,
@@ -241,7 +258,21 @@ class Remote extends ReadyResource {
         objects: [...objects.keys()]
       })
     } else {
-      // 5b. Insert branch record
+      // 5b. Insert/update branch record.
+      //
+      // `objects` is the denormalized "everything reachable from this branch"
+      // set used by getRefObjects() at fetch time. CRITICAL: we must MERGE
+      // with the prior record's objects, not overwrite. A real git client
+      // sends a thin pack on follow-up pushes (only the new objects), so
+      // `objects.keys()` here would be e.g. just {commit B, new tree} —
+      // commit A and its tree from the previous push would be dropped from
+      // the list, and a fresh clone calling getRefObjects(headOfB) would be
+      // missing every parent commit. That's the "I cloned and lost a
+      // commit" symptom.
+      const prev = await this._db.get('@gip/branches', { name: refName })
+      const merged = new Set(prev ? prev.objects : [])
+      for (const k of objects.keys()) merged.add(k)
+
       await this._db.insert('@gip/branches', {
         name: refName,
         commitOid: oid,
@@ -249,7 +280,7 @@ class Remote extends ReadyResource {
         author: commit.author,
         message: commit.message,
         timestamp: commit.timestamp,
-        objects: [...objects.keys()]
+        objects: [...merged]
       })
 
       // 6. Set HEAD to first branch pushed (like git init)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gip-remote",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Git+Pear remote DB for handling git data",
   "main": "index.js",
   "scripts": {