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>
Elijah Newren committed
Nov 3, 2025 at 18:01 UTC
d5663a4b05640a44aa52a0cc32ba6a601d7c9149
1 file changed
+1
-1
merge-ort.c
+1
-1
@@ -3438,7 +3438,7 @@ static int collect_renames(struct merge_options *opt,
3438
continue;
3439
}
3440
if (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_NONE &&
3441
- p->status == 'R' && 1) {
3441
+ p->status == 'R') {
3442
possibly_cache_new_pair(renames, p, side_index, NULL);
3443
goto skip_directory_renames;
3444
}