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

Re: git diff ^! syntax stopped working for stashes in Git 2.28

From
René Scharfe <l.s.r@web.de>
Date
Sep 28, 2022, 17:39 UTC
Message-ID
<bbcb9a3f-c338-50ea-1d63-1a6939ecd735@web.de>
In-Reply-To
<15f30d59650b4de2b14d89f6e8cb21ce@garz-fricke.com>
Am 28.09.22 um 11:02 schrieb Tim Jaacks:
Show 8 quoted lines
>
>> Letting `git diff X^!` mean the same as `git diff X ^X^` for a
>> non-merge makes sense to me given the definition from
>> gitrevisions(7) cited above. That in turn is the same as `git diff
>> X^..X` and `git diff X^ X`.
>
> Yes, that is exactly how it worked before. And all the other syntaxes
> still work correctly.

`git diff X^!` still works for a non-merge commit as well. Only merge commits were affected by the change made in v2.28. And stashes are stored as merge commits internally, causing them to be affected.

> René, I saw you submitted some patches already, but these weren't
> approved obviously. So how does this continue now?

It's RC time (release candidate) and only fixes for regressions added after v2.37 are accepted currently. I'll resend my patches once v2.38 is out, if necessary.

René
Previous: Tim Jaacks
Message 6 of 6 in “git diff ^! syntax stopped working for stashes in Git 2.28”
  1. Tim JaacksSep 12, 2022
  2. René ScharfeSep 12, 2022
  3. Chris TorekSep 12, 2022
  4. René ScharfeSep 14, 2022
  5. AW: git diff ^! syntax stopped working for stashes in Git 2.28Tim Jaacks, Sep 28, 2022
  6. René ScharfeSep 28, 2022

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.