isomorphic-git 1.19.1 → 1.20.0

package/README.md

@@ -347,6 +347,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
     <td align="center"><a href="https://github.com/seanpoulter"><img src="https://avatars.githubusercontent.com/u/2585460?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Sean Poulter</b></sub></a><br /><a href="#maintenance-seanpoulter" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/araknast"><img src="https://avatars.githubusercontent.com/u/84164531?v=4?s=60" width="60px;" alt=""/><br /><sub><b>araknast</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=araknast" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=araknast" title="Tests">⚠️</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=araknast" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/rraab-dev"><img src="https://avatars.githubusercontent.com/u/53948988?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Rafael Raab</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=rraab-dev" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=rraab-dev" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://gitlab.com/CoalZombik/"><img src="https://avatars.githubusercontent.com/u/49895741?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Lukáš Cezner</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3ACoalZombik" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 

package/browser-tests.json

@@ -1,8 +1,8 @@
 [
   "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "Firefox 102.0 (Ubuntu 0.0.0)",
-  "Chrome 100.0.4896.127 (Android 10)",
-  "Mobile Safari 13.0 (iOS 13.0)",
+  "Firefox 103.0 (Ubuntu 0.0.0)",
+  "Chrome 103.0.5060.53 (Android 10)",
   "Edge 79.0.309.65 (Windows 10)",
-  "Safari 13.1 (Mac OS 10.15.4)"
+  "Safari 13.1 (Mac OS 10.15.4)",
+  "Mobile Safari 13.0 (iOS 13.0)"
 ]

package/index.cjs

@@ -3919,7 +3919,7 @@ class GitWalkerRepo {
  * @param {string} [args.ref='HEAD']
  * @returns {Walker}
  */
-function TREE({ ref = 'HEAD' }) {
+function TREE({ ref = 'HEAD' } = {}) {
   const o = Object.create(null);
   Object.defineProperty(o, GitWalkSymbol, {
     value: function({ fs, gitdir, cache }) {
@@ -4489,6 +4489,12 @@ function assertParameter(name, value) {
   }
 }
 
+function posixifyPathBuffer(buffer) {
+  let idx;
+  while (~(idx = buffer.indexOf(92))) buffer[idx] = 47;
+  return buffer
+}
+
 // @ts-check
 
 /**
@@ -4565,7 +4571,7 @@ async function addToIndex({ dir, gitdir, fs, filepath, index, force }) {
       await Promise.all(promises);
     } else {
       const object = stats.isSymbolicLink()
-        ? await fs.readlink(join(dir, currentFilepath))
+        ? await fs.readlink(join(dir, currentFilepath)).then(posixifyPathBuffer)
         : await fs.read(join(dir, currentFilepath));
       if (object === null) throw new NotFoundError(currentFilepath)
       const oid = await _writeObject({ fs, gitdir, type: 'blob', object });
@@ -5385,6 +5391,7 @@ async function annotatedTag({
  * @param {import('../models/FileSystem.js').FileSystem} args.fs
  * @param {string} args.gitdir
  * @param {string} args.ref
+ * @param {string} [args.object = 'HEAD']
  * @param {boolean} [args.checkout = false]
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
@@ -5394,7 +5401,7 @@ async function annotatedTag({
  * console.log('done')
  *
  */
-async function _branch({ fs, gitdir, ref, checkout = false }) {
+async function _branch({ fs, gitdir, ref, object, checkout = false }) {
   if (ref !== cleanGitRef.clean(ref)) {
     throw new InvalidRefNameError(ref, cleanGitRef.clean(ref))
   }
@@ -5409,7 +5416,7 @@ async function _branch({ fs, gitdir, ref, checkout = false }) {
   // Get current HEAD tree oid
   let oid;
   try {
-    oid = await GitRefManager.resolve({ fs, gitdir, ref: 'HEAD' });
+    oid = await GitRefManager.resolve({ fs, gitdir, ref: object || 'HEAD' });
   } catch (e) {
     // Probably an empty repo
   }
@@ -5440,6 +5447,7 @@ async function _branch({ fs, gitdir, ref, checkout = false }) {
  * @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 - What to name the branch
+ * @param {string} [args.object = 'HEAD'] - What oid to use as the start point. Accepts a symbolic ref.
  * @param {boolean} [args.checkout = false] - Update `HEAD` to point at the newly created branch
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
@@ -5454,6 +5462,7 @@ async function branch({
   dir,
   gitdir = join(dir, '.git'),
   ref,
+  object,
   checkout = false,
 }) {
   try {
@@ -5464,6 +5473,7 @@ async function branch({
       fs: new FileSystem(fs),
       gitdir,
       ref,
+      object,
       checkout,
     })
   } catch (err) {
@@ -6984,8 +6994,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.19.1',
-  agent: 'git/isomorphic-git@1.19.1',
+  version: '1.20.0',
+  agent: 'git/isomorphic-git@1.20.0',
 };
 
 class FIFO {
@@ -11813,6 +11823,7 @@ async function _push({
       }
     }
 
+    if (oid === oldoid) force = true;
     if (!force) {
       // Is it a tag that already exists?
       if (
@@ -14032,12 +14043,14 @@ function version() {
  *
  * Example 2: Return the difference between the working directory and the HEAD commit
  * ```js
- * const diff = require('diff-lines')
- * async function map(filepath, [head, workdir]) {
+ * const map = async (filepath, [head, workdir]) => {
  *   return {
  *     filepath,
- *     oid: await head.oid(),
- *     diff: diff((await head.content()).toString('utf8'), (await workdir.content()).toString('utf8'))
+ *     oid: await head?.oid(),
+ *     diff: diff(
+ *       (await head?.content())?.toString('utf8') || '',
+ *       (await workdir?.content())?.toString('utf8') || ''
+ *     )
  *   }
  * }
  * ```

package/index.d.ts

@@ -752,7 +752,7 @@ export function STAGE(): Walker;
  * @param {string} [args.ref='HEAD']
  * @returns {Walker}
  */
-export function TREE({ ref }: {
+export function TREE({ ref }?: {
     ref?: string;
 }): Walker;
 /**
@@ -932,6 +932,7 @@ export function annotatedTag({ fs: _fs, onSign, dir, gitdir, ref, tagger: _tagge
  * @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 - What to name the branch
+ * @param {string} [args.object = 'HEAD'] - What oid to use as the start point. Accepts a symbolic ref.
  * @param {boolean} [args.checkout = false] - Update `HEAD` to point at the newly created branch
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
@@ -941,11 +942,12 @@ export function annotatedTag({ fs: _fs, onSign, dir, gitdir, ref, tagger: _tagge
  * console.log('done')
  *
  */
-export function branch({ fs, dir, gitdir, ref, checkout, }: {
+export function branch({ fs, dir, gitdir, ref, object, checkout, }: {
     fs: CallbackFsClient | PromiseFsClient;
     dir?: string;
     gitdir?: string;
     ref: string;
+    object?: string;
     checkout?: boolean;
 }): Promise<void>;
 /**
@@ -3415,12 +3417,14 @@ export function version(): string;
  *
  * Example 2: Return the difference between the working directory and the HEAD commit
  * ```js
- * const diff = require('diff-lines')
- * async function map(filepath, [head, workdir]) {
+ * const map = async (filepath, [head, workdir]) => {
  *   return {
  *     filepath,
- *     oid: await head.oid(),
- *     diff: diff((await head.content()).toString('utf8'), (await workdir.content()).toString('utf8'))
+ *     oid: await head?.oid(),
+ *     diff: diff(
+ *       (await head?.content())?.toString('utf8') || '',
+ *       (await workdir?.content())?.toString('utf8') || ''
+ *     )
  *   }
  * }
  * ```

package/index.js

@@ -3913,7 +3913,7 @@ class GitWalkerRepo {
  * @param {string} [args.ref='HEAD']
  * @returns {Walker}
  */
-function TREE({ ref = 'HEAD' }) {
+function TREE({ ref = 'HEAD' } = {}) {
   const o = Object.create(null);
   Object.defineProperty(o, GitWalkSymbol, {
     value: function({ fs, gitdir, cache }) {
@@ -4483,6 +4483,12 @@ function assertParameter(name, value) {
   }
 }
 
+function posixifyPathBuffer(buffer) {
+  let idx;
+  while (~(idx = buffer.indexOf(92))) buffer[idx] = 47;
+  return buffer
+}
+
 // @ts-check
 
 /**
@@ -4559,7 +4565,7 @@ async function addToIndex({ dir, gitdir, fs, filepath, index, force }) {
       await Promise.all(promises);
     } else {
       const object = stats.isSymbolicLink()
-        ? await fs.readlink(join(dir, currentFilepath))
+        ? await fs.readlink(join(dir, currentFilepath)).then(posixifyPathBuffer)
         : await fs.read(join(dir, currentFilepath));
       if (object === null) throw new NotFoundError(currentFilepath)
       const oid = await _writeObject({ fs, gitdir, type: 'blob', object });
@@ -5379,6 +5385,7 @@ async function annotatedTag({
  * @param {import('../models/FileSystem.js').FileSystem} args.fs
  * @param {string} args.gitdir
  * @param {string} args.ref
+ * @param {string} [args.object = 'HEAD']
  * @param {boolean} [args.checkout = false]
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
@@ -5388,7 +5395,7 @@ async function annotatedTag({
  * console.log('done')
  *
  */
-async function _branch({ fs, gitdir, ref, checkout = false }) {
+async function _branch({ fs, gitdir, ref, object, checkout = false }) {
   if (ref !== cleanGitRef.clean(ref)) {
     throw new InvalidRefNameError(ref, cleanGitRef.clean(ref))
   }
@@ -5403,7 +5410,7 @@ async function _branch({ fs, gitdir, ref, checkout = false }) {
   // Get current HEAD tree oid
   let oid;
   try {
-    oid = await GitRefManager.resolve({ fs, gitdir, ref: 'HEAD' });
+    oid = await GitRefManager.resolve({ fs, gitdir, ref: object || 'HEAD' });
   } catch (e) {
     // Probably an empty repo
   }
@@ -5434,6 +5441,7 @@ async function _branch({ fs, gitdir, ref, checkout = false }) {
  * @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 - What to name the branch
+ * @param {string} [args.object = 'HEAD'] - What oid to use as the start point. Accepts a symbolic ref.
  * @param {boolean} [args.checkout = false] - Update `HEAD` to point at the newly created branch
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
@@ -5448,6 +5456,7 @@ async function branch({
   dir,
   gitdir = join(dir, '.git'),
   ref,
+  object,
   checkout = false,
 }) {
   try {
@@ -5458,6 +5467,7 @@ async function branch({
       fs: new FileSystem(fs),
       gitdir,
       ref,
+      object,
       checkout,
     })
   } catch (err) {
@@ -6978,8 +6988,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.19.1',
-  agent: 'git/isomorphic-git@1.19.1',
+  version: '1.20.0',
+  agent: 'git/isomorphic-git@1.20.0',
 };
 
 class FIFO {
@@ -11807,6 +11817,7 @@ async function _push({
       }
     }
 
+    if (oid === oldoid) force = true;
     if (!force) {
       // Is it a tag that already exists?
       if (
@@ -14026,12 +14037,14 @@ function version() {
  *
  * Example 2: Return the difference between the working directory and the HEAD commit
  * ```js
- * const diff = require('diff-lines')
- * async function map(filepath, [head, workdir]) {
+ * const map = async (filepath, [head, workdir]) => {
  *   return {
  *     filepath,
- *     oid: await head.oid(),
- *     diff: diff((await head.content()).toString('utf8'), (await workdir.content()).toString('utf8'))
+ *     oid: await head?.oid(),
+ *     diff: diff(
+ *       (await head?.content())?.toString('utf8') || '',
+ *       (await workdir?.content())?.toString('utf8') || ''
+ *     )
  *   }
  * }
  * ```

package/index.umd.min.d.ts

@@ -752,7 +752,7 @@ export function STAGE(): Walker;
  * @param {string} [args.ref='HEAD']
  * @returns {Walker}
  */
-export function TREE({ ref }: {
+export function TREE({ ref }?: {
     ref?: string;
 }): Walker;
 /**
@@ -932,6 +932,7 @@ export function annotatedTag({ fs: _fs, onSign, dir, gitdir, ref, tagger: _tagge
  * @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 - What to name the branch
+ * @param {string} [args.object = 'HEAD'] - What oid to use as the start point. Accepts a symbolic ref.
  * @param {boolean} [args.checkout = false] - Update `HEAD` to point at the newly created branch
  *
  * @returns {Promise<void>} Resolves successfully when filesystem operations are complete
@@ -941,11 +942,12 @@ export function annotatedTag({ fs: _fs, onSign, dir, gitdir, ref, tagger: _tagge
  * console.log('done')
  *
  */
-export function branch({ fs, dir, gitdir, ref, checkout, }: {
+export function branch({ fs, dir, gitdir, ref, object, checkout, }: {
     fs: CallbackFsClient | PromiseFsClient;
     dir?: string;
     gitdir?: string;
     ref: string;
+    object?: string;
     checkout?: boolean;
 }): Promise<void>;
 /**
@@ -3415,12 +3417,14 @@ export function version(): string;
  *
  * Example 2: Return the difference between the working directory and the HEAD commit
  * ```js
- * const diff = require('diff-lines')
- * async function map(filepath, [head, workdir]) {
+ * const map = async (filepath, [head, workdir]) => {
  *   return {
  *     filepath,
- *     oid: await head.oid(),
- *     diff: diff((await head.content()).toString('utf8'), (await workdir.content()).toString('utf8'))
+ *     oid: await head?.oid(),
+ *     diff: diff(
+ *       (await head?.content())?.toString('utf8') || '',
+ *       (await workdir?.content())?.toString('utf8') || ''
+ *     )
  *   }
  * }
  * ```