@openvcs/git-plugin 0.3.2-edge.20260530.116 → 0.3.2-edge.20260531.120

package/bin/git.js

@@ -377,19 +377,18 @@ export class GitCommand {
         const theirs = this.run(['show', `:3:${path}`]);
         const base = this.run(['show', `:1:${path}`]);
         if (ours.status !== 0 || theirs.status !== 0) {
-            return { path, ours: null, theirs: null, base: null, binary: false, lfs_pointer: false };
+            return { path, ours: null, theirs: null, base: null, binary: false };
         }
         const oursContent = ours.stdout;
-        const lfs_pointer = ours.stdout.includes('version https://git-lfs.github.com/spec/v1') ||
+        const lfsPointer = ours.stdout.includes('version https://git-lfs.github.com/spec/v1') ||
             theirs.stdout.includes('version https://git-lfs.github.com/spec/v1');
-        const binary = !lfs_pointer && (oursContent.startsWith('Binary\0') || oursContent.includes('\0'));
+        const binary = !lfsPointer && (oursContent.startsWith('Binary\0') || oursContent.includes('\0'));
         return {
             path,
             ours: ours.stdout,
             theirs: theirs.stdout,
             base: base.status === 0 ? base.stdout : null,
             binary,
-            lfs_pointer,
         };
     }
     checkoutConflictSide(path, side) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openvcs/git-plugin",
-  "version": "0.3.2-edge.20260530.116",
+  "version": "0.3.2-edge.20260531.120",
   "description": "Git VCS backend plugin for OpenVCS",
   "author": "OpenVCS Contributors",
   "license": "GPL-3.0-or-later",
@@ -35,7 +35,7 @@
         }
       ]
     },
-    "version": "0.3.2-edge.20260530.116"
+    "version": "0.3.2-edge.20260531.120"
   },
   "scripts": {
     "lint": "tsc -p tsconfig.json --noEmit",

package/src/git.ts

@@ -65,7 +65,6 @@ export interface ConflictDetails {
   theirs: string | null;
   base: string | null;
   binary: boolean;
-  lfs_pointer: boolean;
 }
 
 export interface StashEntry {
@@ -528,15 +527,15 @@ export class GitCommand {
     const base = this.run(['show', `:1:${path}`]);
 
     if (ours.status !== 0 || theirs.status !== 0) {
-      return { path, ours: null, theirs: null, base: null, binary: false, lfs_pointer: false };
+      return { path, ours: null, theirs: null, base: null, binary: false };
     }
 
     const oursContent = ours.stdout;
-    const lfs_pointer =
+    const lfsPointer =
       ours.stdout.includes('version https://git-lfs.github.com/spec/v1') ||
       theirs.stdout.includes('version https://git-lfs.github.com/spec/v1');
 
-    const binary = !lfs_pointer && (oursContent.startsWith('Binary\0') || oursContent.includes('\0'));
+    const binary = !lfsPointer && (oursContent.startsWith('Binary\0') || oursContent.includes('\0'));
 
     return {
       path,
@@ -544,7 +543,6 @@ export class GitCommand {
       theirs: theirs.stdout,
       base: base.status === 0 ? base.stdout : null,
       binary,
-      lfs_pointer,
     };
   }