merge-ort: remove debugging crud

newren · newren · commit 69e542885fc1 · 2025-10-17T14:01:13.000-07:00
While developing commit a16e8ef (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>
diff --git 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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -3438,7 +3438,7 @@ static int collect_renames(struct merge_options *opt,`
`3438`	`3438`	`continue;`
`3439`	`3439`	`}`
`3440`	`3440`	`if (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_NONE &&`
`3441`		`- p->status == 'R' && 1) {`
	`3441`	`+ p->status == 'R') {`
`3442`	`3442`	`possibly_cache_new_pair(renames, p, side_index, NULL);`
`3443`	`3443`	`goto skip_directory_renames;`
`3444`	`3444`	`}`