Merge pull request #77 from microsoft/copilot/fix-75

Fix Microsoft Git install to use releases API for latest, lts, and current versions

Author: markphip

src/microsoft-git/devcontainer-feature.json

@@ -1,18 +1,18 @@
 {
     "name": "Microsoft Git for monorepo with GVFS support",
     "id": "microsoft-git",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "description": "A fork of Git containing Microsoft-specific patches",
     "options": {
         "version": {
             "type": "string",
             "proposals": [
                 "latest",
-                "2.43.0.vfs.0.0",
-                "2.42.0.vfs.0.3",
-                "2.40.1.vfs.0.2",
-                "2.39.2.vfs.0.0",
-                "2.38.1.vfs.0.1"
+                "2.50.1.vfs.0.2",
+                "2.50.1.vfs.0.1",
+                "2.50.1.vfs.0.0",
+                "2.49.0.vfs.0.4",
+                "2.49.0.vfs.0.3"
             ],
             "default": "latest",
             "description": "Select version of Microsoft Git, if not latest."

src/microsoft-git/install.sh

@@ -44,15 +44,21 @@ fi
 # Partial version matching
 if [ "$(echo "${GIT_VERSION}" | grep -o '\.' | wc -l)" != "2" ]; then
     requested_version="${GIT_VERSION}"
-    version_list="$(curl -sSL -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/microsoft/git/tags?per_page=100" | grep -oP '"name":\s*"v\K[0-9]+\.[0-9]+\.[0-9]+\.vfs\.[0-9]+\.[0-9]+"' | tr -d '"' | sort -rV)"
     if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "lts" ] || [ "${requested_version}" = "current" ]; then
-        GIT_VERSION="$(echo "${version_list}" | head -n 1)"
+        # For latest, lts, and current, use the releases API to get the actual latest release
+        GIT_VERSION="$(curl -sSL -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/microsoft/git/releases/latest" | grep -oP '"tag_name":\s*"v\K[0-9]+\.[0-9]+\.[0-9]+\.vfs\.[0-9]+\.[0-9]+"' | tr -d '"')"
     else
+        # For partial versions, use the existing tags logic
+        version_list="$(curl -sSL -H "Accept: application/vnd.github.v3+json" "https://api.github.com/repos/microsoft/git/tags?per_page=100" | grep -oP '"name":\s*"v\K[0-9]+\.[0-9]+\.[0-9]+\.vfs\.[0-9]+\.[0-9]+"' | tr -d '"' | sort -rV)"
         set +e
         GIT_VERSION="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
         set -e
+        if [ -z "${GIT_VERSION}" ] || ! echo "${version_list}" | grep "^${GIT_VERSION//./\\.}$" > /dev/null 2>&1; then
+            echo "Invalid git version: ${requested_version}" >&2
+            exit 1
+        fi
     fi
-    if [ -z "${GIT_VERSION}" ] || ! echo "${version_list}" | grep "^${GIT_VERSION//./\\.}$" > /dev/null 2>&1; then
+    if [ -z "${GIT_VERSION}" ]; then
         echo "Invalid git version: ${requested_version}" >&2
         exit 1
     fi