isomorphic-git 1.32.0 → 1.32.1
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/browser-tests.json +2 -4
- package/index.cjs +18 -3
- package/index.js +18 -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/browser-tests.json
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
[
|
|
2
|
-
"
|
|
2
|
+
"Chrome Headless 79.0.3945.0 (Linux x86_64)",
|
|
3
3
|
"Firefox 139.0 (Linux x86_64)",
|
|
4
4
|
"Chrome 135.0.0.0 (Android 10)",
|
|
5
5
|
"Edge 79.0.309.65 (Windows 10)",
|
|
6
6
|
"Mobile Safari 14.0 (iOS 14.0.1)",
|
|
7
|
-
"Safari 14.1 (Mac OS 10.15.7)"
|
|
8
|
-
"Chrome Headless 79.0.3945.0 (Linux x86_64)",
|
|
9
|
-
"Chrome 135.0.0.0 (Android 10)"
|
|
7
|
+
"Safari 14.1 (Mac OS 10.15.7)"
|
|
10
8
|
]
|
package/index.cjs
CHANGED
|
@@ -7776,8 +7776,8 @@ function filterCapabilities(server, client) {
|
|
|
7776
7776
|
|
|
7777
7777
|
const pkg = {
|
|
7778
7778
|
name: 'isomorphic-git',
|
|
7779
|
-
version: '1.32.
|
|
7780
|
-
agent: 'git/isomorphic-git@1.32.
|
|
7779
|
+
version: '1.32.1',
|
|
7780
|
+
agent: 'git/isomorphic-git@1.32.1',
|
|
7781
7781
|
};
|
|
7782
7782
|
|
|
7783
7783
|
class FIFO {
|
|
@@ -9437,7 +9437,22 @@ async function mergeTree({
|
|
|
9437
9437
|
: undefined
|
|
9438
9438
|
}
|
|
9439
9439
|
case 'true-true': {
|
|
9440
|
-
//
|
|
9440
|
+
// Handle tree-tree merges (directories)
|
|
9441
|
+
if (
|
|
9442
|
+
ours &&
|
|
9443
|
+
theirs &&
|
|
9444
|
+
(await ours.type()) === 'tree' &&
|
|
9445
|
+
(await theirs.type()) === 'tree'
|
|
9446
|
+
) {
|
|
9447
|
+
return {
|
|
9448
|
+
mode: await ours.mode(),
|
|
9449
|
+
path,
|
|
9450
|
+
oid: await ours.oid(),
|
|
9451
|
+
type: 'tree',
|
|
9452
|
+
}
|
|
9453
|
+
}
|
|
9454
|
+
|
|
9455
|
+
// Modifications - both are blobs
|
|
9441
9456
|
if (
|
|
9442
9457
|
ours &&
|
|
9443
9458
|
theirs &&
|
package/index.js
CHANGED
|
@@ -7770,8 +7770,8 @@ function filterCapabilities(server, client) {
|
|
|
7770
7770
|
|
|
7771
7771
|
const pkg = {
|
|
7772
7772
|
name: 'isomorphic-git',
|
|
7773
|
-
version: '1.32.
|
|
7774
|
-
agent: 'git/isomorphic-git@1.32.
|
|
7773
|
+
version: '1.32.1',
|
|
7774
|
+
agent: 'git/isomorphic-git@1.32.1',
|
|
7775
7775
|
};
|
|
7776
7776
|
|
|
7777
7777
|
class FIFO {
|
|
@@ -9431,7 +9431,22 @@ async function mergeTree({
|
|
|
9431
9431
|
: undefined
|
|
9432
9432
|
}
|
|
9433
9433
|
case 'true-true': {
|
|
9434
|
-
//
|
|
9434
|
+
// Handle tree-tree merges (directories)
|
|
9435
|
+
if (
|
|
9436
|
+
ours &&
|
|
9437
|
+
theirs &&
|
|
9438
|
+
(await ours.type()) === 'tree' &&
|
|
9439
|
+
(await theirs.type()) === 'tree'
|
|
9440
|
+
) {
|
|
9441
|
+
return {
|
|
9442
|
+
mode: await ours.mode(),
|
|
9443
|
+
path,
|
|
9444
|
+
oid: await ours.oid(),
|
|
9445
|
+
type: 'tree',
|
|
9446
|
+
}
|
|
9447
|
+
}
|
|
9448
|
+
|
|
9449
|
+
// Modifications - both are blobs
|
|
9435
9450
|
if (
|
|
9436
9451
|
ours &&
|
|
9437
9452
|
theirs &&
|