From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Phil Hord <phil.hord@gmail.com>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] diffcore-pickaxe doc: document -S and -G properly
Date: Wed, 15 May 2013 00:14:08 +0530 [thread overview]
Message-ID: <CALkWK0nR1=Pgv0AY78p7n17C-VVvbc6BfJ4y_Df1ciZoc-xR-Q@mail.gmail.com> (raw)
In-Reply-To: <CABURp0r808KeSRwhgPw98vUC+JSErvSYHFyAvn-=8JhQzn8e1Q@mail.gmail.com>
Phil Hord wrote:
> References to git-log seem out of place to me here in git-diffcore. I
> know it's only an example, but it seems that Git normally describes
> these 'reference selectors' more generically. The generic description
> may be more confusing to new users, but this patch is not the place to
> consider whether it should change.
It's not for new users at all. The most useful application of -S and
-G is in log. The translation from a log -G to a diffcore -G is not
obvious at all, and warrants an explanation.
Oh, and for the user. No user is going to type out `man gitdiffcore`
out of the blue: she's most probably led there from log, and we're
connecting the dots for her.
> While the switches are called -S and -G, I do not think it is helpful
> to name the two pickaxe options as "the S kind" and "the G kind".
How do you describe something precisely without loss of meaning? You
stop abstracting unnecessarily. Read the sources: you will literally
see DIFF_PICKAXE_KIND_G there.
>> +
>> +The S kind detects filepairs whose "result" side and "origin" side
>> +have different number of occurrences of specified string. While
>> +rename detection works as usual, 'git log -S' cannot omit commits
>
> The "cannot omit" feels like a confusing double-negative. How about
> "includes" instead?
Intended. Omission is expected.
> Is it worth mentioning that something in the documentation is "worth
> mentioning"?
You don't have to nitpick style. We can allow this much creative
freedom in documentation.
>> +in effect, diffcore-pickaxe leaves only such filepairs that touch the
>> +specified string in its output. When in effect, diffcore-pickaxe
>> +leaves all filepairs intact if there is such a filepair, or makes the
>> +output empty otherwise. The latter behavior is designed to make
>> +reviewing of the changes in the context of the whole changeset easier.
>
> I find this description (from the original code, not from this commit)
> somewhat confusing. It is written from the implementer's POV.
I explained the entire -S and -G thing in terms of filepairs (and yes,
that's implementation detail). Why would I want to explain this in
any other terms?
> Does
> this seem clearer to you?
> [...]
>From diff-options.txt (the more end-user side):
When -S or -G finds a change, show all the changes in that changeset,
not just the files that contain the change in <string>.
Not clear enough?
next prev parent reply other threads:[~2013-05-14 18:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-14 14:12 [PATCH] diffcore-pickaxe doc: document -S and -G properly Ramkumar Ramachandra
2013-05-14 17:41 ` Junio C Hamano
2013-05-14 18:20 ` Ramkumar Ramachandra
2013-05-14 18:47 ` Junio C Hamano
2013-05-14 18:57 ` Ramkumar Ramachandra
2013-05-14 19:17 ` Jonathan Nieder
2013-05-14 19:25 ` Ramkumar Ramachandra
2013-05-14 19:29 ` Jonathan Nieder
2013-05-14 19:41 ` Junio C Hamano
2013-05-14 19:31 ` Junio C Hamano
2013-05-14 21:13 ` Phil Hord
2013-05-14 17:44 ` Phil Hord
2013-05-14 17:47 ` Phil Hord
2013-05-14 18:44 ` Ramkumar Ramachandra [this message]
2013-05-14 19:19 ` Junio C Hamano
2013-05-14 19:46 ` Ramkumar Ramachandra
2013-05-14 19:53 ` Junio C Hamano
2013-05-14 20:02 ` Ramkumar Ramachandra
2013-05-14 19:23 ` Phil Hord
2013-05-14 18:57 ` Junio C Hamano
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='CALkWK0nR1=Pgv0AY78p7n17C-VVvbc6BfJ4y_Df1ciZoc-xR-Q@mail.gmail.com' \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phil.hord@gmail.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).