git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/2] Git's rename detection requires a stable sort

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Sep 25, 2019, 08:35 UTC
Message-ID
<pull.352.git.gitgitgadget@gmail.com>

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.
Johannes Schindelin (2):
  Move git_sort(), a stable sort, into into libgit.a
  diffcore_rename(): use a stable sort
 Makefile                  | 2 +-
 compat/mingw.c            | 5 -----
 diffcore-rename.c         | 2 +-
 git-compat-util.h         | 4 +++-
 compat/qsort.c => qsort.c | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)
 rename compat/qsort.c => qsort.c (97%)
base-commit: 4615a8cb5b3a8d4959c30338925b1fa3b948ae52
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-352%2Fdscho%2Frename-needs-stable-sort-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-352/dscho/rename-needs-stable-sort-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/352
-- 
gitgitgadget
Next: Johannes Schindelin via GitGitGadget
Message 1 of 9 in “Git's rename detection requires a stable sort”
  1. 0/2 Git's rename detection requires a stable sortJohannes Schindelin via GitGitGadget, Sep 25, 2019
  2. 2/2 diffcore_rename(): use a stable sortJohannes Schindelin via GitGitGadget, Sep 25, 2019
  3. 1/2 Move git_sort(), a stable sort, into into libgit.aJohannes Schindelin via GitGitGadget, Sep 25, 2019
  4. Junio C HamanoSep 28, 2019
  5. Johannes SchindelinSep 30, 2019
  6. 0/2 Git's rename detection requires a stable sortJohannes Schindelin via GitGitGadget, Sep 30, 2019
  7. 1/2 Move git_sort(), a stable sort, into into libgit.aJohannes Schindelin via GitGitGadget, Sep 30, 2019
  8. 2/2 diffcore_rename(): use a stable sortJohannes Schindelin via GitGitGadget, Sep 30, 2019
  9. Junio C HamanoOct 2, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.