From 78c5ca28a0355bfd02cfbb9b7c3db7b756fd50b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=B3=BD=E8=BD=A9?= <spacewanderlzx@gmail.com>
Date: Thu, 26 Oct 2023 12:28:19 +0800
Subject: [PATCH] git-cp: don't stop execution when merge.ff is not set (#1096)

Signed-off-by: spacewander <spacewanderlzx@gmail.com>
---
 bin/git-cp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/git-cp b/bin/git-cp
index 9021f6f..0911824 100755
--- a/bin/git-cp
+++ b/bin/git-cp
@@ -51,7 +51,7 @@ else
     fi
 
     MERGE_OPT=
-    ff=$(git config --get merge.ff)
+    ff=$(git config --get merge.ff || true)
     if [[ "$ff" == "only" ]]; then
         MERGE_OPT="--ff"
     fi