From ce83aaf38dec4ca994fc885b96979675553793bb Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Thu, 16 Apr 2020 14:20:48 -0700
Subject: [PATCH] git pull --ff-only (#54987)

---
 packages/flutter_tools/lib/src/commands/upgrade.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/flutter_tools/lib/src/commands/upgrade.dart b/packages/flutter_tools/lib/src/commands/upgrade.dart
index 3d11dcb37e1..7b51c3ba7fb 100644
--- a/packages/flutter_tools/lib/src/commands/upgrade.dart
+++ b/packages/flutter_tools/lib/src/commands/upgrade.dart
@@ -236,7 +236,7 @@ class UpgradeCommandRunner {
   /// returns true, otherwise returns false.
   Future<bool> attemptFastForward(FlutterVersion oldFlutterVersion) async {
     final int code = await processUtils.stream(
-      <String>['git', 'pull', '--ff'],
+      <String>['git', 'pull', '--ff-only'],
       workingDirectory: workingDirectory,
       mapFunction: (String line) => matchesGitLine(line) ? null : line,
     );