Re: [PATCH v6 3/3] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-16 Thread Junio C Hamano
Jacob Keller writes: > Thoughts on that? Or should we just limit ourselves to only some > options get propagated to the submodule? I think you have to be selective either way. You do not want pathspecs used to limit the top-level paths propagated down when you run a diff or a log in the submodu

Re: [PATCH v6 3/3] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-16 Thread Jacob Keller
On Tue, Aug 16, 2016 at 2:14 PM, Junio C Hamano wrote: > Jacob Keller writes: > + + if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED) { + /* + * If the submodule has modified contents we want to diff + * against the work tree, so do

Re: [PATCH v6 3/3] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-16 Thread Junio C Hamano
Jacob Keller writes: >>> + >>> + if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED) { >>> + /* >>> + * If the submodule has modified contents we want to diff >>> + * against the work tree, so don't add a second parameter. >>> + * This is essenti

Re: [PATCH v6 3/3] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-16 Thread Jacob Keller
On Tue, Aug 16, 2016 at 11:48 AM, Junio C Hamano wrote: > Jacob Keller writes: > >> diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt >> index d5a5b17d5088..f5d693afad6c 100644 >> --- a/Documentation/diff-config.txt >> +++ b/Documentation/diff-config.txt >> @@ -123,7 +123

Re: [PATCH v6 3/3] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-16 Thread Junio C Hamano
Jacob Keller writes: > diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt > index d5a5b17d5088..f5d693afad6c 100644 > --- a/Documentation/diff-config.txt > +++ b/Documentation/diff-config.txt > @@ -123,7 +123,8 @@ diff.suppressBlankEmpty:: > diff.submodule:: > Speci

[PATCH v6 3/3] diff: add SUBMODULE_DIFF format to display submodule diff

2016-08-15 Thread Jacob Keller
From: Jacob Keller 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_