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

Re: [PATCH 2/3] Teach git diff-tree --stdin to diff trees

From
Karl Hasselström <kha@treskal.com>
Date
Aug 9, 2008, 09:56 UTC
Message-ID
<20080809095605.GA10804@diana.vm.bytemark.co.uk>
In-Reply-To
<7vk5erb3ru.fsf@gitster.siamese.dyndns.org>
On 2008-08-08 14:22:45 -0700, Junio C Hamano wrote:
Show 7 quoted lines
> Karl Hasselström <kha@treskal.com> writes:
>
> > In addition to accepting lines with one or more commits, it now
> > accepts lines with precisely two trees.
>
> Hmm, slightly dissapointed (I actually was hoping you would also
> handle more than two trees and run -m or -c or --cc on them).

I decided to not attempt that -- I'm unsure enough of my git programming skills that I decided the smaller jump would provide sufficient material for constructive criticism. And, perhaps more importantly, I personally don't have a need for anything beyond what I implemented. (And, I'm not burning any bridges -- the multiple-tree forms can be added in the future. Along with handling them on the command line too, hopefully.)

Show 20 quoted lines
> But the following two sentences are a bit confusing, especially it
> is unclear what "This" refers to in the last sentence.
>
> > When diffing trees, the -m, -s, -v, --pretty, --abbrev-commit,
> > --encoding, --no-commit-id, -c, --cc, and --always options are
> > ignored, since they do not apply to trees. This is the same
> > behavior you get when specifying two trees on the command line
> > instead of with --stdin.
>
> Perhaps swap the sentences in the log message like this?
>
>   When feeding trees on the command line, you can give exactly two
>   trees, not three nor one; --stdin now supports this "two tree"
>   form on its input, in addition to accepting lines with one or more
>   commits.
>
>   When diffing trees (either specified on the command line or from
>   the standard input), the -m, -s, -v, --pretty, --abbrev-commit,
>   --encoding, --no-commit-id, -c, --cc, and --always options are
>   ignored, since they do not apply to trees.
Will do. Thanks.
> Thanks, now we can update that documentation change.

I think your doc patch is obsoleted by my patch. I'll make sure it's all taken care of in the resend.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Previous: Junio C HamanoNext: Karl Hasselström
Message 5 of 14 in “Teach git diff-tree --stdin to diff trees”
  1. 0/3 Teach git diff-tree --stdin to diff treesKarl Hasselström, Aug 8, 2008
  2. 1/3 Refactoring: Split up diff_tree_stdinKarl Hasselström, Aug 8, 2008
  3. 2/3 Teach git diff-tree --stdin to diff treesKarl Hasselström, Aug 8, 2008
  4. Junio C HamanoAug 8, 2008
  5. Karl HasselströmAug 9, 2008
  6. 2/3 Teach git diff-tree --stdin to diff treesKarl Hasselström, Aug 9, 2008
  7. Junio C HamanoAug 9, 2008
  8. Karl HasselströmAug 10, 2008
  9. Junio C HamanoAug 9, 2008
  10. Karl HasselströmAug 9, 2008
  11. Jeff KingAug 8, 2008
  12. Karl HasselströmAug 9, 2008
  13. Jeff KingAug 11, 2008
  14. 3/3 Add test for diff-tree --stdin with two treesKarl Hasselström, Aug 8, 2008

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.