diff mbox series

[v4,2/5] merge-ort: small cleanups of check_for_directory_rename

Message ID 297fef60b19b28a24c449eb42948e0e9138cfdaa.1656984823.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit 51e41e4eaf2bd1d0344627d3326a3e20f90f4580
Headers show
Series Fix dual rename into each other plus conflicting adds | expand

Commit Message

Elijah Newren July 5, 2022, 1:33 a.m. UTC 
From: Elijah Newren <newren@palantir.com>

No functional changes, just some preparatory cleanups.

Suggested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Elijah Newren <newren@palantir.com>
---
 merge-ort.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/merge-ort.c b/merge-ort.c
index 8545354dafd..ff037cca8d2 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -2267,18 +2267,17 @@  static char *check_for_directory_rename(struct merge_options *opt,
 					struct strmap *collisions,
 					int *clean_merge)
 {
-	char *new_path = NULL;
+	char *new_path;
 	struct strmap_entry *rename_info;
-	struct strmap_entry *otherinfo = NULL;
+	struct strmap_entry *otherinfo;
 	const char *new_dir;
 
+	/* Cases where we don't have a directory rename for this path */
 	if (strmap_empty(dir_renames))
-		return new_path;
+		return NULL;
 	rename_info = check_dir_renamed(path, dir_renames);
 	if (!rename_info)
-		return new_path;
-	/* old_dir = rename_info->key; */
-	new_dir = rename_info->value;
+		return NULL;
 
 	/*
 	 * This next part is a little weird.  We do not want to do an
@@ -2304,6 +2303,7 @@  static char *check_for_directory_rename(struct merge_options *opt,
 	 * As it turns out, this also prevents N-way transient rename
 	 * confusion; See testcases 9c and 9d of t6043.
 	 */
+	new_dir = rename_info->value; /* old_dir = rename_info->key; */
 	otherinfo = strmap_get_entry(dir_rename_exclusions, new_dir);
 	if (otherinfo) {
 		path_msg(opt, rename_info->key, 1,