From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin Johannes.Schindelin@gmx.de,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/2] Dir rename fixes
Date: Fri, 11 Oct 2019 13:42:23 -0700 (PDT) [thread overview]
Message-ID: <pull.390.git.gitgitgadget@gmail.com> (raw)
This series improves a couple things found after looking into things Dscho
flagged:
* clarify and slightly restructure code in the get_renamed_dir_portion()
function
* extend support of detecting renaming/merging of one directory into
another to support the root directory as a target directory
First patch best viewed with a --histogram diff, which I sadly don't know
how to make gitgitgadget generate.
Elijah Newren (2):
merge-recursive: clean up get_renamed_dir_portion()
merge-recursive: fix merging a subdirectory into the root directory
merge-recursive.c | 89 +++++++++++++++++++++--------
t/t6043-merge-rename-directories.sh | 56 ++++++++++++++++++
2 files changed, 121 insertions(+), 24 deletions(-)
base-commit: 08da6496b61341ec45eac36afcc8f94242763468
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-390%2Fnewren%2Fdir-rename-fixes-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-390/newren/dir-rename-fixes-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/390
--
gitgitgadget
next reply other threads:[~2019-10-11 20:42 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 20:42 Elijah Newren via GitGitGadget [this message]
2019-10-11 20:42 ` [PATCH 1/2] merge-recursive: clean up get_renamed_dir_portion() Elijah Newren via GitGitGadget
2019-10-12 19:47 ` Johannes Schindelin
2019-10-11 20:42 ` [PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory Elijah Newren via GitGitGadget
2019-10-12 20:37 ` Johannes Schindelin
2019-10-13 0:40 ` Elijah Newren
2019-10-14 10:41 ` Johannes Schindelin
2019-10-22 19:15 ` Elijah Newren
2019-10-24 22:22 ` Johannes Schindelin
2019-10-25 0:12 ` Elijah Newren
2019-10-25 13:30 ` Johannes Schindelin
2019-10-29 1:20 ` Junio C Hamano
2019-10-30 7:01 ` Elijah Newren
2019-10-30 22:16 ` Johannes Schindelin
2019-10-30 22:31 ` Elijah Newren
2019-10-31 8:28 ` Johannes Schindelin
2019-10-12 18:41 ` [PATCH 0/2] Dir rename fixes Johannes Schindelin
2019-10-22 21:22 ` [PATCH v2 0/3] " Elijah Newren via GitGitGadget
2019-10-22 21:22 ` [PATCH v2 1/3] merge-recursive: clean up get_renamed_dir_portion() Elijah Newren via GitGitGadget
2019-10-22 21:22 ` [PATCH v2 2/3] merge-recursive: fix merging a subdirectory into the root directory Elijah Newren via GitGitGadget
2019-10-22 21:22 ` [PATCH v2 3/3] t604[236]: do not run setup in separate tests Elijah Newren via GitGitGadget
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=pull.390.git.gitgitgadget@gmail.com \
--to=gitgitgadget@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.