Wraps all `git` executions in a `Git(...).`, use `=noglob` on Windows #172495

matanlurey · 2025-07-21T21:54:38Z

The original issue called for, on Windows, telling CYGWIN to use =noglob, to work around some git operation errors that happen when using non-native Git. There ... was no great way to do this with the existing codebase without, IMO, adding lots of confusing code.

So, I refactored all the calls of:

before: processUtils.<method>(['git', ...args], ...params)
after: git.<method>([...args], ...params)

... and implicitly add the new environment variables, if Platform.isWindows.

Did some minor test cleanup and process execution cleanup while I was at it.

chingjun

LGTM with minor nits.

chingjun · 2025-07-21T22:57:56Z

packages/flutter_tools/lib/src/commands/upgrade.dart

-      await globals.processUtils.run(
-        <String>['git', 'fetch', '--tags'],
+      await globals.git.run(
+        <String>['fetch', '--tags'],


Nit: Remove the <String> to be consistent with the rest of the changes in this file. Same on line 339.

chingjun · 2025-07-21T22:59:59Z

packages/flutter_tools/lib/src/git.dart

+  /// Creates a wrapper that executes `git` using [runProcessWith].
+  Git({
+    required Platform currentPlatform,
+    required ProcessUtils runProcessWith, //


Remove the //?

chingjun · 2025-07-21T23:03:56Z

packages/flutter_tools/lib/src/version.dart

+    required this.flutterRoot,
+    required this.fs,
+  }) : _clock = clock,
+       _gitExecutable = git;


Any reason to call this _gitExecutable instead of _git like everywhere else?

auto-submit · 2025-07-21T23:53:19Z

autosubmit label was removed for flutter/flutter/172495, because - The status or check suite Windows tool_tests_commands has failed. Please fix the issues identified (or deflake) before re-applying this label.

auto-submit · 2025-07-22T23:59:34Z

autosubmit label was removed for flutter/flutter/172495, because - The status or check suite Google testing has failed. Please fix the issues identified (or deflake) before re-applying this label.

…` on Windows (flutter/flutter#172495)

flutter/flutter@ee0cc66...afba7d7 2025-07-23 [email protected] Remove GtkGLArea and render directly into GtkDrawingArea (flutter/flutter#172343) 2025-07-23 [email protected] Prefix generated Dart plugin imports for `registerWith` (flutter/flutter#172511) 2025-07-23 [email protected] Remove stale references to `.packages` in tool tests (flutter/flutter#172582) 2025-07-23 [email protected] Wraps all `git` executions in a `Git(...).*`, use `*=noglob` on Windows (flutter/flutter#172495) 2025-07-22 [email protected] Omit instruction to `cd .` after `flutter create` (flutter/flutter#172513) 2025-07-22 [email protected] Improve assertion message in `AlignmentDirectional.resolve` (flutter/flutter#172096) 2025-07-22 [email protected] Update warnGradleVersion to `8.7.0` (flutter/flutter#172576) 2025-07-22 [email protected] Use a fake representation of `cache/artifacts/gradle_wrapper` (flutter/flutter#172503) 2025-07-22 [email protected] Revert #160653 Fix view removal process for AutofillContextAction.cancel (flutter/flutter#172490) 2025-07-22 [email protected] Bump meta to 0.17.0 (flutter/flutter#172541) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…ws (flutter#172495) Closes flutter#74165. The original issue called for, on Windows, telling `CYGWIN` to use `=noglob`, to work around some git operation errors that happen when using non-native Git. There ... was no great way to do this with the existing codebase without, IMO, adding lots of confusing code. So, I refactored all the calls of: - before: `processUtils.<method>(['git', ...args], ...params)` - after: `git.<method>([...args], ...params)` ... and implicitly add the new environment variables, if `Platform.isWindows`. Did some minor test cleanup and process execution cleanup while I was at it.

…r#9665) flutter/flutter@ee0cc66...afba7d7 2025-07-23 [email protected] Remove GtkGLArea and render directly into GtkDrawingArea (flutter/flutter#172343) 2025-07-23 [email protected] Prefix generated Dart plugin imports for `registerWith` (flutter/flutter#172511) 2025-07-23 [email protected] Remove stale references to `.packages` in tool tests (flutter/flutter#172582) 2025-07-23 [email protected] Wraps all `git` executions in a `Git(...).*`, use `*=noglob` on Windows (flutter/flutter#172495) 2025-07-22 [email protected] Omit instruction to `cd .` after `flutter create` (flutter/flutter#172513) 2025-07-22 [email protected] Improve assertion message in `AlignmentDirectional.resolve` (flutter/flutter#172096) 2025-07-22 [email protected] Update warnGradleVersion to `8.7.0` (flutter/flutter#172576) 2025-07-22 [email protected] Use a fake representation of `cache/artifacts/gradle_wrapper` (flutter/flutter#172503) 2025-07-22 [email protected] Revert #160653 Fix view removal process for AutofillContextAction.cancel (flutter/flutter#172490) 2025-07-22 [email protected] Bump meta to 0.17.0 (flutter/flutter#172541) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…ws (flutter#172495) Closes flutter#74165. The original issue called for, on Windows, telling `CYGWIN` to use `=noglob`, to work around some git operation errors that happen when using non-native Git. There ... was no great way to do this with the existing codebase without, IMO, adding lots of confusing code. So, I refactored all the calls of: - before: `processUtils.<method>(['git', ...args], ...params)` - after: `git.<method>([...args], ...params)` ... and implicitly add the new environment variables, if `Platform.isWindows`. Did some minor test cleanup and process execution cleanup while I was at it.

…` on Windows (flutter/flutter#172495)

…ws (flutter#172495) Closes flutter#74165. The original issue called for, on Windows, telling `CYGWIN` to use `=noglob`, to work around some git operation errors that happen when using non-native Git. There ... was no great way to do this with the existing codebase without, IMO, adding lots of confusing code. So, I refactored all the calls of: - before: `processUtils.<method>(['git', ...args], ...params)` - after: `git.<method>([...args], ...params)` ... and implicitly add the new environment variables, if `Platform.isWindows`. Did some minor test cleanup and process execution cleanup while I was at it.

flutter/flutter#172495

matanlurey added 3 commits July 21, 2025 11:25

Wrap git executions and set noglob on Windows

0f4e503

Update tests

24846a8

++

47097d4

github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Jul 21, 2025

Fix forbidden imports

26f9011

matanlurey requested a review from chingjun July 21, 2025 22:21

chingjun approved these changes Jul 21, 2025

View reviewed changes

Address feedback

6feda4d

matanlurey added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 21, 2025

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jul 21, 2025

Merge remote-tracking branch 'upstream/master' into wrap-git-executions

a5fc080

matanlurey force-pushed the wrap-git-executions branch from 93a9fed to a5fc080 Compare July 22, 2025 19:59

Fix downgrade_test

58ec332

matanlurey added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 22, 2025

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jul 22, 2025

matanlurey added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 23, 2025

auto-submit bot added this pull request to the merge queue Jul 23, 2025

Merged via the queue into flutter:master with commit 6fd30fd Jul 23, 2025
142 of 143 checks passed

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jul 23, 2025

engine-flutter-autoroll mentioned this pull request Jul 23, 2025

Roll Flutter from ee0cc6652be7 to afba7d75b391 (10 revisions) flutter/packages#9665

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jul 23, 2025

6fd30fd25 Wraps all git executions in a Git(...).*, use `*=noglob…

dd17625

…` on Windows (flutter/flutter#172495)

matanlurey mentioned this pull request Aug 20, 2025

Flutter stable is 3.35.1 while main is 3.33.0-1.0.pre-1446 #173904

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 12, 2025

6fd30fd25 Wraps all git executions in a Git(...).*, use `*=noglob…

4000336

…` on Windows (flutter/flutter#172495)

JSUYA added a commit to JSUYA/flutter-tizen that referenced this pull request Dec 10, 2025

Apply "Wraps all git executions" PR

82a48ab

flutter/flutter#172495

JSUYA added a commit to JSUYA/flutter-tizen that referenced this pull request Dec 15, 2025

Apply "Wraps all git executions" PR

f138595

flutter/flutter#172495

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Wraps all `git` executions in a `Git(...).`, use `=noglob` on Windows #172495

Wraps all `git` executions in a `Git(...).`, use `=noglob` on Windows #172495

Uh oh!

matanlurey commented Jul 21, 2025 •

edited

Loading

Uh oh!

chingjun left a comment

Uh oh!

chingjun Jul 21, 2025

Uh oh!

chingjun Jul 21, 2025

Uh oh!

matanlurey Jul 21, 2025

Uh oh!

chingjun Jul 21, 2025

Uh oh!

matanlurey Jul 21, 2025

Uh oh!

auto-submit bot commented Jul 21, 2025

Uh oh!

auto-submit bot commented Jul 22, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Wraps all git executions in a Git(...).*, use *=noglob on Windows #172495

Wraps all git executions in a Git(...).*, use *=noglob on Windows #172495

Uh oh!

Conversation

matanlurey commented Jul 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chingjun left a comment

Choose a reason for hiding this comment

Uh oh!

chingjun Jul 21, 2025

Choose a reason for hiding this comment

Uh oh!

chingjun Jul 21, 2025

Choose a reason for hiding this comment

Uh oh!

matanlurey Jul 21, 2025

Choose a reason for hiding this comment

Uh oh!

chingjun Jul 21, 2025

Choose a reason for hiding this comment

Uh oh!

matanlurey Jul 21, 2025

Choose a reason for hiding this comment

Uh oh!

auto-submit bot commented Jul 21, 2025

Uh oh!

auto-submit bot commented Jul 22, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Wraps all `git` executions in a `Git(...).`, use `=noglob` on Windows #172495

Wraps all `git` executions in a `Git(...).`, use `=noglob` on Windows #172495

matanlurey commented Jul 21, 2025 •

edited

Loading