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

Re: [PATCH 0/2] Support diff.wordDiff config

From
Chris Torek <chris.torek@gmail.com>
Date
Mar 3, 2024, 07:23 UTC
Message-ID
<CAPx1GveaNR9ooWqE1VkAuFg5NO4Lwzx7bj-W1mWeHRg-rcg6+w@mail.gmail.com>
In-Reply-To
<34bb249d-4a4d-4cc7-b737-bb18398341d0@app.fastmail.com>
Continuing the digression a bit:

On Sat, Mar 2, 2024 at 11:58 AM Kristoffer Haugsbakk <code@khaugsbakk.name> wrote:

Show 5 quoted lines
> This looks similar to the discussion from a [stash] topic:
>
> • Proposed introducing config variables which change how `git stash
>   push` and `git stash save` behave (what they save)
> • Concern about how that could break third-party scripts
[snippage]
> 🔗 [stash]: https://lore.kernel.org/git/xmqq34tnyhhf.fsf@gitster.g/

As I see it, the general issue here is the tension between Git commands that are used for scripting -- which ideally should always be plumbing commands -- and those used by end-users.

This tension is relieved somewhat when there *are* separate plumbing commands, such as `git diff-index` and `git diff-tree` and so on, or `git rev-list` vs `git log`. Unfortunately there are some commands, including `git log` itself, that have options that are missing from the roughly-equivalent plumbing command, and there are commands (such as `git stash` and `git status`) that either do not have, or at one time lacked, plumbing command equivalents or options.

The `git status` command shows one way out of this problem: we can *add* `--porcelain` options. Perhaps every command (or every non-plumbing-only one) should have `--porcelain[=<version>]`.

This doesn't fix the situation today, but provides an obvious future-proofing path.

Chris
Previous: Kristoffer HaugsbakkNext: Junio C Hamano
Message 11 of 17 in “Allow setting diff.worddiff=color via gitconfig”
  1. Olliver SchinaglFeb 28, 2024
  2. 0/2 Support diff.wordDiff configKarthik Nayak, Mar 2, 2024
  3. 1/2 t4034: extract out `diff_with_opts`Karthik Nayak, Mar 2, 2024
  4. 2/2 diff: add 'diff.wordDiff' config optionKarthik Nayak, Mar 2, 2024
  5. Eric SunshineMar 2, 2024
  6. Karthik NayakMar 2, 2024
  7. Jean-Noël AVILAMar 2, 2024
  8. Junio C HamanoMar 2, 2024
  9. Karthik NayakMar 2, 2024
  10. Kristoffer HaugsbakkMar 2, 2024
  11. Chris TorekMar 3, 2024
  12. Junio C HamanoMar 3, 2024
  13. Olliver SchinaglMar 22, 2024
  14. Dragan SimicMar 25, 2024
  15. Olliver SchinaglMar 22, 2024
  16. Olliver SchinaglMar 22, 2024
  17. Olliver SchinaglMar 22, 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.