From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Elijah Newren <newren@gmail.com>
Subject: [PATCH v3 18/33] merge-recursive: make !o->detect_rename codepath more obvious
Date: Tue, 21 Nov 2017 00:00:44 -0800 [thread overview]
Message-ID: <20171121080059.32304-19-newren@gmail.com> (raw)
In-Reply-To: <20171121080059.32304-1-newren@gmail.com>
Previously, if !o->detect_rename then get_renames() would return an
empty string_list, and then process_renames() would have nothing to
iterate over. It seems more straightforward to simply avoid calling
either function in that case.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
merge-recursive.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index db8590ab1a..7f975f3f52 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1329,8 +1329,6 @@ static struct string_list *get_renames(struct merge_options *o,
struct diff_options opts;
renames = xcalloc(1, sizeof(struct string_list));
- if (!o->detect_rename)
- return renames;
diff_setup(&opts);
opts.flags.recursive = 1;
@@ -1648,6 +1646,12 @@ static int handle_renames(struct merge_options *o,
struct string_list *entries,
struct rename_info *ri)
{
+ ri->head_renames = NULL;
+ ri->merge_renames = NULL;
+
+ if (!o->detect_rename)
+ return 1;
+
ri->head_renames = get_renames(o, head, common, head, merge, entries);
ri->merge_renames = get_renames(o, merge, common, head, merge, entries);
return process_renames(o, ri->head_renames, ri->merge_renames);
@@ -1658,6 +1662,9 @@ static void cleanup_rename(struct string_list *rename)
const struct rename *re;
int i;
+ if (rename == NULL)
+ return;
+
for (i = 0; i < rename->nr; i++) {
re = rename->items[i].util;
diff_free_filepair(re->pair);
--
2.15.0.309.g62ce55426d
next prev parent reply other threads:[~2017-11-21 8:02 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 8:00 [PATCH v3 00/33] Add directory rename detection to git Elijah Newren
2017-11-21 8:00 ` [PATCH v3 01/33] Tighten and correct a few testcases for merging and cherry-picking Elijah Newren
2017-11-21 8:00 ` [PATCH v3 02/33] merge-recursive: fix logic ordering issue Elijah Newren
2017-11-21 8:00 ` [PATCH v3 03/33] merge-recursive: add explanation for src_entry and dst_entry Elijah Newren
2017-11-21 8:00 ` [PATCH v3 04/33] directory rename detection: basic testcases Elijah Newren
2017-11-21 8:00 ` [PATCH v3 05/33] directory rename detection: directory splitting testcases Elijah Newren
2017-11-21 8:00 ` [PATCH v3 06/33] directory rename detection: testcases to avoid taking detection too far Elijah Newren
2017-11-21 8:00 ` [PATCH v3 07/33] directory rename detection: partially renamed directory testcase/discussion Elijah Newren
2017-11-21 8:00 ` [PATCH v3 08/33] directory rename detection: files/directories in the way of some renames Elijah Newren
2017-11-21 8:00 ` [PATCH v3 09/33] directory rename detection: testcases checking which side did the rename Elijah Newren
2017-11-21 8:00 ` [PATCH v3 10/33] directory rename detection: more involved edge/corner testcases Elijah Newren
2017-11-21 8:00 ` [PATCH v3 11/33] directory rename detection: testcases exploring possibly suboptimal merges Elijah Newren
2017-11-22 18:29 ` Stefan Beller
2017-11-21 8:00 ` [PATCH v3 12/33] directory rename detection: miscellaneous testcases to complete coverage Elijah Newren
2017-11-21 8:00 ` [PATCH v3 13/33] directory rename detection: tests for handling overwriting untracked files Elijah Newren
2017-11-21 8:00 ` [PATCH v3 14/33] directory rename detection: tests for handling overwriting dirty files Elijah Newren
2017-11-21 8:00 ` [PATCH v3 15/33] merge-recursive: move the get_renames() function Elijah Newren
2017-11-21 8:00 ` [PATCH v3 16/33] merge-recursive: introduce new functions to handle rename logic Elijah Newren
2017-11-21 8:00 ` [PATCH v3 17/33] merge-recursive: fix leaks of allocated renames and diff_filepairs Elijah Newren
2017-11-21 8:00 ` Elijah Newren [this message]
2017-11-21 8:00 ` [PATCH v3 19/33] merge-recursive: split out code for determining diff_filepairs Elijah Newren
2017-11-21 8:00 ` [PATCH v3 20/33] merge-recursive: add a new hashmap for storing directory renames Elijah Newren
2017-11-21 8:00 ` [PATCH v3 21/33] merge-recursive: add get_directory_renames() Elijah Newren
2017-11-26 0:52 ` Johannes Schindelin
2017-11-26 1:45 ` Elijah Newren
2017-11-21 8:00 ` [PATCH v3 22/33] merge-recursive: check for directory level conflicts Elijah Newren
2017-11-22 18:36 ` Stefan Beller
2017-11-21 8:00 ` [PATCH v3 23/33] merge-recursive: add a new hashmap for storing file collisions Elijah Newren
2017-11-21 8:00 ` [PATCH v3 24/33] merge-recursive: add computation of collisions due to dir rename & merging Elijah Newren
2017-11-21 8:00 ` [PATCH v3 25/33] merge-recursive: check for file level conflicts then get new name Elijah Newren
2017-11-22 18:56 ` Stefan Beller
2017-11-21 8:00 ` [PATCH v3 26/33] merge-recursive: when comparing files, don't include trees Elijah Newren
2017-11-21 8:00 ` [PATCH v3 27/33] merge-recursive: apply necessary modifications for directory renames Elijah Newren
2017-11-21 8:00 ` [PATCH v3 28/33] merge-recursive: avoid clobbering untracked files with " Elijah Newren
2017-11-21 8:00 ` [PATCH v3 29/33] merge-recursive: fix overwriting dirty files involved in renames Elijah Newren
2017-11-21 8:00 ` [PATCH v3 30/33] merge-recursive: fix remaining directory rename + dirty overwrite cases Elijah Newren
2017-11-21 8:00 ` [PATCH v3 31/33] directory rename detection: new testcases showcasing a pair of bugs Elijah Newren
2017-11-21 8:00 ` [PATCH v3 32/33] merge-recursive: avoid spurious rename/rename conflict from dir renames Elijah Newren
2017-11-21 8:00 ` [PATCH v3 33/33] merge-recursive: ensure we write updates for directory-renamed file Elijah Newren
2017-11-22 0:42 ` [PATCH v3 00/33] Add directory rename detection to git Stefan Beller
2017-11-22 1:12 ` Elijah Newren
2017-11-22 2:44 ` Junio C Hamano
2017-11-22 19:24 ` Stefan Beller
2017-11-23 6:22 ` Elijah Newren
2017-11-23 11:52 ` Adam Dinwoodie
2017-11-23 22:28 ` Elijah Newren
2017-11-24 5:25 ` Elijah Newren
2017-11-24 20:07 ` Elijah Newren
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=20171121080059.32304-19-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).