diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2010-03-13 22:00:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-14 05:56:35 (GMT) |
| commit | 3bfc45047654c7dd38b32033321228e97fc8f60e (patch) | |
| tree | 6899c722253819b7d29aa7abb7e0ac7716fa9079 /submodule.h | |
| parent | 85adbf2f751a91429de6b431c45737ba9d7e9e00 (diff) | |
| download | git-3bfc45047654c7dd38b32033321228e97fc8f60e.zip git-3bfc45047654c7dd38b32033321228e97fc8f60e.tar.gz git-3bfc45047654c7dd38b32033321228e97fc8f60e.tar.bz2 | |
git status: ignoring untracked files must apply to submodules too
Since 1.7.0 submodules are considered dirty when they contain untracked
files. But when git status is called with the "-uno" option, the user
asked to ignore untracked files, so they must be ignored in submodules
too. To achieve this, the new flag DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES
is introduced.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index 267881c..dbda270 100644 --- a/submodule.h +++ b/submodule.h @@ -5,6 +5,6 @@ void show_submodule_summary(FILE *f, const char *path, unsigned char one[20], unsigned char two[20], unsigned dirty_submodule, const char *del, const char *add, const char *reset); -unsigned is_submodule_modified(const char *path); +unsigned is_submodule_modified(const char *path, int ignore_untracked); #endif |