diff options
| author | Vicent Martà <vicent@github.com> | 2013-10-22 11:55:54 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-10-22 11:55:54 -0700 |
| commit | 1c74686e05c41c30944173bacec3a8312f08cbb5 (patch) | |
| tree | 92f55460acf0944b00ff8d7a4500f10633351a4a /src/diff.h | |
| parent | 98fec8a937b93c6a6a0ad35ccd04af4cfeae1767 (diff) | |
| parent | 7ce60099eec2442cc5428a830b88d51e8f9c1d75 (diff) | |
| download | libgit2-1c74686e05c41c30944173bacec3a8312f08cbb5.tar.gz | |
Merge pull request #1897 from libgit2/split-patch-from-diff
RFC: Proposed reworking of diff APIs
Diffstat (limited to 'src/diff.h')
| -rw-r--r-- | src/diff.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/diff.h b/src/diff.h index bec7e27d7..270bea071 100644 --- a/src/diff.h +++ b/src/diff.h @@ -52,7 +52,7 @@ enum { #define GIT_DIFF__VERBOSE (1 << 30) -struct git_diff_list { +struct git_diff { git_refcount rc; git_repository *repo; git_diff_options opts; @@ -72,7 +72,7 @@ struct git_diff_list { extern void git_diff__cleanup_modes( uint32_t diffcaps, uint32_t *omode, uint32_t *nmode); -extern void git_diff_list_addref(git_diff_list *diff); +extern void git_diff_addref(git_diff *diff); extern int git_diff_delta__cmp(const void *a, const void *b); extern int git_diff_delta__casecmp(const void *a, const void *b); @@ -93,15 +93,15 @@ extern int git_diff__oid_for_file( git_repository *, const char *, uint16_t, git_off_t, git_oid *); extern int git_diff__from_iterators( - git_diff_list **diff_ptr, + git_diff **diff_ptr, git_repository *repo, git_iterator *old_iter, git_iterator *new_iter, const git_diff_options *opts); extern int git_diff__paired_foreach( - git_diff_list *idx2head, - git_diff_list *wd2idx, + git_diff *idx2head, + git_diff *wd2idx, int (*cb)(git_diff_delta *i2h, git_diff_delta *w2i, void *payload), void *payload); |