From 64c83cfc8718f19033d55ec340c90a5bca32d968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Sharma?=
 <737941+loic-sharma@users.noreply.github.com>
Date: Fri, 22 Jul 2022 10:45:04 -0700
Subject: [PATCH] Revert "Use git exec candidate list on all platforms for
 build" (flutter/engine#34844)

---
 engine/src/flutter/build/git_revision.py   | 15 ++++++++-------
 engine/src/flutter/tools/githooks/setup.py | 15 +++++++++------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/engine/src/flutter/build/git_revision.py b/engine/src/flutter/build/git_revision.py
index 0b0653f3ad3..d84886d8b84 100755
--- a/engine/src/flutter/build/git_revision.py
+++ b/engine/src/flutter/build/git_revision.py
@@ -10,7 +10,11 @@ import sys
 import subprocess
 import os
 import argparse
-from shutil import which  # Natively supported since python 3.3
+
+
+def is_windows():
+  os_id = sys.platform
+  return os_id.startswith('win32') or os_id.startswith('cygwin')
 
 
 def get_repository_version(repository):
@@ -18,12 +22,9 @@ def get_repository_version(repository):
   if not os.path.exists(repository):
     raise IOError('path does not exist')
 
-  git_candidates = ['git', 'git.sh', 'git.bat']
-  git = next(filter(which, git_candidates), None)
-  if git is None:
-    candidates = "', '".join(git_candidates)
-    raise IOError(f"Looks like GIT is not on the path. Tried '{candidates}'")
-
+  git = 'git'
+  if is_windows():
+    git = 'git.bat'
   version = subprocess.check_output([
       git,
       '-C',
diff --git a/engine/src/flutter/tools/githooks/setup.py b/engine/src/flutter/tools/githooks/setup.py
index 9e677e96b91..ea8edf467a8 100755
--- a/engine/src/flutter/tools/githooks/setup.py
+++ b/engine/src/flutter/tools/githooks/setup.py
@@ -10,7 +10,6 @@ Sets up githooks.
 import os
 import subprocess
 import sys
-from shutil import which  # Natively supported since python 3.3
 
 SRC_ROOT = os.path.dirname(
     os.path.dirname(
@@ -20,13 +19,17 @@ SRC_ROOT = os.path.dirname(
 FLUTTER_DIR = os.path.join(SRC_ROOT, 'flutter')
 
 
+def IsWindows():
+  os_id = sys.platform
+  return os_id.startswith('win32') or os_id.startswith('cygwin')
+
+
 def Main(argv):
+  git = 'git'
   githooks = os.path.join(FLUTTER_DIR, 'tools', 'githooks')
-  git_candidates = ['git', 'git.sh', 'git.bat']
-  git = next(filter(which, git_candidates), None)
-  if git is None:
-    candidates = "', '".join(git_candidates)
-    raise IOError(f"Looks like GIT is not on the path. Tried '{candidates}'")
+  if IsWindows():
+    git = 'git.bat'
+    githooks = os.path.join(githooks, 'windows')
   result = subprocess.run([
       git,
       'config',