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

RE: Possible git-diff bug when using exit-code with diff filters

From
rsbecker@nexbridge.com <rsbecker@nexbridge.com>
Date
Apr 21, 2024, 20:18 UTC
Message-ID
<03bf01da9429$10b55460$321ffd20$@nexbridge.com>
In-Reply-To
<xmqqh6fu1qk3.fsf@gitster.g>
On Sunday, April 21, 2024 3:09 PM, Junio C Hamano wrote:
Show 28 quoted lines
><rsbecker@nexbridge.com> writes:
>
>> On Sunday, April 21, 2024 2:18 PM, Junio C Hamano wrote:
>>>René Scharfe <l.s.r@web.de> writes:
>>>
>>>> You can more easily reproduce it by setting the environment variable
>>>> GIT_EXTERNAL_DIFF or the configuration setting diff.external -- no
>>>> attributes needed.
>>>
>>>Indeed.
>>>
>>>A much simpler fix may be to declare that these two features are
>>>imcompatible and fail the execution upfront, instead of just silently ignoring one
>of the two options.
>>>
>>>As a person who is very much used to the external diff not
>>>contributing to the exit status (who also invented the external diff
>>>driver interface), I would be a wrong person to judge if such a
>>>simplified approach is desirable, of course, but just throwing it out as a food for
>thought.
>>
>> My suggestion would be to keep with a priority approach, where
>> GIT_EXTERNAL_DIFF overrides diff.external, assuming they set hold to
>> the same specification (the git-config page implies they do) and
>> GIT_EXTERNAL_DIFF overrides diff.external as I would expect.
>
>Nobody in this discussion thread is hinting to change that, so I am a bit confused
>where the above suggestion comes from...
I must have misinterpreted. Please ignore my suggestion.
Previous: Junio C HamanoNext: René Scharfe
Message 6 of 32 in “Possible git-diff bug when using exit-code with diff filters”
  1. German LashevichApr 20, 2024
  2. René ScharfeApr 21, 2024
  3. Junio C HamanoApr 21, 2024
  4. rsbecker@nexbridge.comApr 21, 2024
  5. Junio C HamanoApr 21, 2024
  6. rsbecker@nexbridge.comApr 21, 2024
  7. René ScharfeMay 5, 2024
  8. Junio C HamanoMay 6, 2024
  9. 1/2 diff: report unmerged paths as changes in run_diff_cmd()René Scharfe, May 5, 2024
  10. 2/2 diff: fix --exit-code with external diffRené Scharfe, May 5, 2024
  11. Phillip WoodMay 5, 2024
  12. Junio C HamanoMay 6, 2024
  13. René ScharfeMay 6, 2024
  14. phillip.wood123@gmail.comMay 8, 2024
  15. René ScharfeMay 11, 2024
  16. René ScharfeMay 12, 2024
  17. 0/3 diff: fix --exit-code with external diffRené Scharfe, Jun 5, 2024
  18. 1/3 t4020: test exit code with external diffsRené Scharfe, Jun 5, 2024
  19. 2/3 userdiff: add and use struct external_diffRené Scharfe, Jun 5, 2024
  20. 3/3 diff: let external diffs report that changes are uninterestingRené Scharfe, Jun 5, 2024
  21. Johannes SixtJun 6, 2024
  22. René ScharfeJun 6, 2024
  23. Junio C HamanoJun 6, 2024
  24. Phillip WoodJun 6, 2024
  25. René ScharfeJun 7, 2024
  26. Junio C HamanoJun 5, 2024
  27. 0/3 diff: fix --exit-code with external diffRené Scharfe, Jun 9, 2024
  28. 1/3 t4020: test exit code with external diffsRené Scharfe, Jun 9, 2024
  29. Junio C HamanoJun 10, 2024
  30. 2/3 userdiff: add and use struct external_diffRené Scharfe, Jun 9, 2024
  31. 3/3 diff: let external diffs report that changes are uninterestingRené Scharfe, Jun 9, 2024
  32. phillip.wood123@gmail.comJun 10, 2024

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.