From 164a9116e129cd9e014d9b2651a85e09cfb7879d Mon Sep 17 00:00:00 2001
From: spacewander <spacewanderlzx@gmail.com>
Date: Tue, 24 Oct 2023 22:25:32 +0800
Subject: [PATCH] git-cp: don't stop execution when merge.ff is not set

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 f703148eb..b597e8f71 100755
--- a/bin/git-cp
+++ b/bin/git-cp
@@ -39,7 +39,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