isomorphic-git 1.10.0 → 1.10.4

package/README.md

@@ -338,6 +338,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
     <td align="center"><a href="https://ryotak.me/"><img src="https://avatars.githubusercontent.com/u/49341894?v=4?s=60" width="60px;" alt=""/><br /><sub><b>RyotaK</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3ARy0taK" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/strangedev"><img src="https://avatars.githubusercontent.com/u/3045979?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Noah Hummel</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=strangedev" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=strangedev" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://github.com/mtlewis"><img src="https://avatars.githubusercontent.com/u/542836?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Mike Lewis</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=mtlewis" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://twitter.com/SamVerschueren"><img src="https://avatars.githubusercontent.com/u/1913805?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Sam Verschueren</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=SamVerschueren" title="Code">💻</a></td>
   </tr>
 </table>
 

package/browser-tests.json

@@ -1,8 +1,8 @@
 [
   "HeadlessChrome 0.0.0 (Linux 0.0.0)",
-  "Firefox 91.0.0 (Ubuntu 0.0.0)",
-  "Chrome Mobile 91.0.4472 (Android 0.0.0)",
+  "Firefox 95.0.0 (Ubuntu 0.0.0)",
   "Chrome 79.0.3945 (Windows 10 0.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

@@ -1694,8 +1694,8 @@ class GitRefManager {
         if (serverRef.startsWith('refs/tags') && !serverRef.endsWith('^{}')) {
           // Git's behavior is to only fetch tags that do not conflict with tags already present.
           if (!(await GitRefManager.exists({ fs, gitdir, ref: serverRef }))) {
-            // If there is a dereferenced an annotated tag value available, prefer that.
-            const oid = refs.get(serverRef + '^{}') || refs.get(serverRef);
+            // Always use the object id of the tag itself, and not the peeled object id.
+            const oid = refs.get(serverRef);
             actualRefsToWrite.set(serverRef, oid);
           }
         }
@@ -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('/');
@@ -6425,7 +6433,14 @@ async function parseRefsAdResponse(stream, { service }) {
   let lineOne = await read();
   // skip past any flushes
   while (lineOne === null) lineOne = await read();
+
   if (lineOne === true) throw new EmptyServerResponseError()
+
+  // Handle protocol v2 responses (Bitbucket Server doesn't include a `# service=` line)
+  if (lineOne.includes('version 2')) {
+    return parseCapabilitiesV2(read)
+  }
+
   // Clients MUST ignore an LF at the end of the line.
   if (lineOne.toString('utf8').replace(/\n$/, '') !== `# service=${service}`) {
     throw new ParseError(`# service=${service}\\n`, lineOne.toString('utf8'))
@@ -6437,10 +6452,12 @@ async function parseRefsAdResponse(stream, { service }) {
   // are returned.
   if (lineTwo === true) return { capabilities, refs, symrefs }
   lineTwo = lineTwo.toString('utf8');
+
   // Handle protocol v2 responses
   if (lineTwo.includes('version 2')) {
     return parseCapabilitiesV2(read)
   }
+
   const [firstRef, capabilitiesLine] = splitAndAssert(lineTwo, '\x00', '\\x00');
   capabilitiesLine.split(' ').map(x => capabilities.add(x));
   const [ref, name] = splitAndAssert(firstRef, ' ', ' ');
@@ -6848,8 +6865,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.10.0',
-  agent: 'git/isomorphic-git@1.10.0',
+  version: '1.10.4',
+  agent: 'git/isomorphic-git@1.10.4',
 };
 
 class FIFO {

package/index.js

@@ -1688,8 +1688,8 @@ class GitRefManager {
         if (serverRef.startsWith('refs/tags') && !serverRef.endsWith('^{}')) {
           // Git's behavior is to only fetch tags that do not conflict with tags already present.
           if (!(await GitRefManager.exists({ fs, gitdir, ref: serverRef }))) {
-            // If there is a dereferenced an annotated tag value available, prefer that.
-            const oid = refs.get(serverRef + '^{}') || refs.get(serverRef);
+            // Always use the object id of the tag itself, and not the peeled object id.
+            const oid = refs.get(serverRef);
             actualRefsToWrite.set(serverRef, oid);
           }
         }
@@ -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('/');
@@ -6419,7 +6427,14 @@ async function parseRefsAdResponse(stream, { service }) {
   let lineOne = await read();
   // skip past any flushes
   while (lineOne === null) lineOne = await read();
+
   if (lineOne === true) throw new EmptyServerResponseError()
+
+  // Handle protocol v2 responses (Bitbucket Server doesn't include a `# service=` line)
+  if (lineOne.includes('version 2')) {
+    return parseCapabilitiesV2(read)
+  }
+
   // Clients MUST ignore an LF at the end of the line.
   if (lineOne.toString('utf8').replace(/\n$/, '') !== `# service=${service}`) {
     throw new ParseError(`# service=${service}\\n`, lineOne.toString('utf8'))
@@ -6431,10 +6446,12 @@ async function parseRefsAdResponse(stream, { service }) {
   // are returned.
   if (lineTwo === true) return { capabilities, refs, symrefs }
   lineTwo = lineTwo.toString('utf8');
+
   // Handle protocol v2 responses
   if (lineTwo.includes('version 2')) {
     return parseCapabilitiesV2(read)
   }
+
   const [firstRef, capabilitiesLine] = splitAndAssert(lineTwo, '\x00', '\\x00');
   capabilitiesLine.split(' ').map(x => capabilities.add(x));
   const [ref, name] = splitAndAssert(firstRef, ' ', ' ');
@@ -6842,8 +6859,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.10.0',
-  agent: 'git/isomorphic-git@1.10.0',
+  version: '1.10.4',
+  agent: 'git/isomorphic-git@1.10.4',
 };
 
 class FIFO {