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

Re: What's cooking in git.git (Aug 2021, #06; Mon, 16)

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Aug 19, 2021, 18:55 UTC
Message-ID
<8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com>
In-Reply-To
<xmqqv945ng61.fsf@gitster.g>
On 17/08/2021 00:06, Junio C Hamano wrote:
Show 32 quoted lines
> Here are the topics that have been cooking in my tree.  Commits
> prefixed with '+' are in 'next' (being in 'next' is a sign that a
> topic is stable enough to be used and are candidate to be in a
> future release).  Commits prefixed with '-' are only in 'seen',
> which means nothing more than that I have found them of interest for
> some reason (like "it may have hard-to-resolve conflicts with
> another topic already in flight" or "this may turn out to be
> useful").  Do not read too much into a topic being in (or not in)
> 'seen'.  The ones marked with '.' do not appear in any of the
> integration branches, but I am still holding onto them.
> 
> * pw/diff-color-moved-fix (2021-08-05) 13 commits
>    (merged to 'next' on 2021-08-05 at 7b5e312aac)
>   + diff: drop unused options parameter from cmp_in_block_with_wsd()
>    (merged to 'next' on 2021-08-04 at 4de4a451e0)
>   + diff --color-moved: intern strings
>   + diff: use designated initializers for emitted_diff_symbol
>   + diff --color-moved-ws=allow-indentation-change: improve hash lookups
>   + diff --color-moved: stop clearing potential moved blocks
>   + diff --color-moved: shrink potential moved blocks as we go
>   + diff --color-moved: unify moved block growth functions
>   + diff --color-moved: call comparison function directly
>   + diff --color-moved-ws=allow-indentation-change: simplify and optimize
>   + diff: simplify allow-indentation-change delta calculation
>   + diff --color-moved: avoid false short line matches and bad zerba coloring
>   + diff --color-moved=zebra: fix alternate coloring
>   + diff --color-moved: add perf tests
> 
>   Long-overdue correctness and performance update to "diff
>   --color-moved" feature.
> 
>   Will cook in 'next'.

I found a couple of regressions in diff --color-moved=allow-indention-change with this series today. One of them is a simple fix, but I think I will need a bit of time to understand the other (there's a change to the way it handles lines consisting of '\f\n'). Would it be possible to kick this out of next when you rewind it please.

Thanks
Phillip
Previous: Junio C HamanoNext: Junio C Hamano
Message 12 of 17 in “What's cooking in git.git (Aug 2021, #06; Mon, 16)”
  1. Junio C HamanoAug 16, 2021
  2. Azeem Bande-AliAug 16, 2021
  3. Junio C HamanoAug 17, 2021
  4. Phillip WoodAug 17, 2021
  5. Junio C HamanoAug 17, 2021
  6. Derrick StoleeAug 17, 2021
  7. Eric SunshineAug 18, 2021
  8. Phillip WoodAug 19, 2021
  9. Philippe BlainAug 17, 2021
  10. Junio C HamanoAug 17, 2021
  11. Junio C HamanoAug 17, 2021
  12. Phillip WoodAug 19, 2021
  13. Junio C HamanoAug 19, 2021
  14. Giving priority to the reftable topic (was Re: What's cooking in git.git (Aug 2021, #06; Mon, 16))Junio C Hamano, Aug 20, 2021
  15. Ramsay JonesAug 20, 2021
  16. Han-Wen NienhuysOct 7, 2021
  17. Ævar Arnfjörð BjarmasonAug 23, 2021

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.