From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH v2 0/2] Git's rename detection requires a stable sort
Date: Wed, 02 Oct 2019 14:47:53 +0900 [thread overview]
Message-ID: <xmqqo8yzg0l2.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <pull.352.v2.git.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Mon, 30 Sep 2019 10:21:53 -0700 (PDT)")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> With the en/merge-recursive-cleanup patches already having advanced to next,
> the problem I discovered when rebasing Git for Windows' branch thicket
> becomes quite relevant now: t3030.35 fails consistently in the MSVC build &
> test (this part of the Azure Pipeline will be upstreamed later).
>
> The solution: use a stable sort.
>
> Note: this patch series is based on top of en/merge-recursive-cleanup.
>
> Changes since v1:
>
> * The function was renamed to git_stable_qsort(), as per Junio's
> suggestion.
>
> Johannes Schindelin (2):
> Move git_sort(), a stable sort, into into libgit.a
> diffcore_rename(): use a stable sort
>
> Makefile | 2 +-
> compat/mingw.c | 11 +++--------
> diffcore-rename.c | 2 +-
> git-compat-util.h | 9 ++++++---
> compat/qsort.c => stable-qsort.c | 6 +++---
> 5 files changed, 14 insertions(+), 16 deletions(-)
> rename compat/qsort.c => stable-qsort.c (89%)
Thanks. All looked sensible.
>
> 1: 1202809db7 < -: ---------- Move git_sort(), a stable sort, into into libgit.a
> -: ---------- > 1: 8a99008a64 Move git_sort(), a stable sort, into into libgit.a
This is where the current range-diff could be improved to shine
more. If it were allowed to compute a pairwise diff with rename
detection, readers would be able to see that qsort.c from version 1
is renamed to stable-qsort.c in version 2 with minimum adjustment of
one function name.
prev parent reply other threads:[~2019-10-02 5:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 8:35 [PATCH 0/2] Git's rename detection requires a stable sort Johannes Schindelin via GitGitGadget
2019-09-25 8:36 ` [PATCH 1/2] Move git_sort(), a stable sort, into into libgit.a Johannes Schindelin via GitGitGadget
2019-09-28 10:14 ` Junio C Hamano
2019-09-30 11:38 ` Johannes Schindelin
2019-09-25 8:36 ` [PATCH 2/2] diffcore_rename(): use a stable sort Johannes Schindelin via GitGitGadget
2019-09-30 17:21 ` [PATCH v2 0/2] Git's rename detection requires " Johannes Schindelin via GitGitGadget
2019-09-30 17:21 ` [PATCH v2 1/2] Move git_sort(), a stable sort, into into libgit.a Johannes Schindelin via GitGitGadget
2019-09-30 17:21 ` [PATCH v2 2/2] diffcore_rename(): use a stable sort Johannes Schindelin via GitGitGadget
2019-10-02 5:47 ` Junio C Hamano [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqo8yzg0l2.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
/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).