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

Signed-off-by: spacewander <[email protected]>
tj · Oct 24, 2023 · 164a911 · 164a911
1 parent 263dcb4
commit 164a911
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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