DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

git pull --ff-only (#54987)

Browse Source
This commit is contained in:
Jenn Magder 2020-04-16 14:20:48 -07:00 committed by GitHub
parent f1d522d503
commit ce83aaf38d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter_tools/lib/src/commands/upgrade.dart
View File

@ -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,
);