git-cp: continue to merge when merge.ff is only (tj#1070)

Signed-off-by: spacewander <[email protected]>
rascalDan · Sep 13, 2023 · f95e339 · f95e339
1 parent db71be5
commit f95e339
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/bin/git-cp b/bin/git-cp
@@ -38,6 +38,12 @@ else
         exit 40
     fi
 
+    MERGE_OPT=
+    ff=$(git config --get merge.ff)
+    if [[ "$ff" == "only" ]]; then
+        MERGE_OPT="--ff"
+    fi
+
     echo "Copying $CURRENT_FILENAME into $DESTINATION_FILENAME"
 
     INTERMEDIATE_FILENAME="${CURRENT_FILENAME//\//__}-move-to-${DESTINATION_FILENAME//\//__}"
@@ -59,7 +65,8 @@ else
     git reset --hard HEAD^
 
     # We keep both files
-    git merge "${DESTINATION_SAVED}" "${INTERMEDIATE_SAVED}" -m "Duplicate ${CURRENT_FILENAME} history."
+    # shellcheck disable=SC2086
+    git merge $MERGE_OPT "${DESTINATION_SAVED}" "${INTERMEDIATE_SAVED}" -m "Duplicate ${CURRENT_FILENAME} history."
 
     # We get back our original name
     git mv "${INTERMEDIATE_FILENAME}" "${CURRENT_FILENAME}"