git pull --ff-only (#54987)

ce83aaf3 · Jenn Magder · GitHub · f1d522d5 · ce83aaf3
Unverified Commit ce83aaf3 authored Apr 16, 2020 by Jenn Magder Committed by GitHub Apr 16, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

upgrade.dart packages/flutter_tools/lib/src/commands/upgrade.dart +1 -1

No files found.
--- 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,
    );