isomorphic-git 1.42.5 → 1.42.6

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.
@@ -5328,6 +5328,23 @@ class CheckoutConflictError extends BaseError {
5328
5328
  /** @type {'CheckoutConflictError'} */
5329
5329
  CheckoutConflictError.code = 'CheckoutConflictError';
5330
5330
 
5331
+ class CherryPickLocalChangesError extends BaseError {
5332
+ /**
5333
+ * @param {string[]} filepaths
5334
+ */
5335
+ constructor(filepaths) {
5336
+ super(
5337
+ `Your local changes to the following files would be overwritten by cherry-pick: ${filepaths.join(
5338
+ ', '
5339
+ )}`
5340
+ );
5341
+ this.code = this.name = CherryPickLocalChangesError.code;
5342
+ this.data = { filepaths };
5343
+ }
5344
+ }
5345
+ /** @type {'CherryPickLocalChangesError'} */
5346
+ CherryPickLocalChangesError.code = 'CherryPickLocalChangesError';
5347
+
5331
5348
  class CherryPickMergeCommitError extends BaseError {
5332
5349
  /**
5333
5350
  * @param {string} oid
package/managers/index.js CHANGED
@@ -5315,6 +5315,23 @@ class CheckoutConflictError extends BaseError {
5315
5315
  /** @type {'CheckoutConflictError'} */
5316
5316
  CheckoutConflictError.code = 'CheckoutConflictError';
5317
5317
 
5318
+ class CherryPickLocalChangesError extends BaseError {
5319
+ /**
5320
+ * @param {string[]} filepaths
5321
+ */
5322
+ constructor(filepaths) {
5323
+ super(
5324
+ `Your local changes to the following files would be overwritten by cherry-pick: ${filepaths.join(
5325
+ ', '
5326
+ )}`
5327
+ );
5328
+ this.code = this.name = CherryPickLocalChangesError.code;
5329
+ this.data = { filepaths };
5330
+ }
5331
+ }
5332
+ /** @type {'CherryPickLocalChangesError'} */
5333
+ CherryPickLocalChangesError.code = 'CherryPickLocalChangesError';
5334
+
5318
5335
  class CherryPickMergeCommitError extends BaseError {
5319
5336
  /**
5320
5337
  * @param {string} oid
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "isomorphic-git",
3
- "version": "1.42.5",
3
+ "version": "1.42.6",
4
4
  "description": "A pure JavaScript reimplementation of git for node and browsers",
5
5
  "type": "module",
6
6
  "typings": "./index.d.cts",