git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 0/2] Dir rename fixes
Date: Sat, 12 Oct 2019 20:41:11 +0200 (CEST)
Message-ID: <nycvar.QRO.7.76.6.1910122035350.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <pull.390.git.gitgitgadget@gmail.com>

Hi Elijah,

On Fri, 11 Oct 2019, Elijah Newren via GitGitGadget wrote:

> 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

Will have a look in a moment,

> First patch best viewed with a --histogram diff, which I sadly don't know
> how to make gitgitgadget generate.

Currently, there is no way to do that yet. It should not be too
difficult to implement code to pick up a footer in the PR description to
do that, I just don't have the time right now to do so.

Essentially, it would have to imitate the already-existing code path
that picks up the `Cc:` footer in the PR description.

If you're interested, have a look at the `parsePullRequestDescription()`
function in `lib/patch-series.ts` in
https://github.com/gitgitgadget/gitgitgadget/.

Ciao,
Dscho

> 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
>

      parent reply index

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-11 20:42 Elijah Newren via GitGitGadget
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-12 18:41 ` Johannes Schindelin [this message]

Reply instructions:

You may reply publically 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=nycvar.QRO.7.76.6.1910122035350.46@tvgsbejvaqbjf.bet \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --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

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror http://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox