isomorphic-git 1.18.0 → 1.18.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/browser-tests.json +4 -4
- package/index.cjs +3 -3
- package/index.js +3 -3
- package/index.umd.min.js +1 -1
- package/index.umd.min.js.map +1 -1
- package/package.json +1 -1
- package/size_report.html +1 -1
package/README.md
CHANGED
|
@@ -345,7 +345,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
|
|
|
345
345
|
</tr>
|
|
346
346
|
<tr>
|
|
347
347
|
<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>
|
|
348
|
-
<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
|
|
348
|
+
<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>
|
|
349
349
|
</tr>
|
|
350
350
|
</table>
|
|
351
351
|
|
package/browser-tests.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
[
|
|
2
2
|
"Chrome Headless 79.0.3945.0 (Linux x86_64)",
|
|
3
|
-
"Firefox
|
|
4
|
-
"Chrome 100.0.4896.127 (Android 10)",
|
|
3
|
+
"Firefox 101.0 (Ubuntu 0.0.0)",
|
|
5
4
|
"Edge 79.0.309.65 (Windows 10)",
|
|
6
|
-
"
|
|
7
|
-
"Safari 13.1 (Mac OS 10.15.4)"
|
|
5
|
+
"Chrome 100.0.4896.127 (Android 10)",
|
|
6
|
+
"Safari 13.1 (Mac OS 10.15.4)",
|
|
7
|
+
"Mobile Safari 13.0 (iOS 13.0)"
|
|
8
8
|
]
|
package/index.cjs
CHANGED
|
@@ -6983,8 +6983,8 @@ function filterCapabilities(server, client) {
|
|
|
6983
6983
|
|
|
6984
6984
|
const pkg = {
|
|
6985
6985
|
name: 'isomorphic-git',
|
|
6986
|
-
version: '1.18.
|
|
6987
|
-
agent: 'git/isomorphic-git@1.18.
|
|
6986
|
+
version: '1.18.3',
|
|
6987
|
+
agent: 'git/isomorphic-git@1.18.3',
|
|
6988
6988
|
};
|
|
6989
6989
|
|
|
6990
6990
|
class FIFO {
|
|
@@ -8606,7 +8606,7 @@ async function mergeTree({
|
|
|
8606
8606
|
theirName,
|
|
8607
8607
|
mergeDriver,
|
|
8608
8608
|
}).then(r => {
|
|
8609
|
-
cleanMerge = r.cleanMerge;
|
|
8609
|
+
cleanMerge = cleanMerge && r.cleanMerge;
|
|
8610
8610
|
unmergedFiles.push(filepath);
|
|
8611
8611
|
return r.mergeResult
|
|
8612
8612
|
})
|
package/index.js
CHANGED
|
@@ -6977,8 +6977,8 @@ function filterCapabilities(server, client) {
|
|
|
6977
6977
|
|
|
6978
6978
|
const pkg = {
|
|
6979
6979
|
name: 'isomorphic-git',
|
|
6980
|
-
version: '1.18.
|
|
6981
|
-
agent: 'git/isomorphic-git@1.18.
|
|
6980
|
+
version: '1.18.3',
|
|
6981
|
+
agent: 'git/isomorphic-git@1.18.3',
|
|
6982
6982
|
};
|
|
6983
6983
|
|
|
6984
6984
|
class FIFO {
|
|
@@ -8600,7 +8600,7 @@ async function mergeTree({
|
|
|
8600
8600
|
theirName,
|
|
8601
8601
|
mergeDriver,
|
|
8602
8602
|
}).then(r => {
|
|
8603
|
-
cleanMerge = r.cleanMerge;
|
|
8603
|
+
cleanMerge = cleanMerge && r.cleanMerge;
|
|
8604
8604
|
unmergedFiles.push(filepath);
|
|
8605
8605
|
return r.mergeResult
|
|
8606
8606
|
})
|