From 339adc14472e255685df723e22279079f18dd2eb Mon Sep 17 00:00:00 2001
From: Natalie Weizenbaum <nweiz@google.com>
Date: Tue, 21 Sep 2021 13:19:48 -0700
Subject: [PATCH] Commit to the main branch of bazelrules/rules_sass

---
 tool/grind/bazel.dart     | 5 +++--
 tool/grind/benchmark.dart | 6 ++++--
 tool/grind/utils.dart     | 7 -------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/tool/grind/bazel.dart b/tool/grind/bazel.dart
index 1093c3938..4569d7267 100644
--- a/tool/grind/bazel.dart
+++ b/tool/grind/bazel.dart
@@ -16,7 +16,8 @@ Future<void> updateBazel() async {
 
   run("npm", arguments: ["install", "-g", "yarn"]);
 
-  var repo = await cloneOrPull("https://github.com/bazelbuild/rules_sass.git");
+  var repo = await cloneOrCheckout(
+      "https://github.com/bazelbuild/rules_sass.git", "origin/main");
 
   var packageFile = File(p.join(repo, "sass", "package.json"));
   log("updating ${packageFile.path}");
@@ -62,7 +63,7 @@ Future<void> updateBazel() async {
       arguments: [
         "push",
         "https://$username:$password@github.com/bazelbuild/rules_sass.git",
-        "HEAD:master"
+        "HEAD:main"
       ],
       workingDirectory: repo);
 }
diff --git a/tool/grind/benchmark.dart b/tool/grind/benchmark.dart
index e0e416c2e..912d2de68 100644
--- a/tool/grind/benchmark.dart
+++ b/tool/grind/benchmark.dart
@@ -95,8 +95,10 @@ Future<void> _writeNTimes(String path, String text, num times,
 @Depends(benchmarkGenerate, "pkg-compile-snapshot", "pkg-compile-native",
     "pkg-npm-release")
 Future<void> benchmark() async {
-  var libsass = await cloneOrPull('https://github.com/sass/libsass');
-  var sassc = await cloneOrPull('https://github.com/sass/sassc');
+  var libsass =
+      await cloneOrCheckout('https://github.com/sass/libsass', 'origin/master');
+  var sassc =
+      await cloneOrCheckout('https://github.com/sass/sassc', 'origin/master');
 
   await runAsync("make",
       runOptions: RunOptions(
diff --git a/tool/grind/utils.dart b/tool/grind/utils.dart
index 055b554c9..7e2ce022d 100644
--- a/tool/grind/utils.dart
+++ b/tool/grind/utils.dart
@@ -42,13 +42,6 @@ String environment(String name) {
   return value;
 }
 
-/// Ensure that the repository at [url] is cloned into the build directory and
-/// pointing to the latest master revision.
-///
-/// Returns the path to the repository.
-Future<String> cloneOrPull(String url) async =>
-    cloneOrCheckout(url, "origin/master");
-
 /// Ensure that the repository at [url] is cloned into the build directory and
 /// pointing to [ref].
 ///