dugite - npm Package Compare versions

Comparing version 1.101.0 to 1.102.0

build/lib/errors.d.ts

@@ -43,17 +43,18 @@ /** The git errors which can be parsed from failed git commands. */
     GPGFailedToSignData = 39,
-    PushWithFileSizeExceedingLimit = 40,
-    HexBranchNameRejected = 41,
-    ForcePushRejected = 42,
-    InvalidRefLength = 43,
-    ProtectedBranchRequiresReview = 44,
-    ProtectedBranchForcePush = 45,
-    ProtectedBranchDeleteRejected = 46,
-    ProtectedBranchRequiredStatus = 47,
-    PushWithPrivateEmail = 48,
-    ConfigLockFileAlreadyExists = 49,
-    RemoteAlreadyExists = 50,
-    TagAlreadyExists = 51,
-    MergeWithLocalChanges = 52,
-    RebaseWithLocalChanges = 53,
-    MergeCommitNoMainlineOption = 54
+    ConflictModifyDeletedInBranch = 40,
+    PushWithFileSizeExceedingLimit = 41,
+    HexBranchNameRejected = 42,
+    ForcePushRejected = 43,
+    InvalidRefLength = 44,
+    ProtectedBranchRequiresReview = 45,
+    ProtectedBranchForcePush = 46,
+    ProtectedBranchDeleteRejected = 47,
+    ProtectedBranchRequiredStatus = 48,
+    PushWithPrivateEmail = 49,
+    ConfigLockFileAlreadyExists = 50,
+    RemoteAlreadyExists = 51,
+    TagAlreadyExists = 52,
+    MergeWithLocalChanges = 53,
+    RebaseWithLocalChanges = 54,
+    MergeCommitNoMainlineOption = 55
 }
@@ -60,0 +61,0 @@ /** A mapping from regexes to the git error they identify. */

build/lib/errors.js

@@ -46,19 +46,20 @@ "use strict";
     GitError[GitError["GPGFailedToSignData"] = 39] = "GPGFailedToSignData";
+    GitError[GitError["ConflictModifyDeletedInBranch"] = 40] = "ConflictModifyDeletedInBranch";
     // Start of GitHub-specific error codes
-    GitError[GitError["PushWithFileSizeExceedingLimit"] = 40] = "PushWithFileSizeExceedingLimit";
-    GitError[GitError["HexBranchNameRejected"] = 41] = "HexBranchNameRejected";
-    GitError[GitError["ForcePushRejected"] = 42] = "ForcePushRejected";
-    GitError[GitError["InvalidRefLength"] = 43] = "InvalidRefLength";
-    GitError[GitError["ProtectedBranchRequiresReview"] = 44] = "ProtectedBranchRequiresReview";
-    GitError[GitError["ProtectedBranchForcePush"] = 45] = "ProtectedBranchForcePush";
-    GitError[GitError["ProtectedBranchDeleteRejected"] = 46] = "ProtectedBranchDeleteRejected";
-    GitError[GitError["ProtectedBranchRequiredStatus"] = 47] = "ProtectedBranchRequiredStatus";
-    GitError[GitError["PushWithPrivateEmail"] = 48] = "PushWithPrivateEmail";
+    GitError[GitError["PushWithFileSizeExceedingLimit"] = 41] = "PushWithFileSizeExceedingLimit";
+    GitError[GitError["HexBranchNameRejected"] = 42] = "HexBranchNameRejected";
+    GitError[GitError["ForcePushRejected"] = 43] = "ForcePushRejected";
+    GitError[GitError["InvalidRefLength"] = 44] = "InvalidRefLength";
+    GitError[GitError["ProtectedBranchRequiresReview"] = 45] = "ProtectedBranchRequiresReview";
+    GitError[GitError["ProtectedBranchForcePush"] = 46] = "ProtectedBranchForcePush";
+    GitError[GitError["ProtectedBranchDeleteRejected"] = 47] = "ProtectedBranchDeleteRejected";
+    GitError[GitError["ProtectedBranchRequiredStatus"] = 48] = "ProtectedBranchRequiredStatus";
+    GitError[GitError["PushWithPrivateEmail"] = 49] = "PushWithPrivateEmail";
     // End of GitHub-specific error codes
-    GitError[GitError["ConfigLockFileAlreadyExists"] = 49] = "ConfigLockFileAlreadyExists";
-    GitError[GitError["RemoteAlreadyExists"] = 50] = "RemoteAlreadyExists";
-    GitError[GitError["TagAlreadyExists"] = 51] = "TagAlreadyExists";
-    GitError[GitError["MergeWithLocalChanges"] = 52] = "MergeWithLocalChanges";
-    GitError[GitError["RebaseWithLocalChanges"] = 53] = "RebaseWithLocalChanges";
-    GitError[GitError["MergeCommitNoMainlineOption"] = 54] = "MergeCommitNoMainlineOption";
+    GitError[GitError["ConfigLockFileAlreadyExists"] = 50] = "ConfigLockFileAlreadyExists";
+    GitError[GitError["RemoteAlreadyExists"] = 51] = "RemoteAlreadyExists";
+    GitError[GitError["TagAlreadyExists"] = 52] = "TagAlreadyExists";
+    GitError[GitError["MergeWithLocalChanges"] = 53] = "MergeWithLocalChanges";
+    GitError[GitError["RebaseWithLocalChanges"] = 54] = "RebaseWithLocalChanges";
+    GitError[GitError["MergeCommitNoMainlineOption"] = 55] = "MergeCommitNoMainlineOption";
 })(GitError = exports.GitError || (exports.GitError = {}));
@@ -109,2 +110,3 @@ /** A mapping from regexes to the git error they identify. */
     'error: gpg failed to sign the data': GitError.GPGFailedToSignData,
+    'CONFLICT \\(modify/delete\\): (.+) deleted in (.+) and modified in (.+)': GitError.ConflictModifyDeletedInBranch,
     // GitHub-specific errors
@@ -111,0 +113,0 @@ 'error: GH001: ': GitError.PushWithFileSizeExceedingLimit,

package.json

 {
   "name": "dugite",
-  "version": "1.101.0",
+  "version": "1.102.0",
   "description": "Elegant bindings for Git",
@@ -5,0 +5,0 @@ "main": "./build/lib/index.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

54110

increased by0.57%

Lines of code

870

increased by0.35%

No dependency changes