diff options
| author | Elijah Newren <newren@gmail.com> | 2025-11-03 18:01:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-11-17 14:08:08 -0800 |
| commit | d5663a4b05640a44aa52a0cc32ba6a601d7c9149 (patch) | |
| tree | 7105178ce0183e7183c1dfe3f3491f5c472330b9 | |
| parent | ffe702b3edf85aa924d685a8603205d47e94e851 (diff) | |
| download | git-d5663a4b05640a44aa52a0cc32ba6a601d7c9149.tar.gz | |
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>
| -rw-r--r-- | merge-ort.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c index 29858074f9..23b55c5b92 100644 --- 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; } |