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

Re: What's cooking in git.git (May 2026, #01)

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
May 4, 2026, 13:16 UTC
Message-ID
<ef949395-53b4-4799-a031-fcedfacc8824@gmail.com>
In-Reply-To
<xmqqmryhtar8.fsf@gitster.g>
On 03/05/2026 04:47, Junio C Hamano wrote:
Show 7 quoted lines
> 
> * rs/grep-column-only-match-fix (2026-04-24) 1 commit
>   - grep: fix --column --only-match for 2nd and later matches
> 
>   "git grep" update.
> 
>   Will merge to 'next'?
 >   source: <9bd69678-f04b-41d2-ad74-a386820d34c8@web.de>

I've just read this patch and it looked good. It is surprising no one has complained about the strange column numbers before

Show 13 quoted lines
> * hn/git-checkout-m-with-stash (2026-04-28) 5 commits
>   - checkout -m: autostash when switching branches
>   - checkout: rollback lock on early returns in merge_working_tree
>   - sequencer: teach autostash apply to take optional conflict marker labels
>   - sequencer: allow create_autostash to run silently
>   - stash: add --label-ours, --label-theirs, --label-base for apply
> 
>   "git checkout -m another-branch" was invented to deal with local
>   changes to paths that are different between the current and the new
>   branch, but it gave only one chance to resolve conflicts.  The command
>   was taught to create a stash to save the local changes.
> 
>   Will merge to 'next'?
 >   source: <pull.2234.v16.git.git.1777401552.gitgitgadget@gmail.com>
I'm happy with the latest re-roll - this looks ready to me
Show 10 quoted lines
> * pw/xdiff-shrink-memory-consumption (2026-04-02) 4 commits
>   . xdiff: reduce the size of array
>   . xprepare: simplify error handling
>   . xdiff: cleanup xdl_clean_mmatch()
>   . xdiff: reduce size of action arrays
> 
>   Shrink wasted memory in Myers diff that does not account for common
>   prefix and suffix removal.
> 
>   Needs to be rebased on updated en/xdiff-cleanup-3.
Will do
Show 11 quoted lines
> * en/xdiff-cleanup-3 (2026-04-29) 6 commits
>   - xdiff/xdl_cleanup_records: make execution of action easier to follow
>   - xdiff/xdl_cleanup_records: make setting action easier to follow
>   - xdiff/xdl_cleanup_records: make limits more clear
>   - xdiff/xdl_cleanup_records: use unambiguous types
>   - xdiff: use unambiguous types in xdl_bogo_sqrt()
>   - xdiff/xdl_cleanup_records: delete local recs pointer
> 
>   Preparation of the xdiff/ codebase to work with Rust.
> 
>   Will merge to 'next'?
Yes, I think this is ready as well
Thanks
Phillip
Previous: Junio C HamanoNext: Patrick Steinhardt
Message 2 of 4 in “What's cooking in git.git (May 2026, #01)”
  1. Junio C HamanoMay 3, 2026
  2. Phillip WoodMay 4, 2026
  3. Patrick SteinhardtMay 4, 2026
  4. Karthik NayakMay 4, 2026

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.