Scott Kyle wrote:
> On Tue, Dec 7, 2010 at 1:29 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote:
>> Scott Kyle wrote:
>>> If I set the "submodule.<name>.ignore" then diffing around inside my
>>> history will not show the changes to that particular submodule.
>>
>> Even if you set it to "dirty"?
>
> Setting it to "dirty" is far less disruptive, you're right, but that
> wouldn't do me much good since my submodules are often on different
> branches while developing.
Ah, I see now. How about something like this? Untested, just a
vague sketch to show the idea.
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
Documentation/config.txt | 4 +++-
Documentation/diff-options.txt | 7 +++++--
Documentation/git-status.txt | 14 ++------------
Documentation/gitmodules.txt | 4 +++-
diff-lib.c | 3 ++-
diff.h | 3 ++-
submodule.c | 4 ++++
7 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0f85793..b93e92b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1810,7 +1810,9 @@ submodule.<name>.update::
submodule.<name>.ignore::
Defines under what circumstances "git status" and the diff family show
a submodule as modified. When set to "all", it will never be considered
- modified, "dirty" will ignore all changes to the submodules work tree and
+ modified, "worktree" will ignore all changes in the work tree not
+ registered in the superproject index, "dirty" will ignore all changes
+ to the submodules work tree and
takes only differences between the HEAD of the submodule and the commit
recorded in the superproject into account. "untracked" will additionally
let submodules with modified tracked files in their work tree show up.
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f3e9538..93fe084 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -360,7 +360,8 @@ endif::git-format-patch[]
--ignore-submodules[=<when>]::
Ignore changes to submodules in the diff generation. <when> can be
- either "none", "untracked", "dirty" or "all", which is the default
+ either "none", "untracked", "dirty", "worktree", or "all", which is
+ the default.
Using "none" will consider the submodule modified when it either contains
untracked or modified files or its HEAD differs from the commit recorded
in the superproject and can be used to override any settings of the
@@ -369,7 +370,9 @@ endif::git-format-patch[]
contain untracked content (but they are still scanned for modified
content). Using "dirty" ignores all changes to the work tree of submodules,
only changes to the commits stored in the superproject are shown (this was
- the behavior until 1.7.0). Using "all" hides all changes to submodules.
+ the behavior until 1.7.0). Using "worktree" submodules in the worktree are
+ never considered dirty but diffs between old commits do not ignore
+ submodules. Using "all" hides all changes to submodules.
--src-prefix=<prefix>::
Show the given source prefix instead of "a/".
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index dae190a..8c3b0ac 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -55,18 +55,8 @@ specified.
--ignore-submodules[=<when>]::
Ignore changes to submodules when looking for changes. <when> can be
- either "none", "untracked", "dirty" or "all", which is the default.
- Using "none" will consider the submodule modified when it either contains
- untracked or modified files or its HEAD differs from the commit recorded
- in the superproject and can be used to override any settings of the
- 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When
- "untracked" is used submodules are not considered dirty when they only
- contain untracked content (but they are still scanned for modified
- content). Using "dirty" ignores all changes to the work tree of submodules,
- only changes to the commits stored in the superproject are shown (this was
- the behavior before 1.7.0). Using "all" hides all changes to submodules
- (and suppresses the output of submodule summaries when the config option
- `status.submodulesummary` is set).
+ either "none", "untracked", "dirty", "worktree", or "all",
+ which is the default. See linkgit:git-diff[1] for details.
-z::
Terminate entries with NUL, instead of LF. This implies
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index bcffd95..02185c4 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -47,7 +47,9 @@ submodule.<name>.update::
submodule.<name>.ignore::
Defines under what circumstances "git status" and the diff family show
a submodule as modified. When set to "all", it will never be considered
- modified, "dirty" will ignore all changes to the submodules work tree and
+ modified; with "worktree", changes in the superproject index are
+ significant but in the subprojects are not;
+ "dirty" will ignore all changes to the submodules work tree and
takes only differences between the HEAD of the submodule and the commit
recorded in the superproject into account. "untracked" will additionally
let submodules with modified tracked files in their work tree show up.
diff --git a/diff-lib.c b/diff-lib.c
index 392ce2b..39fa605 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -72,7 +72,8 @@ static int match_stat_with_submodule(struct diff_options *diffopt,
unsigned orig_flags = diffopt->flags;
if (!DIFF_OPT_TST(diffopt, OVERRIDE_SUBMODULE_CONFIG))
set_diffopt_flags_from_submodule_config(diffopt, ce->name);
- if (DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES))
+ if (DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES) ||
+ DIFF_OPT_TST(diffopt, IGNORE_WT_SUBMODULES))
changed = 0;
else if (!DIFF_OPT_TST(diffopt, IGNORE_DIRTY_SUBMODULES)
&& (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES)))
diff --git a/diff.h b/diff.h
index 0083d92..3b835ce 100644
--- a/diff.h
+++ b/diff.h
@@ -77,7 +77,8 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
#define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
-#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
+#define DIFF_OPT_IGNORE_WT_SUBMODULES (1 << 27)
+#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 28)
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)
diff --git a/submodule.c b/submodule.c
index 91a4758..81a99bd 100644
--- a/submodule.c
+++ b/submodule.c
@@ -102,6 +102,7 @@ int parse_submodule_config_option(const char *var, const char *value)
strbuf_release(&submodname);
} else if ((len > 7) && !strcmp(var + len - 7, ".ignore")) {
if (strcmp(value, "untracked") && strcmp(value, "dirty") &&
+ strcmp(value, "worktree") &&
strcmp(value, "all") && strcmp(value, "none")) {
warning("Invalid parameter \"%s\" for config option \"submodule.%s.ignore\"", value, var);
return 0;
@@ -127,6 +128,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
DIFF_OPT_CLR(diffopt, IGNORE_SUBMODULES);
DIFF_OPT_CLR(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
DIFF_OPT_CLR(diffopt, IGNORE_DIRTY_SUBMODULES);
+ DIFF_OPT_CLR(diffopt, IGNORE_WT_SUBMODULES);
if (!strcmp(arg, "all"))
DIFF_OPT_SET(diffopt, IGNORE_SUBMODULES);
@@ -134,6 +136,8 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
DIFF_OPT_SET(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
else if (!strcmp(arg, "dirty"))
DIFF_OPT_SET(diffopt, IGNORE_DIRTY_SUBMODULES);
+ else if (!strcmp(arg, "worktree"))
+ DIFF_OPT_SET(diffopt, IGNORE_WT_SUBMODULES);
else if (strcmp(arg, "none"))
die("bad --ignore-submodules argument: %s", arg);
}
--
1.7.2.4
--
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