isomorphic-git 1.40.5 → 1.40.7

package/index.cjs

@@ -8320,7 +8320,7 @@ async function checkAndWriteBlob(fs, gitdir, dir, filepath, oid = null) {
     : undefined;
   let retOid = objContent ? oid : undefined;
   if (!objContent) {
-    await acquireLock$1({ fs, gitdir, currentFilepath }, async () => {
+    await acquireLock$1(currentFilepath, async () => {
       const object = stats.isSymbolicLink()
         ? await fs.readlink(currentFilepath).then(posixifyPathBuffer)
         : await fs.read(currentFilepath);
@@ -8535,7 +8535,7 @@ async function applyTreeChanges({
   });
 
   // apply the changes to work dir
-  await acquireLock$1({ fs, gitdir, dirRemoved, ops }, async () => {
+  await acquireLock$1(gitdir, async () => {
     for (const op of ops) {
       const currentFilepath = join(dir, op.filepath);
       switch (op.method) {
@@ -8883,8 +8883,10 @@ async function _currentBranch({
 }
 
 function translateSSHtoHTTP(url) {
-  // handle "shorter scp-like syntax"
-  url = url.replace(/^git@([^:]+):/, 'https://$1/');
+  // handle "shorter scp-like syntax". The user is dropped: it names an ssh
+  // account and means nothing over https, which is what the old expression did
+  // for `git@` too.
+  url = url.replace(/^[^/@:]+@([^/@:]+):/, 'https://$1/');
   // handle proper SSH URLs
   url = url.replace(/^ssh:\/\//, 'https://');
   return url
@@ -9389,9 +9391,15 @@ class GitRemoteManager {
  * @param {string} args.url - The URL of the remote repository.
  * @returns {Object|undefined} - An object containing the transport and address, or undefined if parsing fails.
  */
+// git-clone(1) calls this the "shorter scp-like syntax": [user@]host:path. The
+// user is part of the syntax, not part of the word `git`, and a self-hosted
+// forge is as likely to hand out `gitolite@`, `forgejo@` or `ubuntu@`. The host
+// and the user cannot hold a slash, an at sign or a colon, so `https://x` and a
+// `scheme:address` override are left to the expression below.
+const scpLike = /^[^/@:]+@[^/@:]+:/;
+
 function parseRemoteUrl({ url }) {
-  // the stupid "shorter scp-like syntax"
-  if (url.startsWith('git@')) {
+  if (scpLike.test(url)) {
     return {
       transport: 'ssh',
       address: url,
@@ -9572,8 +9580,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.5',
-  agent: 'git/isomorphic-git@1.40.5',
+  version: '1.40.7',
+  agent: 'git/isomorphic-git@1.40.7',
 };
 
 class FIFO {
@@ -15930,7 +15938,7 @@ class GitStashManager {
     );
     const filepath = this.refLogsStashPath;
 
-    await acquireLock$1({ filepath, entry }, async () => {
+    await acquireLock$1(filepath, async () => {
       const appendTo = (await this.fs.exists(filepath))
         ? await this.fs.read(filepath, 'utf8')
         : '';
@@ -16140,7 +16148,7 @@ async function _stashDrop({ fs, dir, gitdir, refIdx = 0 }) {
   reflogEntries.splice(refIdx, 1);
 
   const stashReflogPath = stashMgr.refLogsStashPath;
-  await acquireLock$1({ reflogEntries, stashReflogPath, stashMgr }, async () => {
+  await acquireLock$1(stashReflogPath, async () => {
     if (reflogEntries.length) {
       await fs.write(
         stashReflogPath,

package/index.js

@@ -8307,7 +8307,7 @@ async function checkAndWriteBlob(fs, gitdir, dir, filepath, oid = null) {
     : undefined;
   let retOid = objContent ? oid : undefined;
   if (!objContent) {
-    await acquireLock$1({ fs, gitdir, currentFilepath }, async () => {
+    await acquireLock$1(currentFilepath, async () => {
       const object = stats.isSymbolicLink()
         ? await fs.readlink(currentFilepath).then(posixifyPathBuffer)
         : await fs.read(currentFilepath);
@@ -8522,7 +8522,7 @@ async function applyTreeChanges({
   });
 
   // apply the changes to work dir
-  await acquireLock$1({ fs, gitdir, dirRemoved, ops }, async () => {
+  await acquireLock$1(gitdir, async () => {
     for (const op of ops) {
       const currentFilepath = join(dir, op.filepath);
       switch (op.method) {
@@ -8870,8 +8870,10 @@ async function _currentBranch({
 }
 
 function translateSSHtoHTTP(url) {
-  // handle "shorter scp-like syntax"
-  url = url.replace(/^git@([^:]+):/, 'https://$1/');
+  // handle "shorter scp-like syntax". The user is dropped: it names an ssh
+  // account and means nothing over https, which is what the old expression did
+  // for `git@` too.
+  url = url.replace(/^[^/@:]+@([^/@:]+):/, 'https://$1/');
   // handle proper SSH URLs
   url = url.replace(/^ssh:\/\//, 'https://');
   return url
@@ -9376,9 +9378,15 @@ class GitRemoteManager {
  * @param {string} args.url - The URL of the remote repository.
  * @returns {Object|undefined} - An object containing the transport and address, or undefined if parsing fails.
  */
+// git-clone(1) calls this the "shorter scp-like syntax": [user@]host:path. The
+// user is part of the syntax, not part of the word `git`, and a self-hosted
+// forge is as likely to hand out `gitolite@`, `forgejo@` or `ubuntu@`. The host
+// and the user cannot hold a slash, an at sign or a colon, so `https://x` and a
+// `scheme:address` override are left to the expression below.
+const scpLike = /^[^/@:]+@[^/@:]+:/;
+
 function parseRemoteUrl({ url }) {
-  // the stupid "shorter scp-like syntax"
-  if (url.startsWith('git@')) {
+  if (scpLike.test(url)) {
     return {
       transport: 'ssh',
       address: url,
@@ -9559,8 +9567,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.40.5',
-  agent: 'git/isomorphic-git@1.40.5',
+  version: '1.40.7',
+  agent: 'git/isomorphic-git@1.40.7',
 };
 
 class FIFO {
@@ -15917,7 +15925,7 @@ class GitStashManager {
     );
     const filepath = this.refLogsStashPath;
 
-    await acquireLock$1({ filepath, entry }, async () => {
+    await acquireLock$1(filepath, async () => {
       const appendTo = (await this.fs.exists(filepath))
         ? await this.fs.read(filepath, 'utf8')
         : '';
@@ -16127,7 +16135,7 @@ async function _stashDrop({ fs, dir, gitdir, refIdx = 0 }) {
   reflogEntries.splice(refIdx, 1);
 
   const stashReflogPath = stashMgr.refLogsStashPath;
-  await acquireLock$1({ reflogEntries, stashReflogPath, stashMgr }, async () => {
+  await acquireLock$1(stashReflogPath, async () => {
     if (reflogEntries.length) {
       await fs.write(
         stashReflogPath,