Merge pull request #18615 from desktop/releases/3.3.19-beta1

Release 3.3.19-beta1

app/package.json

@@ -3,7 +3,7 @@
  "productName": "GitHub Desktop",
  "bundleID": "com.github.GitHubClient",
  "companyName": "GitHub, Inc.",
- "version": "3.3.18",
+ "version": "3.3.19-beta1",
  "main": "./main.js",
  "repository": {
  "type": "git",
@@ -32,7 +32,7 @@
  "desktop-trampoline": "desktop/desktop-trampoline#v0.9.8",
  "dexie": "^3.2.2",
  "dompurify": "^2.3.3",
- "dugite": "^2.7.0",
+ "dugite": "^2.7.1",
  "electron-window-state": "^5.0.3",
  "event-kit": "^2.0.0",
  "focus-trap-react": "^8.1.0",

app/src/lib/trampoline/trampoline-environment.ts

@@ -134,9 +134,7 @@ export async function withTrampolineEnv<T>(
 
 const isAuthFailure = (e: unknown): e is GitError =>
  e instanceof GitError &&
- (e.result.gitError === DugiteError.HTTPSAuthenticationFailed ||
- // TODO: This should be in dugite instead of desktop!
- /fatal: Authentication failed for 'http:/.test(e.result.stderr))
+ e.result.gitError === DugiteError.HTTPSAuthenticationFailed
 
 function deleteMostRecentGenericCredential(token: string) {
  const cred = mostRecentGenericGitCredential.get(token)

app/yarn.lock

@@ -365,10 +365,10 @@ dompurify@^2.3.3:
  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.3.tgz#c1af3eb88be47324432964d8abc75cf4b98d634c"
  integrity sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg==
 
-dugite@^2.7.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/dugite/-/dugite-2.7.0.tgz#9d7b5a29034ee9d0fdd2046e45305e7969db302c"
- integrity sha512-PKJFprCYhNElmu6LzwuGnQrKfgYLxawA8bDcwhxyop1jIQv+EJ+28mqEdaP8m1k4PZP2Gda5mTp4+B5QEEiikg==
+dugite@^2.7.1:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/dugite/-/dugite-2.7.1.tgz#277275fd490bddf20180e124d119f84f708dfb32"
+ integrity sha512-X7v7JngMG6RGHKCKKF0fdqYC9Xcw0CDes43an6dQW2N2dYNd/OOLq3BFszCOyOObgKnrmNVvyggk3O4WGJMpcA==
  dependencies:
  progress "^2.0.3"
  tar "^6.1.11"

changelog.json

@@ -1,5 +1,8 @@
 {
  "releases": {
+ "3.3.19-beta1": [
+ "[Fixed] Clear stored credentials when authentication fails on insecure http hosts - #18588"
+ ],
  "3.3.18": [
  "[Fixed] Prevent Pull Request comment or review dialog from moving constantly under some circumstances - #18596",
  "[Fixed] Prevent Pull Request notification dialogs from truncating long Pull Request titles - #18596",
@@ -9,7 +12,8 @@
  "[Improved] Upgrade embedded Git to v2.43.4 on macOS, and to v2.43.4.windows.1 on Windows"
  ],
  "3.3.18-beta3": [
- "[Improved] Upgrade embedded Git to v2.43.4 on macOS, and to v2.43.4.windows.1 on Windows"
+ "[Improved] Upgrade embedded Git to v2.43.4 on macOS, and to v2.43.4.windows.1 on Windows",
+ "[Removed] Clear stored credentials when authentication fails on insecure http hosts - #18588"
  ],
  "3.3.18-beta2": [
  "[Fixed] Prevent Pull Request comment or review dialog from moving constantly under some circumstances - #18596",