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

Re: Bug with fixup and autosquash

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 9, 2017, 22:16 UTC
Message-ID
<xmqqd1ernh7g.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<alpine.DEB.2.20.1702092301070.3496@virtualbox>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Almost. While I fixed the performance issues as well as the design
> allowed, I happened to "fix" the problem where an incomplete prefix match
> could be favored over an exact match.

Hmph. Would it require too much further work to do what you said the code does:

> The rebase--helper code (specifically, the patch moving autosquash logic
> into it: https://github.com/dscho/git/commit/7d0831637f) tries to match
> exact onelines first, and falls back to prefix matching only after that.

If the code matches exact onlines and then falls back to prefix, I do not think incomplete prefix would be mistakenly chosen over an exact one, so perhaps your code already does the right thing?

Previous: Johannes SchindelinNext: Johannes Schindelin
Message 9 of 14 in “Bug with fixup and autosquash”
  1. Ashutosh BapatFeb 8, 2017
  2. Junio C HamanoFeb 8, 2017
  3. Ashutosh BapatFeb 9, 2017
  4. Michael J GruberFeb 9, 2017
  5. Junio C HamanoFeb 9, 2017
  6. Johannes SchindelinFeb 9, 2017
  7. Junio C HamanoFeb 9, 2017
  8. Johannes SchindelinFeb 9, 2017
  9. Junio C HamanoFeb 9, 2017
  10. Johannes SchindelinFeb 10, 2017
  11. Philip OakleyFeb 10, 2017
  12. Johannes SchindelinApr 25, 2017
  13. Philip OakleyFeb 9, 2017
  14. Johannes SchindelinFeb 10, 2017

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.