dugite 1.106.0 → 1.109.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 +6 -4
- 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
|
@@ -55,7 +55,8 @@ export declare enum GitError {
|
|
|
55
55
|
TagAlreadyExists = 52,
|
|
56
56
|
MergeWithLocalChanges = 53,
|
|
57
57
|
RebaseWithLocalChanges = 54,
|
|
58
|
-
MergeCommitNoMainlineOption = 55
|
|
58
|
+
MergeCommitNoMainlineOption = 55,
|
|
59
|
+
UnsafeDirectory = 56
|
|
59
60
|
}
|
|
60
61
|
/** A mapping from regexes to the git error they identify. */
|
|
61
62
|
export declare const GitErrorRegexes: {
|
package/build/lib/errors.js
CHANGED
|
@@ -61,6 +61,7 @@ var GitError;
|
|
|
61
61
|
GitError[GitError["MergeWithLocalChanges"] = 53] = "MergeWithLocalChanges";
|
|
62
62
|
GitError[GitError["RebaseWithLocalChanges"] = 54] = "RebaseWithLocalChanges";
|
|
63
63
|
GitError[GitError["MergeCommitNoMainlineOption"] = 55] = "MergeCommitNoMainlineOption";
|
|
64
|
+
GitError[GitError["UnsafeDirectory"] = 56] = "UnsafeDirectory";
|
|
64
65
|
})(GitError = exports.GitError || (exports.GitError = {}));
|
|
65
66
|
/** A mapping from regexes to the git error they identify. */
|
|
66
67
|
exports.GitErrorRegexes = {
|
|
@@ -69,7 +70,7 @@ exports.GitErrorRegexes = {
|
|
|
69
70
|
'fatal: Authentication failed': GitError.SSHAuthenticationFailed,
|
|
70
71
|
'fatal: Could not read from remote repository.': GitError.SSHPermissionDenied,
|
|
71
72
|
'The requested URL returned error: 403': GitError.HTTPSAuthenticationFailed,
|
|
72
|
-
'fatal:
|
|
73
|
+
'fatal: [Tt]he remote end hung up unexpectedly': GitError.RemoteDisconnection,
|
|
73
74
|
"fatal: unable to access '(.+)': Failed to connect to (.+): Host is down": GitError.HostDown,
|
|
74
75
|
"Cloning into '(.+)'...\nfatal: unable to access '(.+)': Could not resolve host: (.+)": GitError.HostDown,
|
|
75
76
|
'Resolve all conflicts manually, mark them as resolved with': GitError.RebaseConflicts,
|
|
@@ -84,7 +85,7 @@ exports.GitErrorRegexes = {
|
|
|
84
85
|
'There are no candidates for (rebasing|merging) among the refs that you just fetched.\nGenerally this means that you provided a wildcard refspec which had no\nmatches on the remote end.': GitError.NoMatchingRemoteBranch,
|
|
85
86
|
"Your configuration specifies to merge with the ref '(.+)'\nfrom the remote, but no such ref was fetched.": GitError.NoExistingRemoteBranch,
|
|
86
87
|
'nothing to commit': GitError.NothingToCommit,
|
|
87
|
-
"
|
|
88
|
+
"[Nn]o submodule mapping found in .gitmodules for path '(.+)'": GitError.NoSubmoduleMapping,
|
|
88
89
|
"fatal: repository '(.+)' does not exist\nfatal: clone of '.+' into submodule path '(.+)' failed": GitError.SubmoduleRepositoryDoesNotExist,
|
|
89
90
|
"Fetched in submodule path '(.+)', but it did not contain (.+). Direct fetching of that commit failed.": GitError.InvalidSubmoduleSHA,
|
|
90
91
|
"fatal: could not create work tree dir '(.+)'.*: Permission denied": GitError.LocalPermissionDenied,
|
|
@@ -92,7 +93,7 @@ exports.GitErrorRegexes = {
|
|
|
92
93
|
'invalid upstream (.+)': GitError.InvalidRebase,
|
|
93
94
|
'fatal: Non-fast-forward commit does not make sense into an empty head': GitError.NonFastForwardMergeIntoEmptyHead,
|
|
94
95
|
'error: (.+): (patch does not apply|already exists in working directory)': GitError.PatchDoesNotApply,
|
|
95
|
-
"fatal:
|
|
96
|
+
"fatal: [Aa] branch named '(.+)' already exists.?": GitError.BranchAlreadyExists,
|
|
96
97
|
"fatal: bad revision '(.*)'": GitError.BadRevision,
|
|
97
98
|
'fatal: [Nn]ot a git repository \\(or any of the parent directories\\): (.*)': GitError.NotAGitRepository,
|
|
98
99
|
'fatal: refusing to merge unrelated histories': GitError.CannotMergeUnrelatedHistories,
|
|
@@ -122,7 +123,8 @@ exports.GitErrorRegexes = {
|
|
|
122
123
|
"fatal: tag '(.+)' already exists": GitError.TagAlreadyExists,
|
|
123
124
|
'error: Your local changes to the following files would be overwritten by merge:\n': GitError.MergeWithLocalChanges,
|
|
124
125
|
'error: cannot (pull with rebase|rebase): You have unstaged changes\\.\n\\s*error: [Pp]lease commit or stash them\\.': GitError.RebaseWithLocalChanges,
|
|
125
|
-
'error: commit (.+) is a merge but no -m option was given': GitError.MergeCommitNoMainlineOption
|
|
126
|
+
'error: commit (.+) is a merge but no -m option was given': GitError.MergeCommitNoMainlineOption,
|
|
127
|
+
"fatal: unsafe repository \\('(.+)' is owned by someone else\\)": GitError.UnsafeDirectory
|
|
126
128
|
};
|
|
127
129
|
/**
|
|
128
130
|
* 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.3-59249aa-windows-x64.tar.gz",
|
|
4
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.3-1/dugite-native-v2.35.3-59249aa-windows-x64.tar.gz",
|
|
5
|
+
"checksum": "e0f469a98e68cef65d25d06dadb85cbcccf648b1ac0321df59c27120f1827cac"
|
|
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.3-59249aa-windows-x86.tar.gz",
|
|
9
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.3-1/dugite-native-v2.35.3-59249aa-windows-x86.tar.gz",
|
|
10
|
+
"checksum": "77550c67e5ed195abbbcaa20a7407f6d4e5ded3e38ad4ff709710e4a48f3ee98"
|
|
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.3-59249aa-macOS-x64.tar.gz",
|
|
14
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.3-1/dugite-native-v2.35.3-59249aa-macOS-x64.tar.gz",
|
|
15
|
+
"checksum": "44245a880b0e7ea045a93cdf42cd179b604ec232ddcf277910a1b9fdfd8a0024"
|
|
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.3-59249aa-macOS-arm64.tar.gz",
|
|
19
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.3-1/dugite-native-v2.35.3-59249aa-macOS-arm64.tar.gz",
|
|
20
|
+
"checksum": "2adfc2a069da4d8f147f146f061c3e6320df5e110397bec18fce915ad8e1b413"
|
|
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.3-59249aa-ubuntu.tar.gz",
|
|
24
|
+
"url": "https://github.com/desktop/dugite-native/releases/download/v2.35.3-1/dugite-native-v2.35.3-59249aa-ubuntu.tar.gz",
|
|
25
|
+
"checksum": "a15c6501ed6980f9d2d7956d85d70d218f58a1f4c72661383e268c2c283eb46d"
|
|
26
26
|
}
|
|
27
27
|
}
|