git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/3] Teach git diff-tree --stdin to diff trees
Date: Fri, 08 Aug 2008 14:22:45 -0700	[thread overview]
Message-ID: <7vk5erb3ru.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080808204829.7744.11661.stgit@yoghurt> (Karl Hasselström's message of "Fri, 08 Aug 2008 22:48:29 +0200")

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).

"On the command line, you can give exactly two trees, not three nor one;
this two-tree form is now also supported in --stdin mode." --- that
justfication sounds like a good one (and that is why my dissapointment is
only "slight").

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.

Thanks, now we can update that documentation change.

  reply	other threads:[~2008-08-08 21:23 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-05 16:48 [BUG] git diff-tree --stdin doesn't accept two trees Karl Hasselström
2008-08-05 20:07 ` Junio C Hamano
2008-08-06  5:32   ` [PATCH] fix diff-tree --stdin documentation Junio C Hamano
2008-08-06 10:04     ` Karl Hasselström
2008-08-06 11:53   ` [BUG] git diff-tree --stdin doesn't accept two trees Karl Hasselström
2008-08-06 15:31     ` Junio C Hamano
2008-08-08 20:48       ` [PATCH 0/3] Teach git diff-tree --stdin to diff trees Karl Hasselström
2008-08-08 20:48         ` [PATCH 1/3] Refactoring: Split up diff_tree_stdin Karl Hasselström
2008-08-08 20:48         ` [PATCH 2/3] Teach git diff-tree --stdin to diff trees Karl Hasselström
2008-08-08 21:22           ` Junio C Hamano [this message]
2008-08-09  9:56             ` Karl Hasselström
2008-08-09 12:11               ` [PATCH 2/3 v2] " Karl Hasselström
2008-08-09 20:41                 ` Junio C Hamano
2008-08-10 15:38                   ` Karl Hasselström
2008-08-10 16:12                     ` [PATCH v3 0/4] " Karl Hasselström
2008-08-10 16:12                       ` [PATCH v3 1/4] Refactoring: Split up diff_tree_stdin Karl Hasselström
2008-08-10 16:12                       ` [PATCH v3 2/4] diff-tree: Note that the commit ID is printed with --stdin Karl Hasselström
2008-08-10 16:12                       ` [PATCH v3 3/4] Teach git diff-tree --stdin to diff trees Karl Hasselström
2008-08-10 16:13                       ` [PATCH v3 4/4] Add test for diff-tree --stdin with two trees Karl Hasselström
2008-08-10 17:04                       ` [PATCH v3 0/4] Teach git diff-tree --stdin to diff trees Karl Hasselström
2008-08-09 20:07               ` [PATCH 2/3] " Junio C Hamano
2008-08-09 20:36                 ` Karl Hasselström
2008-08-08 21:45           ` Jeff King
2008-08-09 10:00             ` Karl Hasselström
2008-08-11 22:28               ` Jeff King
2008-08-08 20:48         ` [PATCH 3/3] Add test for diff-tree --stdin with two trees Karl Hasselström

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vk5erb3ru.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=kha@treskal.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).