From: Elijah Newren <newren@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, sbeller@google.com,
Elijah Newren <newren@gmail.com>
Subject: [PATCH v8 29/29] merge-recursive: ensure we write updates for directory-renamed file
Date: Wed, 14 Feb 2018 10:52:06 -0800 [thread overview]
Message-ID: <20180214185206.15492-30-newren@gmail.com> (raw)
In-Reply-To: <20180214185206.15492-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.
Reviewed-by: Stefan Beller <sbeller@google.com>
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 5063caabe1..ffe1d0d117 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2772,7 +2772,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
@@ -2780,8 +2779,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 45f620633f..2e28f2908d 100755
--- a/t/t6043-merge-rename-directories.sh
+++ b/t/t6043-merge-rename-directories.sh
@@ -3884,7 +3884,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.16.1.232.g28d5be9217
next prev parent reply other threads:[~2018-02-14 18:53 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-14 18:51 [PATCH v8 00/29] Add directory rename detection to git Elijah Newren
2018-02-14 18:51 ` [PATCH v8 01/29] directory rename detection: basic testcases Elijah Newren
2018-02-14 18:51 ` [PATCH v8 02/29] directory rename detection: directory splitting testcases Elijah Newren
2018-02-14 18:51 ` [PATCH v8 03/29] directory rename detection: testcases to avoid taking detection too far Elijah Newren
2018-02-14 18:51 ` [PATCH v8 04/29] directory rename detection: partially renamed directory testcase/discussion Elijah Newren
2018-02-14 18:51 ` [PATCH v8 05/29] directory rename detection: files/directories in the way of some renames Elijah Newren
2018-02-14 18:51 ` [PATCH v8 06/29] directory rename detection: testcases checking which side did the rename Elijah Newren
2018-02-14 18:51 ` [PATCH v8 07/29] directory rename detection: more involved edge/corner testcases Elijah Newren
2018-02-14 18:51 ` [PATCH v8 08/29] directory rename detection: testcases exploring possibly suboptimal merges Elijah Newren
2018-02-14 18:51 ` [PATCH v8 09/29] directory rename detection: miscellaneous testcases to complete coverage Elijah Newren
2018-02-14 18:51 ` [PATCH v8 10/29] directory rename detection: tests for handling overwriting untracked files Elijah Newren
2018-02-14 18:51 ` [PATCH v8 11/29] directory rename detection: tests for handling overwriting dirty files Elijah Newren
2018-02-14 18:51 ` [PATCH v8 12/29] merge-recursive: move the get_renames() function Elijah Newren
2018-02-14 18:51 ` [PATCH v8 13/29] merge-recursive: introduce new functions to handle rename logic Elijah Newren
2018-02-14 18:51 ` [PATCH v8 14/29] merge-recursive: fix leaks of allocated renames and diff_filepairs Elijah Newren
2018-02-14 18:51 ` [PATCH v8 15/29] merge-recursive: make !o->detect_rename codepath more obvious Elijah Newren
2018-02-14 18:51 ` [PATCH v8 16/29] merge-recursive: split out code for determining diff_filepairs Elijah Newren
2018-02-14 18:51 ` [PATCH v8 17/29] merge-recursive: make a helper function for cleanup for handle_renames Elijah Newren
2018-02-14 18:51 ` [PATCH v8 18/29] merge-recursive: add get_directory_renames() Elijah Newren
2018-02-14 18:51 ` [PATCH v8 19/29] merge-recursive: check for directory level conflicts Elijah Newren
2018-02-14 18:51 ` [PATCH v8 20/29] merge-recursive: add computation of collisions due to dir rename & merging Elijah Newren
2018-02-14 18:51 ` [PATCH v8 21/29] merge-recursive: check for file level conflicts then get new name Elijah Newren
2018-02-14 18:51 ` [PATCH v8 22/29] merge-recursive: when comparing files, don't include trees Elijah Newren
2018-02-14 18:52 ` [PATCH v8 23/29] merge-recursive: apply necessary modifications for directory renames Elijah Newren
2018-02-14 18:52 ` [PATCH v8 24/29] merge-recursive: avoid clobbering untracked files with " Elijah Newren
2018-02-14 18:52 ` [PATCH v8 25/29] merge-recursive: fix overwriting dirty files involved in renames Elijah Newren
2018-02-14 18:52 ` [PATCH v8 26/29] merge-recursive: fix remaining directory rename + dirty overwrite cases Elijah Newren
2018-02-14 18:52 ` [PATCH v8 27/29] directory rename detection: new testcases showcasing a pair of bugs Elijah Newren
2018-02-14 18:52 ` [PATCH v8 28/29] merge-recursive: avoid spurious rename/rename conflict from dir renames Elijah Newren
2018-02-14 18:52 ` Elijah Newren [this message]
2018-02-14 19:44 ` [PATCH v8 00/29] Add directory rename detection to git Stefan Beller
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=20180214185206.15492-30-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.
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).