fix(merge): Cannot set property 'oid' of undefined (#1312)

isomorphic-git · Feb 12, 2021 · 89c0da7 · 89c0da7
1 parent b102e1d
commit 89c0da7
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/utils/mergeTree.js b/src/utils/mergeTree.js
@@ -121,6 +121,9 @@ export async function mergeTree({
     reduce: async (parent, children) => {
       const entries = children.filter(Boolean) // remove undefineds
 
+      // if the parent was deleted, the children have to go
+      if (!parent) return
+
       // automatically delete directories if they have been emptied
       if (parent && parent.type === 'tree' && entries.length === 0) return