diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:39 -0700 |
| commit | a76b2084fb9c7e788108717fdce4c91227808980 (patch) | |
| tree | 7fa7cd5019490a51bea649141c795786b9c85017 /submodule.c | |
| parent | 978327f97dd3bd20f1648a2fcac601191976b18c (diff) | |
| parent | 46a958b3daa1da336683ec82d7f321d0f51b39c8 (diff) | |
| download | git-a76b2084fb9c7e788108717fdce4c91227808980.tar.gz | |
Merge branch 'jl/status-ignore-submodules'
* jl/status-ignore-submodules:
Add the option "--ignore-submodules" to "git status"
git submodule: ignore dirty submodules for summary and status
Conflicts:
builtin/commit.c
t/t7508-status.sh
wt-status.c
wt-status.h
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/submodule.c b/submodule.c index 676d48fb33..61cb6e21dd 100644 --- a/submodule.c +++ b/submodule.c @@ -46,6 +46,19 @@ done: return ret; } +void handle_ignore_submodules_arg(struct diff_options *diffopt, + const char *arg) +{ + if (!strcmp(arg, "all")) + DIFF_OPT_SET(diffopt, IGNORE_SUBMODULES); + else if (!strcmp(arg, "untracked")) + DIFF_OPT_SET(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES); + else if (!strcmp(arg, "dirty")) + DIFF_OPT_SET(diffopt, IGNORE_DIRTY_SUBMODULES); + else + die("bad --ignore-submodules argument: %s", arg); +} + void show_submodule_summary(FILE *f, const char *path, unsigned char one[20], unsigned char two[20], unsigned dirty_submodule, |