From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCH v5 00/34] Add directory rename detection to git
Date: Wed, 27 Dec 2017 20:13:18 -0800 [thread overview]
Message-ID: <20171228041352.27880-1-newren@gmail.com> (raw)
This patchset introduces directory rename detection to merge-recursive. See
https://public-inbox.org/git/20171110190550.27059-1-newren@gmail.com/
for the first series (including design considerations, etc.), and follow-up
series can be found at
https://public-inbox.org/git/20171120220209.15111-1-newren@gmail.com/
https://public-inbox.org/git/20171121080059.32304-1-newren@gmail.com/
https://public-inbox.org/git/20171129014237.32570-1-newren@gmail.com/
Changes since v4:
* Squashed Junio's GETTEXT_POISON fixes into the appropriate commits
Elijah Newren (34):
Tighten and correct a few testcases for merging and cherry-picking
merge-recursive: fix logic ordering issue
merge-recursive: add explanation for src_entry and dst_entry
directory rename detection: basic testcases
directory rename detection: directory splitting testcases
directory rename detection: testcases to avoid taking detection too
far
directory rename detection: partially renamed directory
testcase/discussion
directory rename detection: files/directories in the way of some
renames
directory rename detection: testcases checking which side did the
rename
directory rename detection: more involved edge/corner testcases
directory rename detection: testcases exploring possibly suboptimal
merges
directory rename detection: miscellaneous testcases to complete
coverage
directory rename detection: tests for handling overwriting untracked
files
directory rename detection: tests for handling overwriting dirty files
merge-recursive: move the get_renames() function
merge-recursive: introduce new functions to handle rename logic
merge-recursive: fix leaks of allocated renames and diff_filepairs
merge-recursive: make !o->detect_rename codepath more obvious
merge-recursive: split out code for determining diff_filepairs
merge-recursive: add a new hashmap for storing directory renames
merge-recursive: make a helper function for cleanup for handle_renames
merge-recursive: add get_directory_renames()
merge-recursive: check for directory level conflicts
merge-recursive: add a new hashmap for storing file collisions
merge-recursive: add computation of collisions due to dir rename &
merging
merge-recursive: check for file level conflicts then get new name
merge-recursive: when comparing files, don't include trees
merge-recursive: apply necessary modifications for directory renames
merge-recursive: avoid clobbering untracked files with directory
renames
merge-recursive: fix overwriting dirty files involved in renames
merge-recursive: fix remaining directory rename + dirty overwrite
cases
directory rename detection: new testcases showcasing a pair of bugs
merge-recursive: avoid spurious rename/rename conflict from dir
renames
merge-recursive: ensure we write updates for directory-renamed file
merge-recursive.c | 1231 ++++++++++-
merge-recursive.h | 17 +
strbuf.c | 16 +
strbuf.h | 16 +
t/t3501-revert-cherry-pick.sh | 5 +-
t/t6043-merge-rename-directories.sh | 3823 +++++++++++++++++++++++++++++++++++
t/t7607-merge-overwrite.sh | 7 +-
unpack-trees.c | 4 +-
unpack-trees.h | 4 +
9 files changed, 5007 insertions(+), 116 deletions(-)
create mode 100755 t/t6043-merge-rename-directories.sh
--
2.15.0.408.g8e199d483
next reply other threads:[~2017-12-28 4:14 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-28 4:13 Elijah Newren [this message]
2017-12-28 4:13 ` [PATCH v5 01/34] Tighten and correct a few testcases for merging and cherry-picking Elijah Newren
2017-12-28 4:13 ` [PATCH v5 02/34] merge-recursive: fix logic ordering issue Elijah Newren
2017-12-28 4:13 ` [PATCH v5 03/34] merge-recursive: add explanation for src_entry and dst_entry Elijah Newren
2017-12-28 4:13 ` [PATCH v5 04/34] directory rename detection: basic testcases Elijah Newren
2018-01-03 1:18 ` SZEDER Gábor
2018-01-03 3:43 ` Elijah Newren
2017-12-28 4:13 ` [PATCH v5 05/34] directory rename detection: directory splitting testcases Elijah Newren
2017-12-28 4:13 ` [PATCH v5 06/34] directory rename detection: testcases to avoid taking detection too far Elijah Newren
2017-12-28 4:13 ` [PATCH v5 07/34] directory rename detection: partially renamed directory testcase/discussion Elijah Newren
2017-12-28 4:13 ` [PATCH v5 08/34] directory rename detection: files/directories in the way of some renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 09/34] directory rename detection: testcases checking which side did the rename Elijah Newren
2017-12-28 4:13 ` [PATCH v5 10/34] directory rename detection: more involved edge/corner testcases Elijah Newren
2017-12-28 4:13 ` [PATCH v5 11/34] directory rename detection: testcases exploring possibly suboptimal merges Elijah Newren
2017-12-28 4:13 ` [PATCH v5 12/34] directory rename detection: miscellaneous testcases to complete coverage Elijah Newren
2017-12-28 4:13 ` [PATCH v5 13/34] directory rename detection: tests for handling overwriting untracked files Elijah Newren
2018-01-04 0:52 ` SZEDER Gábor
2018-01-04 21:10 ` Elijah Newren
2018-01-05 14:37 ` SZEDER Gábor
2018-01-05 20:31 ` Thomas Gummerer
2018-01-05 20:33 ` Elijah Newren
2017-12-28 4:13 ` [PATCH v5 14/34] directory rename detection: tests for handling overwriting dirty files Elijah Newren
2017-12-28 4:13 ` [PATCH v5 15/34] merge-recursive: move the get_renames() function Elijah Newren
2017-12-28 4:13 ` [PATCH v5 16/34] merge-recursive: introduce new functions to handle rename logic Elijah Newren
2017-12-28 4:13 ` [PATCH v5 17/34] merge-recursive: fix leaks of allocated renames and diff_filepairs Elijah Newren
2017-12-28 4:13 ` [PATCH v5 18/34] merge-recursive: make !o->detect_rename codepath more obvious Elijah Newren
2017-12-28 4:13 ` [PATCH v5 19/34] merge-recursive: split out code for determining diff_filepairs Elijah Newren
2017-12-28 4:13 ` [PATCH v5 20/34] merge-recursive: add a new hashmap for storing directory renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 21/34] merge-recursive: make a helper function for cleanup for handle_renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 22/34] merge-recursive: add get_directory_renames() Elijah Newren
2017-12-28 4:13 ` [PATCH v5 23/34] merge-recursive: check for directory level conflicts Elijah Newren
2017-12-28 4:13 ` [PATCH v5 24/34] merge-recursive: add a new hashmap for storing file collisions Elijah Newren
2017-12-28 4:13 ` [PATCH v5 25/34] merge-recursive: add computation of collisions due to dir rename & merging Elijah Newren
2017-12-28 4:13 ` [PATCH v5 26/34] merge-recursive: check for file level conflicts then get new name Elijah Newren
2017-12-28 4:13 ` [PATCH v5 27/34] merge-recursive: when comparing files, don't include trees Elijah Newren
2017-12-28 4:13 ` [PATCH v5 28/34] merge-recursive: apply necessary modifications for directory renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 29/34] merge-recursive: avoid clobbering untracked files with " Elijah Newren
2017-12-28 4:13 ` [PATCH v5 30/34] merge-recursive: fix overwriting dirty files involved in renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 31/34] merge-recursive: fix remaining directory rename + dirty overwrite cases Elijah Newren
2017-12-28 4:13 ` [PATCH v5 32/34] directory rename detection: new testcases showcasing a pair of bugs Elijah Newren
2017-12-28 4:13 ` [PATCH v5 33/34] merge-recursive: avoid spurious rename/rename conflict from dir renames Elijah Newren
2017-12-28 4:13 ` [PATCH v5 34/34] merge-recursive: ensure we write updates for directory-renamed file Elijah Newren
2018-01-03 0:02 ` [PATCH v5 00/34] Add directory rename detection to git Elijah Newren
2018-01-03 10:57 ` Johannes Sixt
2018-01-03 21:02 ` Elijah Newren
2018-01-03 22:23 ` Johannes Sixt
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=20171228041352.27880-1-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
/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).