isomorphic-git 1.41.2 → 1.41.4

package/index.cjs

@@ -7093,6 +7093,7 @@ const worthWalking = (filepath, root) => {
  * @param {boolean} [args.dryRun]
  * @param {boolean} [args.force]
  * @param {boolean} [args.track]
+ * @param {boolean} [args.restoreFromIndex]
  * @param {boolean} [args.nonBlocking]
  * @param {number} [args.batchSize]
  *
@@ -7114,6 +7115,7 @@ async function _checkout({
   dryRun,
   force,
   track = true,
+  restoreFromIndex = false,
   nonBlocking = false,
   batchSize = 100,
 }) {
@@ -7173,6 +7175,7 @@ async function _checkout({
         ref,
         force,
         filepaths,
+        restoreFromIndex,
       });
     } catch (err) {
       // Throw a more helpful error message for this common mistake.
@@ -7465,6 +7468,7 @@ async function analyze({
   ref,
   force,
   filepaths,
+  restoreFromIndex,
 }) {
   let count = 0;
   return _walk({
@@ -7472,7 +7476,7 @@ async function analyze({
     cache,
     dir,
     gitdir,
-    trees: [TREE({ ref }), WORKDIR(), STAGE()],
+    trees: [restoreFromIndex ? STAGE() : TREE({ ref }), WORKDIR(), STAGE()],
     map: async function (fullpath, [commit, workdir, stage]) {
       if (fullpath === '.') return
       // match against base paths
@@ -7497,7 +7501,12 @@ async function analyze({
         // Ignore workdir files that are not tracked and not part of the new commit.
         case '001':
           // OK, make an exception for explicitly named files.
-          if (force && filepaths && filepaths.includes(fullpath)) {
+          if (
+            !restoreFromIndex &&
+            force &&
+            filepaths &&
+            filepaths.includes(fullpath)
+          ) {
             return ['delete', fullpath]
           }
           return
@@ -7840,7 +7849,7 @@ async function batchAllSettled(operationName, tasks, onProgress, batchSize) {
  * @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
  * @param {string} [args.gitdir=join(dir,'.git')] - [required] The [git directory](dir-vs-gitdir.md) path
  * @param {string} [args.ref = 'HEAD'] - Source to checkout files from
- * @param {string[]} [args.filepaths] - Limit the checkout to the given files and directories
+ * @param {string[]} [args.filepaths] - Limit the checkout to the given files and directories. If `ref` is not provided, restore them from the index.
  * @param {string} [args.remote = 'origin'] - Which remote repository to use
  * @param {boolean} [args.noCheckout = false] - If true, will update HEAD but won't update the working directory
  * @param {boolean} [args.noUpdateHead] - If true, will update the working directory but won't update HEAD. Defaults to `false` when `ref` is provided, and `true` if `ref` is not provided.
@@ -7863,7 +7872,7 @@ async function batchAllSettled(operationName, tasks, onProgress, batchSize) {
  * console.log('done')
  *
  * @example
- * // restore the 'docs' and 'src/docs' folders to the way they were, overwriting any changes
+ * // restore the 'docs' and 'src/docs' folders from the index, overwriting any unstaged changes
  * await git.checkout({
  *   fs,
  *   dir: '/tutorial',
@@ -7908,6 +7917,8 @@ async function checkout({
     assertParameter('gitdir', gitdir);
 
     const ref = _ref || 'HEAD';
+    const restoreFromIndex =
+      _ref === undefined && filepaths != null && filepaths.length > 0;
     const fsp = new FileSystem(fs);
     const updatedGitdir = await discoverGitdir({ fsp, dotgit: gitdir });
     return await _checkout({
@@ -7925,6 +7936,7 @@ async function checkout({
       dryRun,
       force,
       track,
+      restoreFromIndex,
       nonBlocking,
       batchSize,
     })
@@ -9700,8 +9712,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.41.2',
-  agent: 'git/isomorphic-git@1.41.2',
+  version: '1.41.4',
+  agent: 'git/isomorphic-git@1.41.4',
 };
 
 class FIFO {
@@ -9778,6 +9790,11 @@ function splitLines(input) {
       while (true) {
         const i = findSplit(tmp);
         if (i === -1) break
+        // A '\r' at the very end may be the first half of a '\r\n' whose '\n'
+        // arrives in the next chunk. Hold it back until there is a character
+        // after it to look at, otherwise the same bytes split into two lines
+        // or one depending only on where the socket boundary fell.
+        if (i === tmp.length && tmp[i - 1] === '\r') break
         output.write(tmp.slice(0, i));
         tmp = tmp.slice(i);
       }

package/index.d.cts

@@ -931,7 +931,7 @@ export function branch({ fs, dir, gitdir, ref, object, checkout, force, }: {
  * @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
  * @param {string} [args.gitdir=join(dir,'.git')] - [required] The [git directory](dir-vs-gitdir.md) path
  * @param {string} [args.ref = 'HEAD'] - Source to checkout files from
- * @param {string[]} [args.filepaths] - Limit the checkout to the given files and directories
+ * @param {string[]} [args.filepaths] - Limit the checkout to the given files and directories. If `ref` is not provided, restore them from the index.
  * @param {string} [args.remote = 'origin'] - Which remote repository to use
  * @param {boolean} [args.noCheckout = false] - If true, will update HEAD but won't update the working directory
  * @param {boolean} [args.noUpdateHead] - If true, will update the working directory but won't update HEAD. Defaults to `false` when `ref` is provided, and `true` if `ref` is not provided.
@@ -954,7 +954,7 @@ export function branch({ fs, dir, gitdir, ref, object, checkout, force, }: {
  * console.log('done')
  *
  * @example
- * // restore the 'docs' and 'src/docs' folders to the way they were, overwriting any changes
+ * // restore the 'docs' and 'src/docs' folders from the index, overwriting any unstaged changes
  * await git.checkout({
  *   fs,
  *   dir: '/tutorial',

package/index.d.ts

@@ -1003,7 +1003,7 @@ export function branch({ fs, dir, gitdir, ref, object, checkout, force, }: {
  * @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
  * @param {string} [args.gitdir=join(dir,'.git')] - [required] The [git directory](dir-vs-gitdir.md) path
  * @param {string} [args.ref = 'HEAD'] - Source to checkout files from
- * @param {string[]} [args.filepaths] - Limit the checkout to the given files and directories
+ * @param {string[]} [args.filepaths] - Limit the checkout to the given files and directories. If `ref` is not provided, restore them from the index.
  * @param {string} [args.remote = 'origin'] - Which remote repository to use
  * @param {boolean} [args.noCheckout = false] - If true, will update HEAD but won't update the working directory
  * @param {boolean} [args.noUpdateHead] - If true, will update the working directory but won't update HEAD. Defaults to `false` when `ref` is provided, and `true` if `ref` is not provided.
@@ -1026,7 +1026,7 @@ export function branch({ fs, dir, gitdir, ref, object, checkout, force, }: {
  * console.log('done')
  *
  * @example
- * // restore the 'docs' and 'src/docs' folders to the way they were, overwriting any changes
+ * // restore the 'docs' and 'src/docs' folders from the index, overwriting any unstaged changes
  * await git.checkout({
  *   fs,
  *   dir: '/tutorial',

package/index.js

@@ -7080,6 +7080,7 @@ const worthWalking = (filepath, root) => {
  * @param {boolean} [args.dryRun]
  * @param {boolean} [args.force]
  * @param {boolean} [args.track]
+ * @param {boolean} [args.restoreFromIndex]
  * @param {boolean} [args.nonBlocking]
  * @param {number} [args.batchSize]
  *
@@ -7101,6 +7102,7 @@ async function _checkout({
   dryRun,
   force,
   track = true,
+  restoreFromIndex = false,
   nonBlocking = false,
   batchSize = 100,
 }) {
@@ -7160,6 +7162,7 @@ async function _checkout({
         ref,
         force,
         filepaths,
+        restoreFromIndex,
       });
     } catch (err) {
       // Throw a more helpful error message for this common mistake.
@@ -7452,6 +7455,7 @@ async function analyze({
   ref,
   force,
   filepaths,
+  restoreFromIndex,
 }) {
   let count = 0;
   return _walk({
@@ -7459,7 +7463,7 @@ async function analyze({
     cache,
     dir,
     gitdir,
-    trees: [TREE({ ref }), WORKDIR(), STAGE()],
+    trees: [restoreFromIndex ? STAGE() : TREE({ ref }), WORKDIR(), STAGE()],
     map: async function (fullpath, [commit, workdir, stage]) {
       if (fullpath === '.') return
       // match against base paths
@@ -7484,7 +7488,12 @@ async function analyze({
         // Ignore workdir files that are not tracked and not part of the new commit.
         case '001':
           // OK, make an exception for explicitly named files.
-          if (force && filepaths && filepaths.includes(fullpath)) {
+          if (
+            !restoreFromIndex &&
+            force &&
+            filepaths &&
+            filepaths.includes(fullpath)
+          ) {
             return ['delete', fullpath]
           }
           return
@@ -7827,7 +7836,7 @@ async function batchAllSettled(operationName, tasks, onProgress, batchSize) {
  * @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
  * @param {string} [args.gitdir=join(dir,'.git')] - [required] The [git directory](dir-vs-gitdir.md) path
  * @param {string} [args.ref = 'HEAD'] - Source to checkout files from
- * @param {string[]} [args.filepaths] - Limit the checkout to the given files and directories
+ * @param {string[]} [args.filepaths] - Limit the checkout to the given files and directories. If `ref` is not provided, restore them from the index.
  * @param {string} [args.remote = 'origin'] - Which remote repository to use
  * @param {boolean} [args.noCheckout = false] - If true, will update HEAD but won't update the working directory
  * @param {boolean} [args.noUpdateHead] - If true, will update the working directory but won't update HEAD. Defaults to `false` when `ref` is provided, and `true` if `ref` is not provided.
@@ -7850,7 +7859,7 @@ async function batchAllSettled(operationName, tasks, onProgress, batchSize) {
  * console.log('done')
  *
  * @example
- * // restore the 'docs' and 'src/docs' folders to the way they were, overwriting any changes
+ * // restore the 'docs' and 'src/docs' folders from the index, overwriting any unstaged changes
  * await git.checkout({
  *   fs,
  *   dir: '/tutorial',
@@ -7895,6 +7904,8 @@ async function checkout({
     assertParameter('gitdir', gitdir);
 
     const ref = _ref || 'HEAD';
+    const restoreFromIndex =
+      _ref === undefined && filepaths != null && filepaths.length > 0;
     const fsp = new FileSystem(fs);
     const updatedGitdir = await discoverGitdir({ fsp, dotgit: gitdir });
     return await _checkout({
@@ -7912,6 +7923,7 @@ async function checkout({
       dryRun,
       force,
       track,
+      restoreFromIndex,
       nonBlocking,
       batchSize,
     })
@@ -9687,8 +9699,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.41.2',
-  agent: 'git/isomorphic-git@1.41.2',
+  version: '1.41.4',
+  agent: 'git/isomorphic-git@1.41.4',
 };
 
 class FIFO {
@@ -9765,6 +9777,11 @@ function splitLines(input) {
       while (true) {
         const i = findSplit(tmp);
         if (i === -1) break
+        // A '\r' at the very end may be the first half of a '\r\n' whose '\n'
+        // arrives in the next chunk. Hold it back until there is a character
+        // after it to look at, otherwise the same bytes split into two lines
+        // or one depending only on where the socket boundary fell.
+        if (i === tmp.length && tmp[i - 1] === '\r') break
         output.write(tmp.slice(0, i));
         tmp = tmp.slice(i);
       }

package/index.umd.min.d.ts

@@ -1003,7 +1003,7 @@ export function branch({ fs, dir, gitdir, ref, object, checkout, force, }: {
  * @param {string} args.dir - The [working tree](dir-vs-gitdir.md) directory path
  * @param {string} [args.gitdir=join(dir,'.git')] - [required] The [git directory](dir-vs-gitdir.md) path
  * @param {string} [args.ref = 'HEAD'] - Source to checkout files from
- * @param {string[]} [args.filepaths] - Limit the checkout to the given files and directories
+ * @param {string[]} [args.filepaths] - Limit the checkout to the given files and directories. If `ref` is not provided, restore them from the index.
  * @param {string} [args.remote = 'origin'] - Which remote repository to use
  * @param {boolean} [args.noCheckout = false] - If true, will update HEAD but won't update the working directory
  * @param {boolean} [args.noUpdateHead] - If true, will update the working directory but won't update HEAD. Defaults to `false` when `ref` is provided, and `true` if `ref` is not provided.
@@ -1026,7 +1026,7 @@ export function branch({ fs, dir, gitdir, ref, object, checkout, force, }: {
  * console.log('done')
  *
  * @example
- * // restore the 'docs' and 'src/docs' folders to the way they were, overwriting any changes
+ * // restore the 'docs' and 'src/docs' folders from the index, overwriting any unstaged changes
  * await git.checkout({
  *   fs,
  *   dir: '/tutorial',