dugite - npm Package Compare versions

Comparing version 1.98.0 to 1.99.0

build/lib/errors.d.ts

@@ -55,3 +55,4 @@ /** The git errors which can be parsed from failed git commands. */
     MergeWithLocalChanges = 51,
-    RebaseWithLocalChanges = 52
+    RebaseWithLocalChanges = 52,
+    MergeCommitNoMainlineOption = 53
 }
@@ -58,0 +59,0 @@ /** A mapping from regexes to the git error they identify. */

build/lib/errors.js

@@ -61,2 +61,3 @@ "use strict";
     GitError[GitError["RebaseWithLocalChanges"] = 52] = "RebaseWithLocalChanges";
+    GitError[GitError["MergeCommitNoMainlineOption"] = 53] = "MergeCommitNoMainlineOption";
 })(GitError = exports.GitError || (exports.GitError = {}));
@@ -120,3 +121,4 @@ /** A mapping from regexes to the git error they identify. */
     'error: Your local changes to the following files would be overwritten by merge:\n': GitError.MergeWithLocalChanges,
-    'error: cannot (pull with rebase|rebase): You have unstaged changes\\.\n\\s*error: [Pp]lease commit or stash them\\.': GitError.RebaseWithLocalChanges
+    'error: cannot (pull with rebase|rebase): You have unstaged changes\\.\n\\s*error: [Pp]lease commit or stash them\\.': GitError.RebaseWithLocalChanges,
+    'error: commit (.+) is a merge but no -m option was given': GitError.MergeCommitNoMainlineOption
 };
@@ -123,0 +125,0 @@ /**

package.json

 {
   "name": "dugite",
-  "version": "1.98.0",
+  "version": "1.99.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

53569

increased by0.53%

Lines of code

864

increased by0.35%

No dependency changes