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

Re: Merge commit diff results are confusing and inconsistent

From
Eckhard Maaß <eckhard.s.maass@googlemail.com>
Date
May 7, 2019, 15:55 UTC
Message-ID
<20190507155505.GA31344@esm>
In-Reply-To
<20190507145849.GA6313@archbookpro.localdomain>
On Tue, May 07, 2019 at 10:58:49AM -0400, Denton Liu wrote:
> For more details, this code[2] just blindly diffs the first two
> endpoints returned preceding `repo_init_revisions`.

If you throw in more than two endpoints, the result is a combined diff with respect to the first commit. You can have some fun with that, eg "git diff -c @ @~4 @^^2~4".

> Also, not to rehash an old discussion but I'll let this thread be my
> argument *against* allowing range-notation in git-diff.

Well, I think the most confusing part is to have this undocumented around. The range notation are basically just the same symbols for git-diff, but the meaning seems to be quite different. If this is going to stay - shouldn't there be at least some documentation for people trying such stuff out? And that we can point to? Or is there a reason to keep this undocumented?

Greetings, Eckhard

Previous: Denton LiuNext: Ævar Arnfjörð Bjarmason
Message 9 of 12 in “Merge commit diff results are confusing and inconsistent”
  1. Robert DaileyMay 3, 2019
  2. Eckhard MaaßMay 3, 2019
  3. Robert DaileyMay 6, 2019
  4. Eckhard MaaßMay 6, 2019
  5. Ævar Arnfjörð BjarmasonMay 6, 2019
  6. Robert DaileyMay 7, 2019
  7. Robert DaileyMay 7, 2019
  8. Denton LiuMay 7, 2019
  9. Eckhard MaaßMay 7, 2019
  10. Ævar Arnfjörð BjarmasonMay 7, 2019
  11. Elijah NewrenMay 7, 2019
  12. Philip OakleyMay 11, 2019

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.