Address PR review feedback

Author: data-douser

client/Makefile

@@ -4,7 +4,20 @@ VERSION := $(shell grep 'Version = ' cmd/root.go | head -1 | sed 's/.*"\(.*\)"/\
 
 # Use bash as the Make recipe shell (required on Windows where the default
 # shell cannot execute .sh scripts).
-SHELL := bash
+# On Windows, "bash" can resolve to C:\Windows\System32\bash.exe (WSL launcher)
+# instead of Git Bash. Prefer Git Bash when available.
+ifeq ($(OS),Windows_NT)
+  GIT_BASH := $(firstword $(wildcard $(ProgramW6432)/Git/bin/bash.exe) \
+                           $(wildcard $(ProgramFiles)/Git/bin/bash.exe) \
+                           $(wildcard $(PROGRAMFILES)/Git/bin/bash.exe))
+  ifdef GIT_BASH
+    SHELL := $(GIT_BASH)
+  else
+    SHELL := bash
+  endif
+else
+  SHELL := bash
+endif
 
 # Disable CGO to avoid Xcode/C compiler dependency
 export CGO_ENABLED = 0