diff options
| author | Russell Belfer <rb@github.com> | 2012-10-17 14:14:51 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-10-17 14:14:51 -0700 |
| commit | 4c47a8bcfe03c42096b74d4af06ab95fb95fd211 (patch) | |
| tree | c79eb8290ef110faff68ae2d5746455095508e1e /include/git2/status.h | |
| parent | 6012e86839bbdfc98085662c22f8e34b6f6abefb (diff) | |
| parent | 52a61bb8047f431bf363bd9327d0f34884437c83 (diff) | |
| download | libgit2-4c47a8bcfe03c42096b74d4af06ab95fb95fd211.tar.gz | |
Merge pull request #968 from arrbee/diff-support-typechange
Support TYPECHANGE records in status and adjust checkout accordingly
Diffstat (limited to 'include/git2/status.h')
| -rw-r--r-- | include/git2/status.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/include/git2/status.h b/include/git2/status.h index 0dd98596e..979e6e4ff 100644 --- a/include/git2/status.h +++ b/include/git2/status.h @@ -19,19 +19,22 @@ */ GIT_BEGIN_DECL -enum { - GIT_STATUS_CURRENT = 0, +typedef enum { + GIT_STATUS_CURRENT = 0, - GIT_STATUS_INDEX_NEW = (1 << 0), - GIT_STATUS_INDEX_MODIFIED = (1 << 1), - GIT_STATUS_INDEX_DELETED = (1 << 2), + GIT_STATUS_INDEX_NEW = (1u << 0), + GIT_STATUS_INDEX_MODIFIED = (1u << 1), + GIT_STATUS_INDEX_DELETED = (1u << 2), + GIT_STATUS_INDEX_RENAMED = (1u << 3), + GIT_STATUS_INDEX_TYPECHANGE = (1u << 4), - GIT_STATUS_WT_NEW = (1 << 3), - GIT_STATUS_WT_MODIFIED = (1 << 4), - GIT_STATUS_WT_DELETED = (1 << 5), + GIT_STATUS_WT_NEW = (1u << 7), + GIT_STATUS_WT_MODIFIED = (1u << 8), + GIT_STATUS_WT_DELETED = (1u << 9), + GIT_STATUS_WT_TYPECHANGE = (1u << 10), - GIT_STATUS_IGNORED = (1 << 6), -}; + GIT_STATUS_IGNORED = (1u << 14), +} git_status_t; /** * Gather file statuses and run a callback for each one. |