Am 28.07.2010 23:35, schrieb Junio C Hamano:
> Jens Lehmann <Jens.Lehmann@xxxxxx> writes:
>
>> The .gitmodules file is parsed for "submodule.<name>.ignore" entries
>> before looking for them in .git/config. Thus settings found in .git/config
>> will override those from .gitmodules,...
>
> Hmph.
>
> The value of "submodule.<name>.path" does not have to be "<name>". There
> seems to be a bit of confusion here.
Thanks for clearing up my confusion, this is v2 of this patch using the
path configured for the submodule instead of its name.
Jens Lehmann (2):
Submodules: Add the new "ignore" config option for diff and status
Submodules: Use "ignore" settings from .gitmodules too for diff and
status
Documentation/config.txt | 13 +++
Documentation/diff-options.txt | 6 +-
Documentation/git-status.txt | 6 +-
Documentation/gitmodules.txt | 15 ++++
builtin/commit.c | 2 +
builtin/diff-files.c | 2 +
builtin/diff-index.c | 2 +
builtin/diff-tree.c | 2 +
builtin/diff.c | 2 +
diff-lib.c | 15 +++-
diff.c | 35 +++++++--
diff.h | 1 +
submodule.c | 76 +++++++++++++++++-
submodule.h | 4 +
t/t4027-diff-submodule.sh | 152 ++++++++++++++++++++++++++++++++++
t/t7508-status.sh | 175 +++++++++++++++++++++++++++++++++++++++-
wt-status.c | 8 ++-
17 files changed, 496 insertions(+), 20 deletions(-)
--
1.7.2.1.54.g6bed1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html