diff options
| author | Vicent Martà <vicent@github.com> | 2012-10-09 11:45:50 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2012-10-09 11:45:50 -0700 |
| commit | 21e0d297af95e49b933c2a8d09994a32011354b1 (patch) | |
| tree | 1e248d6899feac797f0c1307ad7cf52cead42389 /include/git2 | |
| parent | aa4437f637371c531355029686cb5780fd99c988 (diff) | |
| parent | 5d1308f25ff36d03f0a22451642cc0f2a931daae (diff) | |
| download | libgit2-21e0d297af95e49b933c2a8d09994a32011354b1.tar.gz | |
Merge pull request #967 from arrbee/diff-submodule-tests-and-fixes
Diff submodule tests and fixes
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. |