git-cp: don't stop execution when merge.ff is not set (#1096)

Signed-off-by: spacewander <[email protected]>
tj · Oct 26, 2023 · 78c5ca2 · 78c5ca2
1 parent 90221f2
commit 78c5ca2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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