diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:25:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:25:43 -0700 |
| commit | b6a7a06aa6f083f21b0fca2558c737324eda1602 (patch) | |
| tree | 75032ee8528906017e5ef773733b590e29fbf2fa /diffcore.h | |
| parent | 797d44343c831680aeae3392259fcadeb178bf61 (diff) | |
| parent | 3bfc45047654c7dd38b32033321228e97fc8f60e (diff) | |
| download | git-b6a7a06aa6f083f21b0fca2558c737324eda1602.tar.gz git-b6a7a06aa6f083f21b0fca2558c737324eda1602.tar.xz | |
Merge branch 'jl/submodule-diff-dirtiness'
* jl/submodule-diff-dirtiness:
git status: ignoring untracked files must apply to submodules too
git status: Fix false positive "new commits" output for dirty submodules
Refactor dirty submodule detection in diff-lib.c
git status: Show detailed dirty status of submodules in long format
git diff --submodule: Show detailed dirty status of submodules
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h index 66687c3fe..fcd00bf27 100644 --- a/diffcore.h +++ b/diffcore.h @@ -42,7 +42,9 @@ struct diff_filespec { #define DIFF_FILE_VALID(spec) (((spec)->mode) != 0) unsigned should_free : 1; /* data should be free()'ed */ unsigned should_munmap : 1; /* data should be munmap()'ed */ - unsigned dirty_submodule : 1; /* For submodules: its work tree is dirty */ + unsigned dirty_submodule : 2; /* For submodules: its work tree is dirty */ +#define DIRTY_SUBMODULE_UNTRACKED 1 +#define DIRTY_SUBMODULE_MODIFIED 2 struct userdiff_driver *driver; /* data should be considered "binary"; -1 means "don't know yet" */ |