pinokiod 5.0.10 → 5.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "5.0.10",
+  "version": "5.0.12",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -1398,6 +1398,23 @@ class Server {
     let statusMatrix = await git.statusMatrix({ dir, fs })
     statusMatrix = statusMatrix.filter(Boolean)
 
+    let headOid = null
+    const getHeadOid = async () => {
+      if (headOid) return headOid
+      headOid = await git.resolveRef({ fs, dir, ref: 'HEAD' })
+      return headOid
+    }
+    const readNormalized = async (source, filepath) => {
+      if (source === 'head') {
+        const oid = await getHeadOid()
+        const { blob } = await git.readBlob({ fs, dir, oid, filepath })
+        return normalize(Buffer.from(blob).toString('utf8'))
+      } else {
+        const content = await fs.promises.readFile(path.join(dir, filepath), 'utf8')
+        return normalize(content)
+      }
+    }
+
     const changes = []
     for (const [filepath, head, workdir, stage] of statusMatrix) {
       if (!shouldIncludePath(filepath)) {
@@ -1422,6 +1439,19 @@ class Server {
         continue
       }
 
+      // Skip entries where HEAD and worktree match after normalization
+      if (status && status.startsWith('modified')) {
+        try {
+          const headContent = await readNormalized('head', filepath)
+          const worktreeContent = await readNormalized('worktree', filepath)
+          if (headContent === worktreeContent) {
+            continue
+          }
+        } catch (_) {
+          // fall through if comparison fails
+        }
+      }
+
       const webpath = "/asset/" + path.relative(this.kernel.homedir, absolutePath)
 
       changes.push({
@@ -7254,7 +7284,7 @@ class Server {
           } catch (e) {
             newContent = "";
           }
-          const diffs = diff.diffLines(oldContent, newContent);
+          const diffs = diff.diffLines(normalize(oldContent), normalize(newContent));
           change = Util.diffLinesWithContext(diffs, 5);
         } else {
           const commitOid = await this.kernel.git.resolveCommitOid(dir, req.params.ref);
@@ -7276,7 +7306,7 @@ class Server {
           } catch (e) {
             console.log("E1", e)
           } // File might not exist
-          const diffs = diff.diffLines(oldContent, newContent);
+          const diffs = diff.diffLines(normalize(oldContent), normalize(newContent));
           change = Util.diffLinesWithContext(diffs, 5);
         }
       }