diff options
| author | Russell Belfer <arrbee@arrbee.com> | 2012-02-03 16:53:01 -0800 |
|---|---|---|
| committer | Russell Belfer <arrbee@arrbee.com> | 2012-03-02 15:49:28 -0800 |
| commit | 3a4375901a92efdc641c714ec9fd07b53f2f781e (patch) | |
| tree | a0aed2d5e7ee9a6c2af317ae44e1f8bdce0a1446 /include/git2/tree.h | |
| parent | 65b09b1deddec64fa5639e9fea10c048d31901fa (diff) | |
| download | libgit2-3a4375901a92efdc641c714ec9fd07b53f2f781e.tar.gz | |
Clean up diff implementation for review
This fixes several bugs, updates tests and docs, eliminates the
FILE* assumption in favor of printing callbacks for the diff patch
formatter helpers, and adds a "diff" example function that can
perform a diff from the command line.
Diffstat (limited to 'include/git2/tree.h')
| -rw-r--r-- | include/git2/tree.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/git2/tree.h b/include/git2/tree.h index c338da092..95be1d305 100644 --- a/include/git2/tree.h +++ b/include/git2/tree.h @@ -313,15 +313,14 @@ enum git_treewalk_mode { */ GIT_EXTERN(int) git_tree_walk(git_tree *tree, git_treewalk_cb callback, int mode, void *payload); -/** @} */ - typedef enum { GIT_STATUS_UNMODIFIED = 0, GIT_STATUS_ADDED = 1, GIT_STATUS_DELETED = 2, GIT_STATUS_MODIFIED = 3, - GIT_STATUS_RENAMED = 4, - GIT_STATUS_COPIED = 5, + /* the following will only be generated by git_diff functions */ + GIT_STATUS_RENAMED = 4, + GIT_STATUS_COPIED = 5, GIT_STATUS_IGNORED = 6, GIT_STATUS_UNTRACKED = 7 } git_status_t; @@ -354,5 +353,7 @@ int git_tree_diff(git_tree *old, git_tree *newer, git_tree_diff_cb cb, void *dat int git_tree_diff_index_recursive(git_tree *tree, git_index *index, git_tree_diff_cb cb, void *data); +/** @} */ + GIT_END_DECL #endif |