diff options
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/diff.h | 2 | ||||
| -rw-r--r-- | include/git2/status.h | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index e49e6e539..d9ceadf20 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -123,7 +123,7 @@ typedef enum { * will be marked with only a single entry in the diff list; this flag * adds all files under the directory as IGNORED entries, too. */ - GIT_DIFF_RECURSE_IGNORED_DIRS = (1 << 10), + GIT_DIFF_RECURSE_IGNORED_DIRS = (1 << 18), } git_diff_option_t; /** diff --git a/include/git2/status.h b/include/git2/status.h index d0c4a496d..fa6282090 100644 --- a/include/git2/status.h +++ b/include/git2/status.h @@ -127,18 +127,22 @@ typedef enum { * will. * - GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH indicates that the given path * will be treated as a literal path, and not as a pathspec. + * - GIT_STATUS_OPT_RECURSE_IGNORED_DIRS indicates that the contents of + * ignored directories should be included in the status. This is like + * doing `git ls-files -o -i --exclude-standard` with core git. * * Calling `git_status_foreach()` is like calling the extended version * with: GIT_STATUS_OPT_INCLUDE_IGNORED, GIT_STATUS_OPT_INCLUDE_UNTRACKED, * and GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS. */ typedef enum { - GIT_STATUS_OPT_INCLUDE_UNTRACKED = (1 << 0), - GIT_STATUS_OPT_INCLUDE_IGNORED = (1 << 1), - GIT_STATUS_OPT_INCLUDE_UNMODIFIED = (1 << 2), - GIT_STATUS_OPT_EXCLUDE_SUBMODULES = (1 << 3), - GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS = (1 << 4), - GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH = (1 << 5), + GIT_STATUS_OPT_INCLUDE_UNTRACKED = (1u << 0), + GIT_STATUS_OPT_INCLUDE_IGNORED = (1u << 1), + GIT_STATUS_OPT_INCLUDE_UNMODIFIED = (1u << 2), + GIT_STATUS_OPT_EXCLUDE_SUBMODULES = (1u << 3), + GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS = (1u << 4), + GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH = (1u << 5), + GIT_STATUS_OPT_RECURSE_IGNORED_DIRS = (1u << 6), } git_status_opt_t; /** |