isomorphic-git 1.31.1 → 1.32.0

package/browser-tests.json

@@ -1,8 +1,10 @@
 [
-  "Chrome Headless 79.0.3945.0 (Linux x86_64)",
+  "X Chrome Headless 79.0.3945.0 (Linux x86_64)",
   "Firefox 139.0 (Linux x86_64)",
-  "Edge 79.0.309.65 (Windows 10)",
   "Chrome 135.0.0.0 (Android 10)",
+  "Edge 79.0.309.65 (Windows 10)",
+  "Mobile Safari 14.0 (iOS 14.0.1)",
   "Safari 14.1 (Mac OS 10.15.7)",
-  "Mobile Safari 14.0 (iOS 14.0.1)"
+  "Chrome Headless 79.0.3945.0 (Linux x86_64)",
+  "Chrome 135.0.0.0 (Android 10)"
 ]

package/index.cjs

@@ -7776,8 +7776,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.31.1',
-  agent: 'git/isomorphic-git@1.31.1',
+  version: '1.32.0',
+  agent: 'git/isomorphic-git@1.32.0',
 };
 
 class FIFO {
@@ -9440,10 +9440,8 @@ async function mergeTree({
           // Modifications
           if (
             ours &&
-            base &&
             theirs &&
             (await ours.type()) === 'blob' &&
-            (await base.type()) === 'blob' &&
             (await theirs.type()) === 'blob'
           ) {
             return mergeBlobs({
@@ -9462,13 +9460,18 @@ async function mergeTree({
                 unmergedFiles.push(filepath);
                 bothModified.push(filepath);
                 if (!abortOnConflict) {
-                  const baseOid = await base.oid();
+                  let baseOid = '';
+                  if (base && (await base.type()) === 'blob') {
+                    baseOid = await base.oid();
+                  }
                   const ourOid = await ours.oid();
                   const theirOid = await theirs.oid();
 
                   index.delete({ filepath });
 
-                  index.insert({ filepath, oid: baseOid, stage: 1 });
+                  if (baseOid) {
+                    index.insert({ filepath, oid: baseOid, stage: 1 });
+                  }
                   index.insert({ filepath, oid: ourOid, stage: 2 });
                   index.insert({ filepath, oid: theirOid, stage: 3 });
                 }
@@ -9655,10 +9658,16 @@ async function mergeBlobs({
   const type = 'blob';
   // Compute the new mode.
   // Since there are ONLY two valid blob modes ('100755' and '100644') it boils down to this
+  let baseMode = '100755';
+  let baseOid = '';
+  let baseContent = '';
+  if (base && (await base.type()) === 'blob') {
+    baseMode = await base.mode();
+    baseOid = await base.oid();
+    baseContent = Buffer.from(await base.content()).toString('utf8');
+  }
   const mode =
-    (await base.mode()) === (await ours.mode())
-      ? await theirs.mode()
-      : await ours.mode();
+    baseMode === (await ours.mode()) ? await theirs.mode() : await ours.mode();
   // The trivial case: nothing to merge except maybe mode
   if ((await ours.oid()) === (await theirs.oid())) {
     return {
@@ -9667,13 +9676,13 @@ async function mergeBlobs({
     }
   }
   // if only one side made oid changes, return that side's oid
-  if ((await ours.oid()) === (await base.oid())) {
+  if ((await ours.oid()) === baseOid) {
     return {
       cleanMerge: true,
       mergeResult: { mode, path, oid: await theirs.oid(), type },
     }
   }
-  if ((await theirs.oid()) === (await base.oid())) {
+  if ((await theirs.oid()) === baseOid) {
     return {
       cleanMerge: true,
       mergeResult: { mode, path, oid: await ours.oid(), type },
@@ -9681,7 +9690,6 @@ async function mergeBlobs({
   }
   // if both sides made changes do a merge
   const ourContent = Buffer.from(await ours.content()).toString('utf8');
-  const baseContent = Buffer.from(await base.content()).toString('utf8');
   const theirContent = Buffer.from(await theirs.content()).toString('utf8');
   const { mergedText, cleanMerge } = await mergeDriver({
     branches: [baseName, ourName, theirName],
@@ -9739,6 +9747,7 @@ async function mergeBlobs({
  * @param {string} [args.signingKey]
  * @param {SignCallback} [args.onSign] - a PGP signing implementation
  * @param {MergeDriverCallback} [args.mergeDriver]
+ * @param {boolean} args.allowUnrelatedHistories
  *
  * @returns {Promise<MergeResult>} Resolves to a description of the merge operation
  *
@@ -9761,6 +9770,7 @@ async function _merge({
   signingKey,
   onSign,
   mergeDriver,
+  allowUnrelatedHistories = false,
 }) {
   if (ours === undefined) {
     ours = await _currentBranch({ fs, gitdir, fullname: true });
@@ -9793,8 +9803,13 @@ async function _merge({
     oids: [ourOid, theirOid],
   });
   if (baseOids.length !== 1) {
-    // TODO: Recursive Merge strategy
-    throw new MergeNotSupportedError()
+    if (baseOids.length === 0 && allowUnrelatedHistories) {
+      // 4b825…  == the empty tree used by git
+      baseOids.push('4b825dc642cb6eb9a060e54bf8d69288fbee4904');
+    } else {
+      // TODO: Recursive Merge strategy
+      throw new MergeNotSupportedError()
+    }
   }
   const baseOid = baseOids[0];
   // handle fast-forward case
@@ -12017,6 +12032,7 @@ async function log({
  * @param {string} [args.signingKey] - passed to [commit](commit.md) when creating a merge commit
  * @param {object} [args.cache] - a [cache](cache.md) object
  * @param {MergeDriverCallback} [args.mergeDriver] - a [merge driver](mergeDriver.md) implementation
+ * @param {boolean} [args.allowUnrelatedHistories = false] - If true, allows merging histories of two branches that started their lives independently.
  *
  * @returns {Promise<MergeResult>} Resolves to a description of the merge operation
  * @see MergeResult
@@ -12049,6 +12065,7 @@ async function merge({
   signingKey,
   cache = {},
   mergeDriver,
+  allowUnrelatedHistories = false,
 }) {
   try {
     assertParameter('fs', _fs);
@@ -12090,6 +12107,7 @@ async function merge({
       signingKey,
       onSign,
       mergeDriver,
+      allowUnrelatedHistories,
     })
   } catch (err) {
     err.caller = 'git.merge';

package/index.d.ts

@@ -2245,6 +2245,7 @@ export function log({ fs, dir, gitdir, filepath, ref, depth, since, force, follo
  * @param {string} [args.signingKey] - passed to [commit](commit.md) when creating a merge commit
  * @param {object} [args.cache] - a [cache](cache.md) object
  * @param {MergeDriverCallback} [args.mergeDriver] - a [merge driver](mergeDriver.md) implementation
+ * @param {boolean} [args.allowUnrelatedHistories = false] - If true, allows merging histories of two branches that started their lives independently.
  *
  * @returns {Promise<MergeResult>} Resolves to a description of the merge operation
  * @see MergeResult
@@ -2259,7 +2260,7 @@ export function log({ fs, dir, gitdir, filepath, ref, depth, since, force, follo
  * console.log(m)
  *
  */
-export function merge({ fs: _fs, onSign, dir, gitdir, ours, theirs, fastForward, fastForwardOnly, dryRun, noUpdateBranch, abortOnConflict, message, author: _author, committer: _committer, signingKey, cache, mergeDriver, }: {
+export function merge({ fs: _fs, onSign, dir, gitdir, ours, theirs, fastForward, fastForwardOnly, dryRun, noUpdateBranch, abortOnConflict, message, author: _author, committer: _committer, signingKey, cache, mergeDriver, allowUnrelatedHistories, }: {
     fs: FsClient;
     onSign?: SignCallback | undefined;
     dir?: string | undefined;
@@ -2287,6 +2288,7 @@ export function merge({ fs: _fs, onSign, dir, gitdir, ours, theirs, fastForward,
     signingKey?: string | undefined;
     cache?: object;
     mergeDriver?: MergeDriverCallback | undefined;
+    allowUnrelatedHistories?: boolean | undefined;
 }): Promise<MergeResult>;
 /**
  *

package/index.js

@@ -7770,8 +7770,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.31.1',
-  agent: 'git/isomorphic-git@1.31.1',
+  version: '1.32.0',
+  agent: 'git/isomorphic-git@1.32.0',
 };
 
 class FIFO {
@@ -9434,10 +9434,8 @@ async function mergeTree({
           // Modifications
           if (
             ours &&
-            base &&
             theirs &&
             (await ours.type()) === 'blob' &&
-            (await base.type()) === 'blob' &&
             (await theirs.type()) === 'blob'
           ) {
             return mergeBlobs({
@@ -9456,13 +9454,18 @@ async function mergeTree({
                 unmergedFiles.push(filepath);
                 bothModified.push(filepath);
                 if (!abortOnConflict) {
-                  const baseOid = await base.oid();
+                  let baseOid = '';
+                  if (base && (await base.type()) === 'blob') {
+                    baseOid = await base.oid();
+                  }
                   const ourOid = await ours.oid();
                   const theirOid = await theirs.oid();
 
                   index.delete({ filepath });
 
-                  index.insert({ filepath, oid: baseOid, stage: 1 });
+                  if (baseOid) {
+                    index.insert({ filepath, oid: baseOid, stage: 1 });
+                  }
                   index.insert({ filepath, oid: ourOid, stage: 2 });
                   index.insert({ filepath, oid: theirOid, stage: 3 });
                 }
@@ -9649,10 +9652,16 @@ async function mergeBlobs({
   const type = 'blob';
   // Compute the new mode.
   // Since there are ONLY two valid blob modes ('100755' and '100644') it boils down to this
+  let baseMode = '100755';
+  let baseOid = '';
+  let baseContent = '';
+  if (base && (await base.type()) === 'blob') {
+    baseMode = await base.mode();
+    baseOid = await base.oid();
+    baseContent = Buffer.from(await base.content()).toString('utf8');
+  }
   const mode =
-    (await base.mode()) === (await ours.mode())
-      ? await theirs.mode()
-      : await ours.mode();
+    baseMode === (await ours.mode()) ? await theirs.mode() : await ours.mode();
   // The trivial case: nothing to merge except maybe mode
   if ((await ours.oid()) === (await theirs.oid())) {
     return {
@@ -9661,13 +9670,13 @@ async function mergeBlobs({
     }
   }
   // if only one side made oid changes, return that side's oid
-  if ((await ours.oid()) === (await base.oid())) {
+  if ((await ours.oid()) === baseOid) {
     return {
       cleanMerge: true,
       mergeResult: { mode, path, oid: await theirs.oid(), type },
     }
   }
-  if ((await theirs.oid()) === (await base.oid())) {
+  if ((await theirs.oid()) === baseOid) {
     return {
       cleanMerge: true,
       mergeResult: { mode, path, oid: await ours.oid(), type },
@@ -9675,7 +9684,6 @@ async function mergeBlobs({
   }
   // if both sides made changes do a merge
   const ourContent = Buffer.from(await ours.content()).toString('utf8');
-  const baseContent = Buffer.from(await base.content()).toString('utf8');
   const theirContent = Buffer.from(await theirs.content()).toString('utf8');
   const { mergedText, cleanMerge } = await mergeDriver({
     branches: [baseName, ourName, theirName],
@@ -9733,6 +9741,7 @@ async function mergeBlobs({
  * @param {string} [args.signingKey]
  * @param {SignCallback} [args.onSign] - a PGP signing implementation
  * @param {MergeDriverCallback} [args.mergeDriver]
+ * @param {boolean} args.allowUnrelatedHistories
  *
  * @returns {Promise<MergeResult>} Resolves to a description of the merge operation
  *
@@ -9755,6 +9764,7 @@ async function _merge({
   signingKey,
   onSign,
   mergeDriver,
+  allowUnrelatedHistories = false,
 }) {
   if (ours === undefined) {
     ours = await _currentBranch({ fs, gitdir, fullname: true });
@@ -9787,8 +9797,13 @@ async function _merge({
     oids: [ourOid, theirOid],
   });
   if (baseOids.length !== 1) {
-    // TODO: Recursive Merge strategy
-    throw new MergeNotSupportedError()
+    if (baseOids.length === 0 && allowUnrelatedHistories) {
+      // 4b825…  == the empty tree used by git
+      baseOids.push('4b825dc642cb6eb9a060e54bf8d69288fbee4904');
+    } else {
+      // TODO: Recursive Merge strategy
+      throw new MergeNotSupportedError()
+    }
   }
   const baseOid = baseOids[0];
   // handle fast-forward case
@@ -12011,6 +12026,7 @@ async function log({
  * @param {string} [args.signingKey] - passed to [commit](commit.md) when creating a merge commit
  * @param {object} [args.cache] - a [cache](cache.md) object
  * @param {MergeDriverCallback} [args.mergeDriver] - a [merge driver](mergeDriver.md) implementation
+ * @param {boolean} [args.allowUnrelatedHistories = false] - If true, allows merging histories of two branches that started their lives independently.
  *
  * @returns {Promise<MergeResult>} Resolves to a description of the merge operation
  * @see MergeResult
@@ -12043,6 +12059,7 @@ async function merge({
   signingKey,
   cache = {},
   mergeDriver,
+  allowUnrelatedHistories = false,
 }) {
   try {
     assertParameter('fs', _fs);
@@ -12084,6 +12101,7 @@ async function merge({
       signingKey,
       onSign,
       mergeDriver,
+      allowUnrelatedHistories,
     })
   } catch (err) {
     err.caller = 'git.merge';

package/index.umd.min.d.ts

@@ -2245,6 +2245,7 @@ export function log({ fs, dir, gitdir, filepath, ref, depth, since, force, follo
  * @param {string} [args.signingKey] - passed to [commit](commit.md) when creating a merge commit
  * @param {object} [args.cache] - a [cache](cache.md) object
  * @param {MergeDriverCallback} [args.mergeDriver] - a [merge driver](mergeDriver.md) implementation
+ * @param {boolean} [args.allowUnrelatedHistories = false] - If true, allows merging histories of two branches that started their lives independently.
  *
  * @returns {Promise<MergeResult>} Resolves to a description of the merge operation
  * @see MergeResult
@@ -2259,7 +2260,7 @@ export function log({ fs, dir, gitdir, filepath, ref, depth, since, force, follo
  * console.log(m)
  *
  */
-export function merge({ fs: _fs, onSign, dir, gitdir, ours, theirs, fastForward, fastForwardOnly, dryRun, noUpdateBranch, abortOnConflict, message, author: _author, committer: _committer, signingKey, cache, mergeDriver, }: {
+export function merge({ fs: _fs, onSign, dir, gitdir, ours, theirs, fastForward, fastForwardOnly, dryRun, noUpdateBranch, abortOnConflict, message, author: _author, committer: _committer, signingKey, cache, mergeDriver, allowUnrelatedHistories, }: {
     fs: FsClient;
     onSign?: SignCallback | undefined;
     dir?: string | undefined;
@@ -2287,6 +2288,7 @@ export function merge({ fs: _fs, onSign, dir, gitdir, ours, theirs, fastForward,
     signingKey?: string | undefined;
     cache?: object;
     mergeDriver?: MergeDriverCallback | undefined;
+    allowUnrelatedHistories?: boolean | undefined;
 }): Promise<MergeResult>;
 /**
  *