diff options
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/diff.h | 3 | ||||
| -rw-r--r-- | include/git2/submodule.h | 11 |
2 files changed, 11 insertions, 3 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index 1f7f8ab2a..121c40307 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -47,7 +47,8 @@ enum { GIT_DIFF_INCLUDE_UNMODIFIED = (1 << 9), GIT_DIFF_RECURSE_UNTRACKED_DIRS = (1 << 10), GIT_DIFF_DISABLE_PATHSPEC_MATCH = (1 << 11), - GIT_DIFF_DELTAS_ARE_ICASE = (1 << 12) + GIT_DIFF_DELTAS_ARE_ICASE = (1 << 12), + GIT_DIFF_INCLUDE_UNTRACKED_CONTENT = (1 << 13), }; /** diff --git a/include/git2/submodule.h b/include/git2/submodule.h index 28057d26f..b00fad2d4 100644 --- a/include/git2/submodule.h +++ b/include/git2/submodule.h @@ -120,8 +120,15 @@ typedef enum { } git_submodule_status_t; #define GIT_SUBMODULE_STATUS_IS_UNMODIFIED(S) \ - (((S) & ~(GIT_SUBMODULE_STATUS_IN_HEAD | GIT_SUBMODULE_STATUS_IN_INDEX | \ - GIT_SUBMODULE_STATUS_IN_CONFIG | GIT_SUBMODULE_STATUS_IN_WD)) == 0) + (((S) & ~(GIT_SUBMODULE_STATUS_IN_HEAD | \ + GIT_SUBMODULE_STATUS_IN_INDEX | \ + GIT_SUBMODULE_STATUS_IN_CONFIG | \ + GIT_SUBMODULE_STATUS_IN_WD)) == 0) + +#define GIT_SUBMODULE_STATUS_IS_WD_DIRTY(S) \ + (((S) & (GIT_SUBMODULE_STATUS_WD_INDEX_MODIFIED | \ + GIT_SUBMODULE_STATUS_WD_WD_MODIFIED | \ + GIT_SUBMODULE_STATUS_WD_UNTRACKED)) != 0) /** * Lookup submodule information by name or path. |