From 23031886148832f04323435f1a7a73d7d71918a8 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Thu, 7 Jan 2016 10:25:38 -0800 Subject: [PATCH] Handle trying to upgrade Flutter with no upstream Fixes #1084 --- packages/flutter_tools/lib/src/commands/upgrade.dart | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/flutter_tools/lib/src/commands/upgrade.dart b/packages/flutter_tools/lib/src/commands/upgrade.dart index 104aeee888..3258edf31b 100644 --- a/packages/flutter_tools/lib/src/commands/upgrade.dart +++ b/packages/flutter_tools/lib/src/commands/upgrade.dart @@ -14,7 +14,16 @@ class UpgradeCommand extends FlutterCommand { @override Future runInProject() async { - int code = await runCommandAndStreamOutput([ + try { + runCheckedSync([ + 'git', 'rev-parse', '@{u}' + ], workingDirectory: ArtifactStore.flutterRoot); + } catch (e) { + print('Unable to upgrade Flutter. No upstream repository configured for Flutter.'); + return 1; + } + + int code = await runCommandAndStreamOutput([ 'git', 'pull', '--ff-only' ], workingDirectory: ArtifactStore.flutterRoot);