From 67e4af625b20d045f3161c346502fabd6c5131cf Mon Sep 17 00:00:00 2001
From: David Keijser <keijser@gmail.com>
Date: Mon, 6 Jan 2025 14:04:52 +0100
Subject: [PATCH] Don't abort script when no upstream is configured

---
 git-fixup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-fixup b/git-fixup
index af66bb0..7128b05 100755
--- a/git-fixup
+++ b/git-fixup
@@ -250,7 +250,7 @@ if test "$base" = "closest"; then
 fi
 
 if test -z "$base"; then
-    upstream=$(git rev-parse "@{upstream}" 2>/dev/null)
+    upstream=$(git rev-parse "@{upstream}" 2>/dev/null || true)
     head=$(git rev-parse HEAD 2>/dev/null)
     if test -n "$upstream" && test "$upstream" != "$head"; then
         base="$upstream"