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"