From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: sbeller@google.com, gitster@pobox.com, Elijah Newren <newren@gmail.com>
Subject: [PATCH v2 33/33] merge-recursive: ensure we write updates for directory-renamed file
Date: Mon, 20 Nov 2017 14:02:09 -0800 [thread overview]
Message-ID: <20171120220209.15111-34-newren@gmail.com> (raw)
In-Reply-To: <20171120220209.15111-1-newren@gmail.com>
When a file is present in HEAD before the merge and the other side of the
merge does not modify that file, we try to avoid re-writing the file and
making it stat-dirty. However, when a file is present in HEAD before the
merge and was in a directory that was renamed by the other side of the
merge, we have to move the file to a new location and re-write it.
Update the code that checks whether we can skip the update to also work in
the presence of directory renames.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
merge-recursive.c | 4 +---
t/t6043-merge-rename-directories.sh | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 33d2b5e55e..cf8986be82 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2740,7 +2740,6 @@ static int merge_content(struct merge_options *o,
if (mfi.clean && !df_conflict_remains &&
oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) {
- int path_renamed_outside_HEAD;
output(o, 3, _("Skipped %s (merged same as existing)"), path);
/*
* The content merge resulted in the same file contents we
@@ -2748,8 +2747,7 @@ static int merge_content(struct merge_options *o,
* are recorded at the correct path (which may not be true
* if the merge involves a rename).
*/
- path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
- if (!path_renamed_outside_HEAD) {
+ if (was_tracked(path)) {
add_cacheinfo(o, mfi.mode, &mfi.oid, path,
0, (!o->call_depth), 0);
return mfi.clean;
diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh
index 119d7f5d70..f1538087ca 100755
--- a/t/t6043-merge-rename-directories.sh
+++ b/t/t6043-merge-rename-directories.sh
@@ -3711,7 +3711,7 @@ test_expect_success '12b-setup: Moving one directory hierarchy into another' '
)
'
-test_expect_failure '12b-check: Moving one directory hierarchy into another' '
+test_expect_success '12b-check: Moving one directory hierarchy into another' '
(
cd 12b &&
--
2.15.0.309.g00c152f825
prev parent reply other threads:[~2017-11-20 22:02 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-20 22:01 [PATCH v2 00/33] Add directory rename detection to git Elijah Newren
2017-11-20 22:01 ` [PATCH v2 01/33] Tighten and correct a few testcases for merging and cherry-picking Elijah Newren
2017-11-20 22:01 ` [PATCH v2 02/33] merge-recursive: fix logic ordering issue Elijah Newren
2017-11-20 22:01 ` [PATCH v2 03/33] merge-recursive: add explanation for src_entry and dst_entry Elijah Newren
2017-11-20 22:01 ` [PATCH v2 04/33] directory rename detection: basic testcases Elijah Newren
2017-11-20 22:01 ` [PATCH v2 05/33] directory rename detection: directory splitting testcases Elijah Newren
2017-11-20 22:01 ` [PATCH v2 06/33] directory rename detection: testcases to avoid taking detection too far Elijah Newren
2017-11-20 22:01 ` [PATCH v2 07/33] directory rename detection: partially renamed directory testcase/discussion Elijah Newren
2017-11-20 22:01 ` [PATCH v2 08/33] directory rename detection: files/directories in the way of some renames Elijah Newren
2017-11-20 22:01 ` [PATCH v2 09/33] directory rename detection: testcases checking which side did the rename Elijah Newren
2017-11-20 22:01 ` [PATCH v2 10/33] directory rename detection: more involved edge/corner testcases Elijah Newren
2017-11-20 22:01 ` [PATCH v2 11/33] directory rename detection: testcases exploring possibly suboptimal merges Elijah Newren
2017-11-20 22:01 ` [PATCH v2 12/33] directory rename detection: miscellaneous testcases to complete coverage Elijah Newren
2017-11-20 22:01 ` [PATCH v2 13/33] directory rename detection: tests for handling overwriting untracked files Elijah Newren
2017-11-20 22:01 ` [PATCH v2 14/33] directory rename detection: tests for handling overwriting dirty files Elijah Newren
2017-11-20 22:01 ` [PATCH v2 15/33] merge-recursive: move the get_renames() function Elijah Newren
2017-11-20 22:01 ` [PATCH v2 16/33] merge-recursive: introduce new functions to handle rename logic Elijah Newren
2017-11-20 22:01 ` [PATCH v2 17/33] merge-recursive: fix leaks of allocated renames and diff_filepairs Elijah Newren
2017-11-20 22:01 ` [PATCH v2 18/33] merge-recursive: make !o->detect_rename codepath more obvious Elijah Newren
2017-11-20 22:01 ` [PATCH v2 19/33] merge-recursive: split out code for determining diff_filepairs Elijah Newren
2017-11-20 22:01 ` [PATCH v2 20/33] merge-recursive: add a new hashmap for storing directory renames Elijah Newren
2017-11-20 22:01 ` [PATCH v2 21/33] merge-recursive: add get_directory_renames() Elijah Newren
2017-11-20 22:01 ` [PATCH v2 22/33] merge-recursive: check for directory level conflicts Elijah Newren
2017-11-20 22:01 ` [PATCH v2 23/33] merge-recursive: add a new hashmap for storing file collisions Elijah Newren
2017-11-20 22:02 ` [PATCH v2 24/33] merge-recursive: add computation of collisions due to dir rename & merging Elijah Newren
2017-11-20 22:02 ` [PATCH v2 25/33] merge-recursive: check for file level conflicts then get new name Elijah Newren
2017-11-20 22:02 ` [PATCH v2 26/33] merge-recursive: when comparing files, don't include trees Elijah Newren
2017-11-20 22:02 ` [PATCH v2 27/33] merge-recursive: apply necessary modifications for directory renames Elijah Newren
2017-11-20 22:02 ` [PATCH v2 28/33] merge-recursive: avoid clobbering untracked files with " Elijah Newren
2017-11-20 22:02 ` [PATCH v2 29/33] merge-recursive: fix overwriting dirty files involved in renames Elijah Newren
2017-11-20 22:02 ` [PATCH v2 30/33] merge-recursive: fix remaining directory rename + dirty overwrite cases Elijah Newren
2017-11-20 22:02 ` [PATCH v2 31/33] directory rename detection: new testcases showcasing a pair of bugs Elijah Newren
2017-11-20 22:02 ` [PATCH v2 32/33] merge-recursive: avoid spurious rename/rename conflict from dir renames Elijah Newren
2017-11-20 22:02 ` Elijah Newren [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171120220209.15111-34-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).