From 3e31dbd29d207aa568047079697675e37e08ada6 Mon Sep 17 00:00:00 2001
From: Christopher Fujino <christopherfujino@gmail.com>
Date: Mon, 11 May 2020 12:05:02 -0700
Subject: [PATCH] fix ref (#56721)

---
 dev/tools/lib/roll_dev.dart       | 6 +++---
 dev/tools/test/roll_dev_test.dart | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/tools/lib/roll_dev.dart b/dev/tools/lib/roll_dev.dart
index 12ead146ed..645201b12d 100644
--- a/dev/tools/lib/roll_dev.dart
+++ b/dev/tools/lib/roll_dev.dart
@@ -96,7 +96,7 @@ bool run({
   git.run('fetch $origin', 'fetch $origin');
   git.run('reset $commit --hard', 'reset to the release commit');
 
-  String version = getFullTag(git);
+  String version = getFullTag(git, origin);
 
   version = incrementLevel(version, level);
 
@@ -177,10 +177,10 @@ ArgResults parseArguments(ArgParser argParser, List<String> args) {
 }
 
 /// Obtain the version tag of the previous dev release.
-String getFullTag(Git git) {
+String getFullTag(Git git, String remote) {
   const String glob = '*.*.*-*.*.pre';
   // describe the latest dev release
-  const String ref = 'refs/heads/dev';
+  final String ref = 'refs/remotes/$remote/dev';
   return git.getOutput(
     'describe --match $glob --exact-match --tags $ref',
     'obtain last released version number',
diff --git a/dev/tools/test/roll_dev_test.dart b/dev/tools/test/roll_dev_test.dart
index 600dda8195..682b7ac4ff 100644
--- a/dev/tools/test/roll_dev_test.dart
+++ b/dev/tools/test/roll_dev_test.dart
@@ -136,7 +136,7 @@ void main() {
       when(mockGit.getOutput('remote get-url $origin', any)).thenReturn(kUpstreamRemote);
       when(mockGit.getOutput('status --porcelain', any)).thenReturn('');
       when(mockGit.getOutput(
-        'describe --match *.*.*-*.*.pre --exact-match --tags refs/heads/dev',
+        'describe --match *.*.*-*.*.pre --exact-match --tags refs/remotes/$origin/dev',
         any,
       )).thenReturn('1.2.3-0.0.pre');
       fakeArgResults = FakeArgResults(
@@ -161,7 +161,7 @@ void main() {
       when(mockGit.getOutput('remote get-url $origin', any)).thenReturn(kUpstreamRemote);
       when(mockGit.getOutput('status --porcelain', any)).thenReturn('');
       when(mockGit.getOutput(
-        'describe --match *.*.*-*.*.pre --exact-match --tags refs/heads/dev',
+        'describe --match *.*.*-*.*.pre --exact-match --tags refs/remotes/$origin/dev',
         any,
       )).thenReturn('1.2.3-0.0.pre');
       when(mockGit.getOutput('rev-parse HEAD', any)).thenReturn(commit);
@@ -188,7 +188,7 @@ void main() {
       when(mockGit.getOutput('remote get-url $origin', any)).thenReturn(kUpstreamRemote);
       when(mockGit.getOutput('status --porcelain', any)).thenReturn('');
       when(mockGit.getOutput(
-        'describe --match *.*.*-*.*.pre --exact-match --tags refs/heads/dev',
+        'describe --match *.*.*-*.*.pre --exact-match --tags refs/remotes/$origin/dev',
         any,
       )).thenReturn('1.2.3-0.0.pre');
       when(mockGit.getOutput('rev-parse HEAD', any)).thenReturn(commit);