isomorphic-git 1.24.2 → 1.24.4

package/README.md

@@ -298,7 +298,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
     <td align="center"><a href="https://daniel-ruf.de"><img src="https://avatars1.githubusercontent.com/u/827205?v=4&s=60?s=60" width="60px;" alt=""/><br /><sub><b>Daniel Ruf</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=DanielRuf" title="Code">💻</a></td>
     <td align="center"><a href="http://blog.bokuweb.me/"><img src="https://avatars0.githubusercontent.com/u/10220449?v=4&s=60?s=60" width="60px;" alt=""/><br /><sub><b>bokuweb</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=bokuweb" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=bokuweb" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=bokuweb" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://github.com/hirokiosame"><img src="https://avatars0.githubusercontent.com/u/1075694?v=4&s=60?s=60" width="60px;" alt=""/><br /><sub><b>Hiroki Osame</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=hirokiosame" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=hirokiosame" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://jcubic.pl/me"><img src="https://avatars1.githubusercontent.com/u/280241?v=4&s=60?s=60" width="60px;" alt=""/><br /><sub><b>Jakub Jankiewicz</b></sub></a><br /><a href="#question-jcubic" title="Answering Questions">💬</a> <a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Ajcubic" title="Bug reports">🐛</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=jcubic" title="Code">💻</a> <a href="#example-jcubic" title="Examples">💡</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=jcubic" title="Tests">⚠️</a></td>
+    <td align="center"><a href="http://jcubic.pl/me"><img src="https://avatars1.githubusercontent.com/u/280241?v=4&s=60?s=60" width="60px;" alt=""/><br /><sub><b>Jakub Jankiewicz</b></sub></a><br /><a href="#question-jcubic" title="Answering Questions">💬</a> <a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Ajcubic" title="Bug reports">🐛</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=jcubic" title="Code">💻</a> <a href="#example-jcubic" title="Examples">💡</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=jcubic" title="Tests">⚠️</a></td>
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/howardgod"><img src="https://avatars1.githubusercontent.com/u/10459637?v=4&s=60?s=60" width="60px;" alt=""/><br /><sub><b>howardgod</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Ahowardgod" title="Bug reports">🐛</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=howardgod" title="Code">💻</a></td>
@@ -361,6 +361,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
     <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>
     <td align="center"><a href="https://github.com/dead-end"><img src="https://avatars.githubusercontent.com/u/30635084?v=4?s=60" width="60px;" alt=""/><br /><sub><b>dead-end</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=dead-end" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=dead-end" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=dead-end" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://github.com/barry963"><img src="https://avatars.githubusercontent.com/u/5289896?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Barry</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=barry963" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=barry963" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=barry963" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://stackoverflow.com/users/1493081/alireza-mirian"><img src="https://avatars.githubusercontent.com/u/3150694?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Alireza Mirian</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=alirezamirian" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=alirezamirian" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=alirezamirian" title="Tests">⚠️</a> <a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Aalirezamirian" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 

package/browser-tests.json

@@ -1,8 +1,12 @@
 [
   "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "Firefox 114.0 (Ubuntu 0.0.0)",
-  "Chrome 111.0.0.0 (Android 10)",
-  "Edge 79.0.309.65 (Windows 10)",
+  "Firefox 115.0 (Ubuntu 0.0.0)",
+  "X Chrome 114.0.0.0 (Android 10)",
   "Safari 13.1 (Mac OS 10.15.4)",
-  "Mobile Safari 13.0 (iOS 13.0)"
+  "Mobile Safari 13.0 (iOS 13.0)",
+  "Edge 79.0.309.65 (Windows 10)",
+  "Chrome Headless 79.0.3945.0 (Linux x86_64)",
+  "X Chrome 114.0.0.0 (Android 10)",
+  "Chrome Headless 79.0.3945.0 (Linux x86_64)",
+  "Chrome 114.0.0.0 (Android 10)"
 ]

package/index.cjs

@@ -4400,6 +4400,18 @@ async function rmRecursive(fs, filepath) {
   }
 }
 
+function isPromiseLike(obj) {
+  return isObject(obj) && isFunction(obj.then) && isFunction(obj.catch)
+}
+
+function isObject(obj) {
+  return obj && typeof obj === 'object'
+}
+
+function isFunction(obj) {
+  return typeof obj === 'function'
+}
+
 function isPromiseFs(fs) {
   const test = targetFs => {
     try {
@@ -4410,7 +4422,7 @@ function isPromiseFs(fs) {
       return e
     }
   };
-  return test(fs).constructor.name === 'Promise'
+  return isPromiseLike(test(fs))
 }
 
 // List of commands all filesystems are expected to provide. `rm` is not
@@ -7301,8 +7313,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.24.2',
-  agent: 'git/isomorphic-git@1.24.2',
+  version: '1.24.4',
+  agent: 'git/isomorphic-git@1.24.4',
 };
 
 class FIFO {
@@ -13225,7 +13237,14 @@ async function _renameBranch({
   await GitRefManager.writeRef({ fs, gitdir, ref: fullnewref, value });
   await GitRefManager.deleteRef({ fs, gitdir, ref: fulloldref });
 
-  if (checkout) {
+  const fullCurrentBranchRef = await _currentBranch({
+    fs,
+    gitdir,
+    fullname: true,
+  });
+  const isCurrentBranch = fullCurrentBranchRef === fulloldref;
+
+  if (checkout || isCurrentBranch) {
     // Update HEAD
     await GitRefManager.writeSymbolicRef({
       fs,

package/index.js

@@ -4394,6 +4394,18 @@ async function rmRecursive(fs, filepath) {
   }
 }
 
+function isPromiseLike(obj) {
+  return isObject(obj) && isFunction(obj.then) && isFunction(obj.catch)
+}
+
+function isObject(obj) {
+  return obj && typeof obj === 'object'
+}
+
+function isFunction(obj) {
+  return typeof obj === 'function'
+}
+
 function isPromiseFs(fs) {
   const test = targetFs => {
     try {
@@ -4404,7 +4416,7 @@ function isPromiseFs(fs) {
       return e
     }
   };
-  return test(fs).constructor.name === 'Promise'
+  return isPromiseLike(test(fs))
 }
 
 // List of commands all filesystems are expected to provide. `rm` is not
@@ -7295,8 +7307,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.24.2',
-  agent: 'git/isomorphic-git@1.24.2',
+  version: '1.24.4',
+  agent: 'git/isomorphic-git@1.24.4',
 };
 
 class FIFO {
@@ -13219,7 +13231,14 @@ async function _renameBranch({
   await GitRefManager.writeRef({ fs, gitdir, ref: fullnewref, value });
   await GitRefManager.deleteRef({ fs, gitdir, ref: fulloldref });
 
-  if (checkout) {
+  const fullCurrentBranchRef = await _currentBranch({
+    fs,
+    gitdir,
+    fullname: true,
+  });
+  const isCurrentBranch = fullCurrentBranchRef === fulloldref;
+
+  if (checkout || isCurrentBranch) {
     // Update HEAD
     await GitRefManager.writeSymbolicRef({
       fs,