From 3278564948a9139f3710e4d01c5ab0fdb7ed8654 Mon Sep 17 00:00:00 2001 From: Loic Sharma Date: Tue, 5 Mar 2024 11:15:17 -0800 Subject: [PATCH 1/2] Fix git hooks on Windows --- tools/githooks/post-checkout | 2 +- tools/githooks/post-merge | 2 +- tools/githooks/pre-push | 2 +- tools/githooks/pre-rebase | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/githooks/post-checkout b/tools/githooks/post-checkout index 123debdc28991..8858d4952b80d 100755 --- a/tools/githooks/post-checkout +++ b/tools/githooks/post-checkout @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env vpython3 # Copyright 2013 The Flutter Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/tools/githooks/post-merge b/tools/githooks/post-merge index 18beeef645059..0502091e8041d 100755 --- a/tools/githooks/post-merge +++ b/tools/githooks/post-merge @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env vpython3 # Copyright 2013 The Flutter Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/tools/githooks/pre-push b/tools/githooks/pre-push index 097730aae6b9f..7c5322d8cd6a8 100755 --- a/tools/githooks/pre-push +++ b/tools/githooks/pre-push @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env vpython3 # Copyright 2013 The Flutter Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/tools/githooks/pre-rebase b/tools/githooks/pre-rebase index afaf9423e9949..6da10a470ce42 100755 --- a/tools/githooks/pre-rebase +++ b/tools/githooks/pre-rebase @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env vpython3 # Copyright 2013 The Flutter Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. From d9903bf63ca2fbd8268fd4e00a5cdc1fa1ce3c10 Mon Sep 17 00:00:00 2001 From: Loic Sharma Date: Tue, 5 Mar 2024 11:16:00 -0800 Subject: [PATCH 2/2] Improve message --- tools/githooks/lib/src/messages.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/githooks/lib/src/messages.dart b/tools/githooks/lib/src/messages.dart index d524404cf5408..787a8a134be51 100644 --- a/tools/githooks/lib/src/messages.dart +++ b/tools/githooks/lib/src/messages.dart @@ -14,6 +14,6 @@ void printGclientSyncReminder(String command) { final String postfix = io.stdout.supportsAnsiEscapes ? _reset : ''; io.stderr.writeln('$command: The engine source tree has been updated.'); io.stderr.writeln( - '\n${prefix}You man need to run "gclient sync -D"$postfix\n', + '\n${prefix}You may need to run "gclient sync -D"$postfix\n', ); }