Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Revert "Use git exec candidate list on all platforms for build" #34844

Merged
merged 1 commit into from
Jul 22, 2022

Conversation

loic-sharma
Copy link
Member

@loic-sharma loic-sharma commented Jul 22, 2022

Reverts #34294 to fix flutter/flutter#108122.

This change incorrectly moves the pre-push githook to the non-Windows hook, thereby breaking git push on Windows.

/cc @mtolmacs

Copy link
Member

@cbracken cbracken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM stamp from a Japanese personal seal

@loic-sharma loic-sharma added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 22, 2022
raise IOError(f"Looks like GIT is not on the path. Tried '{candidates}'")
if IsWindows():
git = 'git.bat'
githooks = os.path.join(githooks, 'windows')
Copy link
Member Author

@loic-sharma loic-sharma Jul 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the line that causes the issue: it shouldn't be updated before the non-Windows pre-push githook is fixed to work on Windows.

Copy link
Contributor

@mtolmacs mtolmacs Jul 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The non-Windows pre-push works perfectly on Windows since forever, the issue is with python executable discovery / requirement as the main pre-push is a python script.

Edit: Leaving this comment for my reference and for whoever comes around looking back.

Copy link
Contributor

@yaakovschectman yaakovschectman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it's just the removal of setup.py:32 that lead to the problem

@auto-submit auto-submit bot merged commit 07924c5 into main Jul 22, 2022
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 22, 2022
@cbracken cbracken deleted the revert-34294-windows-git-cmd branch August 2, 2022 17:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
autosubmit Merge PR when tree becomes green via auto submit App
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flutter engine git push is broken on Windows
4 participants