isomorphic-git 1.32.0 → 1.32.2
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 +2 -1
- package/browser-tests.json +4 -6
- package/http/node/index.d.cts +82 -0
- package/http/web/index.d.cts +82 -0
- package/index.cjs +18 -3
- package/index.d.cts +4664 -0
- package/index.js +18 -3
- package/index.umd.min.js +1 -1
- package/index.umd.min.js.map +1 -1
- package/package.json +30 -3
- package/size_report.html +1 -1
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.2',
|
|
7774
|
+
agent: 'git/isomorphic-git@1.32.2',
|
|
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 &&
|