global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-25 09:31:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-ort: remove debugging crud

Browse Source 
While developing commit a16e8efe5c (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>
This commit is contained in:
Elijah Newren
2025-11-03 18:01:47 +00:00
committed by Junio C Hamano
parent ffe702b3ed
commit d5663a4b05
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-ort.c
View File

@@ -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;
}