From 545196d7eb2b549432b4b11ef833d17f60621a77 Mon Sep 17 00:00:00 2001
From: Maxwell Becker <49575486+mbecker20@users.noreply.github.com>
Date: Sun, 15 Jun 2025 23:45:50 -0700
Subject: [PATCH] 1.18.3 (#603)

* start 1.18.3 branch

* git::pull will fetch before checkout

* dev-2

* 1.18.3 quick release
---
 Cargo.lock                  | 26 +++++++++++++-------------
 Cargo.toml                  |  2 +-
 client/core/ts/package.json |  2 +-
 lib/git/src/pull.rs         | 18 ++++++++++++++++++
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1abc8d8f2..a715b1114 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -890,7 +890,7 @@ dependencies = [
 
 [[package]]
 name = "cache"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "anyhow",
  "tokio",
@@ -1057,7 +1057,7 @@ dependencies = [
 
 [[package]]
 name = "command"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "anyhow",
  "formatting",
@@ -1541,7 +1541,7 @@ dependencies = [
 
 [[package]]
 name = "environment_file"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "thiserror 2.0.12",
 ]
@@ -1621,7 +1621,7 @@ dependencies = [
 
 [[package]]
 name = "formatting"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "serror",
 ]
@@ -1783,7 +1783,7 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "git"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "anyhow",
  "cache",
@@ -2536,7 +2536,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_cli"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "anyhow",
  "clap",
@@ -2552,7 +2552,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_client"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "anyhow",
  "async_timing_util",
@@ -2584,7 +2584,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_core"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "anyhow",
  "arc-swap",
@@ -2653,7 +2653,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_periphery"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "anyhow",
  "async_timing_util",
@@ -2697,7 +2697,7 @@ dependencies = [
 
 [[package]]
 name = "komodo_util"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "anyhow",
  "dotenvy",
@@ -2786,7 +2786,7 @@ dependencies = [
 
 [[package]]
 name = "logger"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "anyhow",
  "komodo_client",
@@ -3541,7 +3541,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "periphery_client"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "anyhow",
  "komodo_client",
@@ -4065,7 +4065,7 @@ dependencies = [
 
 [[package]]
 name = "response"
-version = "1.18.2"
+version = "1.18.3"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/Cargo.toml b/Cargo.toml
index 19232789e..30effd646 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.18.2"
+version = "1.18.3"
 edition = "2024"
 authors = ["mbecker20 <becker.maxh@gmail.com>"]
 license = "GPL-3.0-or-later"
diff --git a/client/core/ts/package.json b/client/core/ts/package.json
index 25183deba..05ddbf0d4 100644
--- a/client/core/ts/package.json
+++ b/client/core/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "komodo_client",
-  "version": "1.18.2",
+  "version": "1.18.3",
   "description": "Komodo client package",
   "homepage": "https://komo.do",
   "main": "dist/lib.js",
diff --git a/lib/git/src/pull.rs b/lib/git/src/pull.rs
index 697bdbd81..dd185c871 100644
--- a/lib/git/src/pull.rs
+++ b/lib/git/src/pull.rs
@@ -121,6 +121,24 @@ where
       });
     }
 
+    // First fetch remote branches before checkout
+    let fetch = run_komodo_command(
+      "Git fetch",
+      path.as_ref(),
+      "git fetch --all --prune",
+    )
+    .await;
+    if !fetch.success {
+      logs.push(fetch);
+      return Ok(GitRes {
+        logs,
+        path,
+        hash: None,
+        message: None,
+        env_file_path: None,
+      });
+    }
+
     let checkout = run_komodo_command(
       "Checkout branch",
       path.as_ref(),