From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: Elijah Newren <newren@gmail•com>, Elijah Newren <newren@gmail•com>
Subject: [PATCH 2/3] merge-ort: remove debugging crud
Date: Mon, 03 Nov 2025 18:01:47 +0000 [thread overview]
Message-ID: <bbbf2971ab3d70c1d455973c4a1f24b407a56a1b.1762192908.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1992.git.1762192908.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail•com>
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>
---
merge-ort.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
}
--
gitgitgadget
next prev parent reply other threads:[~2025-11-03 18:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-03 18:01 [PATCH 0/3] Fix another crazy rename assertion Elijah Newren via GitGitGadget
2025-11-03 18:01 ` [PATCH 1/3] t6429: update comment to mention correct tool Elijah Newren via GitGitGadget
2025-11-07 14:36 ` Kristoffer Haugsbakk
2025-11-07 22:40 ` Elijah Newren
2025-11-17 1:01 ` Junio C Hamano
2025-11-17 19:54 ` Elijah Newren
2025-11-17 22:10 ` Junio C Hamano
2025-11-03 18:01 ` Elijah Newren via GitGitGadget [this message]
2025-11-03 18:01 ` [PATCH 3/3] merge-ort: fix failing merges in special corner case Elijah Newren via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bbbf2971ab3d70c1d455973c4a1f24b407a56a1b.1762192908.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=newren@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox