Merge pull request #101 from scaryrawr/git-2.53-fix

Add support for microsoft/git amd64/arm64.deb

Author: markphip

src/microsoft-git/devcontainer-feature.json

@@ -1,7 +1,7 @@
 {
     "name": "Microsoft Git for monorepo with GVFS support",
     "id": "microsoft-git",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "description": "A fork of Git containing Microsoft-specific patches",
     "options": {
         "version": {

src/microsoft-git/install.sh

@@ -85,11 +85,21 @@ fi
 # Install for Debian/Ubuntu
 check_packages wget git
 
-wget -q https://github.com/microsoft/git/releases/download/v${GIT_VERSION}/microsoft-git_${GIT_VERSION}.deb
+# Detect host architecture for arch-specific .deb packages (added in v2.52.0.vfs.0.5+)
+ARCH="$(dpkg --print-architecture)"
+DEB_URL="https://github.com/microsoft/git/releases/download/v${GIT_VERSION}/microsoft-git_${GIT_VERSION}_${ARCH}.deb"
+DEB_FILE="microsoft-git_${GIT_VERSION}_${ARCH}.deb"
+
+# Try arch-specific .deb first, fall back to no-arch .deb for older releases
+if ! wget -q "${DEB_URL}" -O "${DEB_FILE}" 2>/dev/null; then
+    DEB_URL="https://github.com/microsoft/git/releases/download/v${GIT_VERSION}/microsoft-git_${GIT_VERSION}.deb"
+    DEB_FILE="microsoft-git_${GIT_VERSION}.deb"
+    wget -q "${DEB_URL}" -O "${DEB_FILE}"
+fi
 
-dpkg -i "microsoft-git_${GIT_VERSION}.deb"
+dpkg -i "${DEB_FILE}"
 
-rm "microsoft-git_${GIT_VERSION}.deb"
+rm "${DEB_FILE}"
 
 rm -rf /var/lib/apt/lists/*
 echo "Done!"