Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
91a85ac2
Unverified
Commit
91a85ac2
authored
Feb 26, 2018
by
Todd Volkert
Committed by
GitHub
Feb 26, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fetch upstream refs before checking out branch in ChannelCommand (#14896)
https://github.com/flutter/flutter/issues/14893
parent
758c221d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
10 deletions
+19
-10
channel.dart
packages/flutter_tools/lib/src/commands/channel.dart
+19
-10
No files found.
packages/flutter_tools/lib/src/commands/channel.dart
View file @
91a85ac2
...
...
@@ -92,25 +92,34 @@ class ChannelCommand extends FlutterCommand {
}
static
Future
<
Null
>
_checkout
(
String
branchName
)
async
{
// Get latest refs from upstream.
int
result
=
await
runCommandAndStreamOutput
(
<
String
>[
'git'
,
'
show-ref'
,
'--verify'
,
'--quiet'
,
'refs/heads/
$branchName
'
],
<
String
>[
'git'
,
'
fetch
'
],
workingDirectory:
Cache
.
flutterRoot
,
prefix:
'git: '
,
);
if
(
result
==
0
)
{
// branch already exists, try just switching to it
result
=
await
runCommandAndStreamOutput
(
<
String
>[
'git'
,
'checkout'
,
branchName
],
workingDirectory:
Cache
.
flutterRoot
,
prefix:
'git: '
,
);
}
else
{
// branch does not exist, we have to create it
result
=
await
runCommandAndStreamOutput
(
<
String
>[
'git'
,
'
checkout'
,
'--track'
,
'-b'
,
branchName
,
'origin
/
$branchName
'
],
<
String
>[
'git'
,
'
show-ref'
,
'--verify'
,
'--quiet'
,
'refs/heads
/
$branchName
'
],
workingDirectory:
Cache
.
flutterRoot
,
prefix:
'git: '
,
);
if
(
result
==
0
)
{
// branch already exists, try just switching to it
result
=
await
runCommandAndStreamOutput
(
<
String
>[
'git'
,
'checkout'
,
branchName
],
workingDirectory:
Cache
.
flutterRoot
,
prefix:
'git: '
,
);
}
else
{
// branch does not exist, we have to create it
result
=
await
runCommandAndStreamOutput
(
<
String
>[
'git'
,
'checkout'
,
'--track'
,
'-b'
,
branchName
,
'origin/
$branchName
'
],
workingDirectory:
Cache
.
flutterRoot
,
prefix:
'git: '
,
);
}
}
if
(
result
!=
0
)
throwToolExit
(
'Switching channels failed with error code
$result
.'
,
exitCode:
result
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment