From c63b984443986fa4a1d417b3b8d707b1261f6abf Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Fri, 16 Oct 2020 14:08:47 +0200
Subject: [PATCH] Try to guess the remote's default branch

This is an ugly hack and a proper solution should be implemented.
---
 lib/state_container.dart | 9 +--------
 pubspec.lock             | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/state_container.dart b/lib/state_container.dart
index b9b4faae..b21629af 100644
--- a/lib/state_container.dart
+++ b/lib/state_container.dart
@@ -331,21 +331,14 @@ class StateContainer with ChangeNotifier {
     });
   }
 
-  // FIXME: Pass the remote name that was added
   void completeGitHostSetup(String repoFolderName, String remoteName) {
     () async {
       var repo = await GitRepository.load(_gitRepo.gitDirPath);
       var remote = repo.config.remote(remoteName);
-      var remoteBranchName = 'master';
+      var remoteBranchName = await repo.guessRemoteHead(remoteName);
 
-      // FIXME: How to get this?
-      //
-      // There is no way to get it, just need to iterate over the refs
-      // and look for one!
       await repo.setUpstreamTo(remote, remoteBranchName);
 
-      // At this point the remote should have been added and fetched
-
       await _gitRepo.merge();
       settings.remoteGitRepoConfigured = true;
 
diff --git a/pubspec.lock b/pubspec.lock
index 28048a31..6eef8ef1 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -181,7 +181,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: aed5883fd17219c778cdf2d0d613a873d0b20f6c
+      resolved-ref: "09bc129de57f8c179305a99ca1b9a885a4807c3f"
       url: "https://github.com/GitJournal/dart_git.git"
     source: git
     version: "0.0.1"