merge-ort: remove debugging crud

While developing commit a16e8efe5c2b (merge-ort: fix
merge.directoryRenames=false, 2025-03-13), I was testing things out and
had an extra condition on one of the if-blocks that I occasionally
swapped between '&& 0' and '&& 1' to see the effects of the changes.  I
forgot to remove it before submitting and it wasn't caught in review.
Remove it now.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-ort.c b/merge-ort.c
index 29858074f9d8bf8b8138b10f983957cd4cded16d..23b55c5b929b223668d8b2ebffe6176d3b110884 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -3438,7 +3438,7 @@ static int collect_renames(struct merge_options *opt,
                        continue;
                }
                if (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_NONE &&
-                   p->status == 'R' && 1) {
+                   p->status == 'R') {
                        possibly_cache_new_pair(renames, p, side_index, NULL);
                        goto skip_directory_renames;
                }