From: Jacob Keller <jacob.keller@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jacob Keller <jacob.e.keller@intel.com>,
Git mailing list <git@vger.kernel.org>
Subject: Re: [PATCH v4 2/2] diff: add SUBMODULE_DIFF format to display submodule diff
Date: Thu, 11 Aug 2016 11:34:38 -0700 [thread overview]
Message-ID: <CA+P7+xpYrEa4Ocsny0Ca6zsRDJxax9FwiRtuxDGArgDiPbk9Cg@mail.gmail.com> (raw)
In-Reply-To: <xmqqd1lf2nvj.fsf@gitster.mtv.corp.google.com>
On Thu, Aug 11, 2016 at 10:53 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Jacob Keller <jacob.e.keller@intel.com> writes:
>
>> From: Jacob Keller <jacob.keller@gmail.com>
>>
>> Teach git-diff and friends a new format for displaying the difference of
>> a submodule using git-diff inside the submodule project. This allows
>> users to easily see exactly what source changed in a given commit that
>> updates the submodule pointer. To do this, remove DIFF_SUBMODULE_LOG bit
>> from the diff options, and instead add a new enum type for these
>> formats.
>>
>> Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
>> ---
>> Documentation/diff-config.txt | 3 +-
>> Documentation/diff-options.txt | 6 ++--
>> diff.c | 41 ++++++++++++++++----------
>> diff.h | 9 +++++-
>> submodule.c | 67 ++++++++++++++++++++++++++++++++++++++++++
>> submodule.h | 6 ++++
>> 6 files changed, 113 insertions(+), 19 deletions(-)
>
> This looks good.
>
> You'd want some tests to make sure that the "--submodule" and the
> "--submodule=<format>" command line options and the diff.submodule
> configuration variables are parsed correctly (and when combined, the
> command line option overrides the configured default), and of course
> the machinery does the right thing, with and without "--graph" when
> used in "git log".
Yes, I am adding tests now, but I ran into some interesting corner
cases for this, that still need some work.
There's a bunch of issues with cases involving adding a submodule that
isn't stored in .git/modules/etc, which the current tests for
--submodule=log do.
There's also the case of empty trees, which I believe I have resolved
now. Hopefully I can sort these cases correctly.
>
>> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
>> index e7b729f3644f..988068225463 100644
>> --- a/Documentation/diff-options.txt
>> +++ b/Documentation/diff-options.txt
>> @@ -215,8 +215,10 @@ any of those replacements occurred.
>> the commits in the range like linkgit:git-submodule[1] `summary` does.
>> Omitting the `--submodule` option or specifying `--submodule=short`,
>> uses the 'short' format. This format just shows the names of the commits
>> - at the beginning and end of the range. Can be tweaked via the
>> - `diff.submodule` configuration variable.
>> + at the beginning and end of the range. When `--submodule=diff` is
>> + given, the 'diff' format is used. This format shows the diff between
>> + the old and new submodule commmit from the perspective of the
>> + submodule. Can be tweaked via the `diff.submodule` configuration variable.
>
> This is carried over from the existing text, but "Can be tweaked
> via" sounds a bit wasteful (and strange); "Defaults to" (or "The
> default is taken from") is the phrase we seem to use more often.
Probably worth fixing here. WIll do.
Thanks,
Jake
>
> Thanks.
next prev parent reply other threads:[~2016-08-11 18:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-10 23:19 [PATCH v4 1/2] diff: add --line-prefix option for passing in a prefix Jacob Keller
2016-08-10 23:19 ` [PATCH v4 2/2] diff: add SUBMODULE_DIFF format to display submodule diff Jacob Keller
2016-08-11 17:53 ` Junio C Hamano
2016-08-11 18:34 ` Jacob Keller [this message]
2016-08-11 20:50 ` Junio C Hamano
2016-08-11 17:22 ` [PATCH v4 1/2] diff: add --line-prefix option for passing in a prefix Junio C Hamano
2016-08-11 18:30 ` Jacob Keller
2016-08-11 20:55 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CA+P7+xpYrEa4Ocsny0Ca6zsRDJxax9FwiRtuxDGArgDiPbk9Cg@mail.gmail.com \
--to=jacob.keller@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.e.keller@intel.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).