From 2ef91ff5c97774f3d62868fb5d92cb56ecb05204 Mon Sep 17 00:00:00 2001
From: Markus Olsson <j.markus.olsson@gmail.com>
Date: Wed, 12 Jun 2024 16:36:31 +0200
Subject: [PATCH] Put the credential helper in mingw32 on arm64

---
 script/build.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/build.ts b/script/build.ts
index 47ab822dee..620f433366 100755
--- a/script/build.ts
+++ b/script/build.ts
@@ -34,6 +34,7 @@ import {
   getExecutableName,
   isPublishable,
   getIconFileName,
+  getDistArchitecture,
 } from './dist-info'
 import { isGitHubActions } from './build-platforms'
 
@@ -330,9 +331,10 @@ function copyDependencies() {
   copySync(path.resolve(projectRoot, 'app/node_modules/dugite/git'), gitDir)
 
   console.log('  Copying desktop credential helper…')
+  const mingw = getDistArchitecture() === 'x64' ? 'mingw64' : 'mingw32'
   const gitCoreDir =
     process.platform === 'win32'
-      ? path.resolve(outRoot, 'git', 'mingw64', 'libexec', 'git-core')
+      ? path.resolve(outRoot, 'git', mingw, 'libexec', 'git-core')
       : path.resolve(outRoot, 'git', 'libexec', 'git-core')
 
   const desktopCredentialHelperTrampolineFile =