isomorphic-git 1.10.2 → 1.11.0

package/browser-tests.json

@@ -1,8 +1,8 @@
 [
   "HeadlessChrome 0.0.0 (Linux 0.0.0)",
-  "Firefox 94.0.0 (Ubuntu 0.0.0)",
-  "Safari 13.1.0 (Mac OS X 10.15.4)",
+  "Firefox 96.0.0 (Ubuntu 0.0.0)",
+  "Chrome Mobile 96.0.4664 (Android 0.0.0)",
   "Chrome 79.0.3945 (Windows 10 0.0.0)",
-  "Mobile Safari 13.0.0 (iOS 13.0.0)",
-  "Chrome Mobile 94.0.4606 (Android 0.0.0)"
+  "Safari 13.1.0 (Mac OS X 10.15.4)",
+  "Mobile Safari 13.0.0 (iOS 13.0.0)"
 ]

package/index.cjs

@@ -1559,16 +1559,16 @@ class GitConfig {
           this.parsedConfig[configIndex] = modifiedConfig;
         }
       } else {
-        const sectionPath = path
-          .split('.')
-          .slice(0, -1)
-          .join('.')
-          .toLowerCase();
+        const pathSegments = path.split('.');
+        const section = pathSegments.shift().toLowerCase();
+        const name = pathSegments.pop();
+        const subsection = pathSegments.length
+          ? pathSegments.join('.').toLowerCase()
+          : undefined;
+        const sectionPath = subsection ? section + '.' + subsection : section;
         const sectionIndex = this.parsedConfig.findIndex(
           config => config.path === sectionPath
         );
-        const [section, subsection] = sectionPath.split('.');
-        const name = path.split('.').pop();
         const newConfig = {
           section,
           subsection,
@@ -3976,7 +3976,15 @@ class GitWalkerFs {
             oid = await shasum(
               GitObject.wrap({ type: 'blob', object: await entry.content() })
             );
-            if (stage && oid === stage.oid) {
+            // Update the stats in the index so we will get a "cache hit" next time
+            // 1) if we can (because the oid and mode are the same)
+            // 2) and only if we need to (because other stats differ)
+            if (
+              stage &&
+              oid === stage.oid &&
+              stats.mode === stage.mode &&
+              compareStats(stats, stage)
+            ) {
               index.insert({
                 filepath: entry._fullpath,
                 stats,
@@ -4034,7 +4042,7 @@ class GitIgnoreManager {
         filepath,
       },
     ];
-    const pieces = filepath.split('/');
+    const pieces = filepath.split('/').filter(Boolean);
     for (let i = 1; i < pieces.length; i++) {
       const folder = pieces.slice(0, i).join('/');
       const file = pieces.slice(i).join('/');
@@ -5543,6 +5551,7 @@ const worthWalking = (filepath, root) => {
  * @param {boolean} [args.noUpdateHead]
  * @param {boolean} [args.dryRun]
  * @param {boolean} [args.force]
+ * @param {boolean} [args.track]
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
  *
@@ -5560,6 +5569,7 @@ async function _checkout({
   noUpdateHead,
   dryRun,
   force,
+  track,
 }) {
   // Get tree oid
   let oid;
@@ -5577,11 +5587,13 @@ async function _checkout({
       gitdir,
       ref: remoteRef,
     });
-    // Set up remote tracking branch
-    const config = await GitConfigManager.get({ fs, gitdir });
-    await config.set(`branch.${ref}.remote`, remote);
-    await config.set(`branch.${ref}.merge`, `refs/heads/${ref}`);
-    await GitConfigManager.save({ fs, gitdir, config });
+    if (track) {
+      // Set up remote tracking branch
+      const config = await GitConfigManager.get({ fs, gitdir });
+      await config.set(`branch.${ref}.remote`, remote);
+      await config.set(`branch.${ref}.merge`, `refs/heads/${ref}`);
+      await GitConfigManager.save({ fs, gitdir, config });
+    }
     // Create a new branch that points at that same commit
     await GitRefManager.writeRef({
       fs,
@@ -6107,6 +6119,7 @@ async function analyze({
  * @param {boolean} [args.dryRun = false] - If true, simulates a checkout so you can test whether it would succeed.
  * @param {boolean} [args.force = false] - If true, conflicts will be ignored and files will be overwritten regardless of local changes.
  * @param {object} [args.cache] - a [cache](cache.md) object
+ * @param {object} [args.track] - If true, will not set the remote branch tracking information. Defaults to false.
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
  *
@@ -6154,6 +6167,7 @@ async function checkout({
   dryRun = false,
   force = false,
   cache = {},
+  track = true,
 }) {
   try {
     assertParameter('fs', fs);
@@ -6174,6 +6188,7 @@ async function checkout({
       noUpdateHead,
       dryRun,
       force,
+      track,
     })
   } catch (err) {
     err.caller = 'git.checkout';
@@ -6857,8 +6872,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.10.2',
-  agent: 'git/isomorphic-git@1.10.2',
+  version: '1.11.0',
+  agent: 'git/isomorphic-git@1.11.0',
 };
 
 class FIFO {

package/index.d.ts

@@ -945,6 +945,7 @@ export function branch({ fs, dir, gitdir, ref, checkout, }: {
  * @param {boolean} [args.dryRun = false] - If true, simulates a checkout so you can test whether it would succeed.
  * @param {boolean} [args.force = false] - If true, conflicts will be ignored and files will be overwritten regardless of local changes.
  * @param {object} [args.cache] - a [cache](cache.md) object
+ * @param {object} [args.track] - If true, will not set the remote branch tracking information. Defaults to false.
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
  *
@@ -979,7 +980,7 @@ export function branch({ fs, dir, gitdir, ref, checkout, }: {
  * })
  * console.log('done')
  */
-export function checkout({ fs, onProgress, dir, gitdir, remote, ref: _ref, filepaths, noCheckout, noUpdateHead, dryRun, force, cache, }: {
+export function checkout({ fs, onProgress, dir, gitdir, remote, ref: _ref, filepaths, noCheckout, noUpdateHead, dryRun, force, cache, track, }: {
     fs: CallbackFsClient | PromiseFsClient;
     onProgress?: ProgressCallback;
     dir: string;
@@ -992,6 +993,7 @@ export function checkout({ fs, onProgress, dir, gitdir, remote, ref: _ref, filep
     dryRun?: boolean;
     force?: boolean;
     cache?: any;
+    track?: any;
 }): Promise<void>;
 /**
  * Clone a repository

package/index.js

@@ -1553,16 +1553,16 @@ class GitConfig {
           this.parsedConfig[configIndex] = modifiedConfig;
         }
       } else {
-        const sectionPath = path
-          .split('.')
-          .slice(0, -1)
-          .join('.')
-          .toLowerCase();
+        const pathSegments = path.split('.');
+        const section = pathSegments.shift().toLowerCase();
+        const name = pathSegments.pop();
+        const subsection = pathSegments.length
+          ? pathSegments.join('.').toLowerCase()
+          : undefined;
+        const sectionPath = subsection ? section + '.' + subsection : section;
         const sectionIndex = this.parsedConfig.findIndex(
           config => config.path === sectionPath
         );
-        const [section, subsection] = sectionPath.split('.');
-        const name = path.split('.').pop();
         const newConfig = {
           section,
           subsection,
@@ -3970,7 +3970,15 @@ class GitWalkerFs {
             oid = await shasum(
               GitObject.wrap({ type: 'blob', object: await entry.content() })
             );
-            if (stage && oid === stage.oid) {
+            // Update the stats in the index so we will get a "cache hit" next time
+            // 1) if we can (because the oid and mode are the same)
+            // 2) and only if we need to (because other stats differ)
+            if (
+              stage &&
+              oid === stage.oid &&
+              stats.mode === stage.mode &&
+              compareStats(stats, stage)
+            ) {
               index.insert({
                 filepath: entry._fullpath,
                 stats,
@@ -4028,7 +4036,7 @@ class GitIgnoreManager {
         filepath,
       },
     ];
-    const pieces = filepath.split('/');
+    const pieces = filepath.split('/').filter(Boolean);
     for (let i = 1; i < pieces.length; i++) {
       const folder = pieces.slice(0, i).join('/');
       const file = pieces.slice(i).join('/');
@@ -5537,6 +5545,7 @@ const worthWalking = (filepath, root) => {
  * @param {boolean} [args.noUpdateHead]
  * @param {boolean} [args.dryRun]
  * @param {boolean} [args.force]
+ * @param {boolean} [args.track]
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
  *
@@ -5554,6 +5563,7 @@ async function _checkout({
   noUpdateHead,
   dryRun,
   force,
+  track,
 }) {
   // Get tree oid
   let oid;
@@ -5571,11 +5581,13 @@ async function _checkout({
       gitdir,
       ref: remoteRef,
     });
-    // Set up remote tracking branch
-    const config = await GitConfigManager.get({ fs, gitdir });
-    await config.set(`branch.${ref}.remote`, remote);
-    await config.set(`branch.${ref}.merge`, `refs/heads/${ref}`);
-    await GitConfigManager.save({ fs, gitdir, config });
+    if (track) {
+      // Set up remote tracking branch
+      const config = await GitConfigManager.get({ fs, gitdir });
+      await config.set(`branch.${ref}.remote`, remote);
+      await config.set(`branch.${ref}.merge`, `refs/heads/${ref}`);
+      await GitConfigManager.save({ fs, gitdir, config });
+    }
     // Create a new branch that points at that same commit
     await GitRefManager.writeRef({
       fs,
@@ -6101,6 +6113,7 @@ async function analyze({
  * @param {boolean} [args.dryRun = false] - If true, simulates a checkout so you can test whether it would succeed.
  * @param {boolean} [args.force = false] - If true, conflicts will be ignored and files will be overwritten regardless of local changes.
  * @param {object} [args.cache] - a [cache](cache.md) object
+ * @param {object} [args.track] - If true, will not set the remote branch tracking information. Defaults to false.
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
  *
@@ -6148,6 +6161,7 @@ async function checkout({
   dryRun = false,
   force = false,
   cache = {},
+  track = true,
 }) {
   try {
     assertParameter('fs', fs);
@@ -6168,6 +6182,7 @@ async function checkout({
       noUpdateHead,
       dryRun,
       force,
+      track,
     })
   } catch (err) {
     err.caller = 'git.checkout';
@@ -6851,8 +6866,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.10.2',
-  agent: 'git/isomorphic-git@1.10.2',
+  version: '1.11.0',
+  agent: 'git/isomorphic-git@1.11.0',
 };
 
 class FIFO {

package/index.umd.min.d.ts

@@ -945,6 +945,7 @@ export function branch({ fs, dir, gitdir, ref, checkout, }: {
  * @param {boolean} [args.dryRun = false] - If true, simulates a checkout so you can test whether it would succeed.
  * @param {boolean} [args.force = false] - If true, conflicts will be ignored and files will be overwritten regardless of local changes.
  * @param {object} [args.cache] - a [cache](cache.md) object
+ * @param {object} [args.track] - If true, will not set the remote branch tracking information. Defaults to false.
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
  *
@@ -979,7 +980,7 @@ export function branch({ fs, dir, gitdir, ref, checkout, }: {
  * })
  * console.log('done')
  */
-export function checkout({ fs, onProgress, dir, gitdir, remote, ref: _ref, filepaths, noCheckout, noUpdateHead, dryRun, force, cache, }: {
+export function checkout({ fs, onProgress, dir, gitdir, remote, ref: _ref, filepaths, noCheckout, noUpdateHead, dryRun, force, cache, track, }: {
     fs: CallbackFsClient | PromiseFsClient;
     onProgress?: ProgressCallback;
     dir: string;
@@ -992,6 +993,7 @@ export function checkout({ fs, onProgress, dir, gitdir, remote, ref: _ref, filep
     dryRun?: boolean;
     force?: boolean;
     cache?: any;
+    track?: any;
 }): Promise<void>;
 /**
  * Clone a repository