dugite 1.107.0 → 1.110.0
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/build/lib/errors.d.ts +2 -1
- package/build/lib/errors.js +3 -1
- package/build/lib/errors.js.map +1 -1
- package/package.json +1 -1
- package/script/embedded-git.json +15 -15
package/build/lib/errors.d.ts
CHANGED
|
@@ -56,7 +56,8 @@ export declare enum GitError {
|
|
|
56
56
|
MergeWithLocalChanges = 53,
|
|
57
57
|
RebaseWithLocalChanges = 54,
|
|
58
58
|
MergeCommitNoMainlineOption = 55,
|
|
59
|
-
UnsafeDirectory = 56
|
|
59
|
+
UnsafeDirectory = 56,
|
|
60
|
+
PathExistsButNotInRef = 57
|
|
60
61
|
}
|
|
61
62
|
/** A mapping from regexes to the git error they identify. */
|
|
62
63
|
export declare const GitErrorRegexes: {
|
package/build/lib/errors.js
CHANGED
|
@@ -62,6 +62,7 @@ var GitError;
|
|
|
62
62
|
GitError[GitError["RebaseWithLocalChanges"] = 54] = "RebaseWithLocalChanges";
|
|
63
63
|
GitError[GitError["MergeCommitNoMainlineOption"] = 55] = "MergeCommitNoMainlineOption";
|
|
64
64
|
GitError[GitError["UnsafeDirectory"] = 56] = "UnsafeDirectory";
|
|
65
|
+
GitError[GitError["PathExistsButNotInRef"] = 57] = "PathExistsButNotInRef";
|
|
65
66
|
})(GitError = exports.GitError || (exports.GitError = {}));
|
|
66
67
|
/** A mapping from regexes to the git error they identify. */
|
|
67
68
|
exports.GitErrorRegexes = {
|
|
@@ -124,7 +125,8 @@ exports.GitErrorRegexes = {
|
|
|
124
125
|
'error: Your local changes to the following files would be overwritten by merge:\n': GitError.MergeWithLocalChanges,
|
|
125
126
|
'error: cannot (pull with rebase|rebase): You have unstaged changes\\.\n\\s*error: [Pp]lease commit or stash them\\.': GitError.RebaseWithLocalChanges,
|
|
126
127
|
'error: commit (.+) is a merge but no -m option was given': GitError.MergeCommitNoMainlineOption,
|
|
127
|
-
|
|
128
|
+
'fatal: detected dubious ownership in repository at (.+)': GitError.UnsafeDirectory,
|
|
129
|
+
"fatal: path '(.+)' exists on disk, but not in '(.+)'": GitError.PathExistsButNotInRef
|
|
128
130
|
};
|
|
129
131
|
/**
|
|
130
132
|
* The error code for when git cannot be found. This most likely indicates a
|
package/build/lib/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../lib/errors.ts"],"names":[],"mappings":";;AAAA,mEAAmE;AACnE,IAAY,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../lib/errors.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/script/embedded-git.json
CHANGED
|
@@ -1,27 +1,27 @@
|
|
|
1
1
|
{
|
|
2
2
|
"win32-x64": {
|
|
3
|
-
"name": "dugite-native-v2.35.
|
|
4
|
-
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.
|
|
5
|
-
"checksum": "
|
|
3
|
+
"name": "dugite-native-v2.35.4-ef7ff6e-windows-x64.tar.gz",
|
|
4
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.4/dugite-native-v2.35.4-ef7ff6e-windows-x64.tar.gz",
|
|
5
|
+
"checksum": "0ae184b6be3f6b64bf1dbf57523c99e06bb8db2c7dfcb067811da454dcd7391b"
|
|
6
6
|
},
|
|
7
7
|
"win32-ia32": {
|
|
8
|
-
"name": "dugite-native-v2.35.
|
|
9
|
-
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.
|
|
10
|
-
"checksum": "
|
|
8
|
+
"name": "dugite-native-v2.35.4-ef7ff6e-windows-x86.tar.gz",
|
|
9
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.4/dugite-native-v2.35.4-ef7ff6e-windows-x86.tar.gz",
|
|
10
|
+
"checksum": "1c4d922d00c43fb4c423bd964b2d140e597ed0e6f6a8e3a0c312a407577fc685"
|
|
11
11
|
},
|
|
12
12
|
"darwin-x64": {
|
|
13
|
-
"name": "dugite-native-v2.35.
|
|
14
|
-
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.
|
|
15
|
-
"checksum": "
|
|
13
|
+
"name": "dugite-native-v2.35.4-ef7ff6e-macOS-x64.tar.gz",
|
|
14
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.4/dugite-native-v2.35.4-ef7ff6e-macOS-x64.tar.gz",
|
|
15
|
+
"checksum": "5a21720a791af01396476b1298f209b2de38dd7ab7d99132e73d8e3300d17679"
|
|
16
16
|
},
|
|
17
17
|
"darwin-arm64": {
|
|
18
|
-
"name": "dugite-native-v2.35.
|
|
19
|
-
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.
|
|
20
|
-
"checksum": "
|
|
18
|
+
"name": "dugite-native-v2.35.4-ef7ff6e-macOS-arm64.tar.gz",
|
|
19
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.4/dugite-native-v2.35.4-ef7ff6e-macOS-arm64.tar.gz",
|
|
20
|
+
"checksum": "9f6fbcff96d8597506120e7c9b0d54980c4c9ce438b7fd36c009976710332272"
|
|
21
21
|
},
|
|
22
22
|
"linux-x64": {
|
|
23
|
-
"name": "dugite-native-v2.35.
|
|
24
|
-
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.
|
|
25
|
-
"checksum": "
|
|
23
|
+
"name": "dugite-native-v2.35.4-ef7ff6e-ubuntu.tar.gz",
|
|
24
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.4/dugite-native-v2.35.4-ef7ff6e-ubuntu.tar.gz",
|
|
25
|
+
"checksum": "c747e0d8860c4de0c8bac10b23c87ec1b43c7d9c9ccbf466d4ecb03f473a81d3"
|
|
26
26
|
}
|
|
27
27
|
}
|