From aea12b40736cf7e687b448777b6a0ddd28721629 Mon Sep 17 00:00:00 2001
From: matcool <26722564+matcool@users.noreply.github.com>
Date: Sun, 8 Oct 2023 11:05:27 -0300
Subject: [PATCH] fix geode sdk install

---
 src/sdk.rs | 58 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/sdk.rs b/src/sdk.rs
index 80421f8..3d30ba4 100644
--- a/src/sdk.rs
+++ b/src/sdk.rs
@@ -4,7 +4,7 @@ use path_absolutize::Absolutize;
 use crate::config::Config;
 use crate::util::logging::ask_confirm;
 use git2::build::{RepoBuilder, CheckoutBuilder};
-use git2::{FetchOptions, RemoteCallbacks, Repository, SubmoduleUpdateOptions};
+use git2::{FetchOptions, RemoteCallbacks, Repository};
 use reqwest::header::{USER_AGENT, AUTHORIZATION};
 use semver::{Version, Prerelease};
 use serde::Deserialize;
@@ -230,6 +230,8 @@ fn install(config: &mut Config, path: PathBuf, force: bool) {
 		);
 	}
 
+	fetch_repo_info(&repo);
+
 	switch_to_tag(config, &repo);
 
 	done!("Successfully installed SDK");
@@ -237,6 +239,34 @@ fn install(config: &mut Config, path: PathBuf, force: bool) {
 	info!("Use `geode sdk install-binaries` to install pre-built binaries");
 }
 
+fn fetch_repo_info(repo: &git2::Repository) -> git2::MergeAnalysis {
+	let mut remote = repo.find_remote("origin").unwrap();
+
+	let mut callbacks = RemoteCallbacks::new();
+	callbacks.sideband_progress(|x| {
+		print!(
+			"{} {}",
+			"| Info |".bright_cyan(),
+			std::str::from_utf8(x).unwrap()
+		);
+		true
+	});
+
+	remote
+		.fetch(
+			&["main"],
+			Some(FetchOptions::new().remote_callbacks(callbacks)),
+			None,
+		)
+		.nice_unwrap("Could not fetch latest update");
+
+	// Check if can fast-forward
+	let fetch_head = repo.find_reference("FETCH_HEAD").unwrap();
+	let fetch_commit = repo.reference_to_annotated_commit(&fetch_head).unwrap();
+
+	repo.merge_analysis(&[&fetch_commit]).unwrap().0
+}
+
 fn update(config: &mut Config, branch: Option<String>) {
 	// Switch branch if necessary
 	match branch.as_deref().unwrap_or(if config.sdk_nightly { "nightly" } else { "stable" }) {
@@ -264,31 +294,7 @@ fn update(config: &mut Config, branch: Option<String>) {
 		.nice_unwrap("Could not initialize local SDK repository");
 
 	// Fetch
-	let mut remote = repo.find_remote("origin").unwrap();
-
-	let mut callbacks = RemoteCallbacks::new();
-	callbacks.sideband_progress(|x| {
-		print!(
-			"{} {}",
-			"| Info |".bright_cyan(),
-			std::str::from_utf8(x).unwrap()
-		);
-		true
-	});
-
-	remote
-		.fetch(
-			&["main"],
-			Some(FetchOptions::new().remote_callbacks(callbacks)),
-			None,
-		)
-		.nice_unwrap("Could not fetch latest update");
-
-	// Check if can fast-forward
-	let fetch_head = repo.find_reference("FETCH_HEAD").unwrap();
-	let fetch_commit = repo.reference_to_annotated_commit(&fetch_head).unwrap();
-
-	let merge_analysis = repo.merge_analysis(&[&fetch_commit]).unwrap().0;
+	let merge_analysis = fetch_repo_info(&repo);
 
 	if merge_analysis.is_up_to_date() {
 		switch_to_tag(config, &repo);