diff options
| author | Russell Belfer <rb@github.com> | 2012-11-14 23:29:48 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-11-14 23:29:48 -0800 |
| commit | bbe6dbec81d2050fb52b600bc27e2dacdc780e77 (patch) | |
| tree | 61f442146ed5b98352016f4ecec3ac4736e10c8c /include/git2/diff.h | |
| parent | bad68c0a998116685ad75cab84210004dd2c5be1 (diff) | |
| download | libgit2-bbe6dbec81d2050fb52b600bc27e2dacdc780e77.tar.gz | |
Add explicit git_index ptr to diff and checkout
A number of diff APIs and the `git_checkout_index` API take a
`git_repository` object an operate on the index. This updates
them to take a `git_index` pointer explicitly and only fall back
on the `git_repository` index if the index input is NULL. This
makes it easier to operate on a temporary index.
Diffstat (limited to 'include/git2/diff.h')
| -rw-r--r-- | include/git2/diff.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index a220c2e9b..3d8e7e776 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -339,12 +339,14 @@ GIT_EXTERN(int) git_diff_tree_to_tree( * @param diff Output pointer to a git_diff_list pointer to be allocated. * @param repo The repository containing the tree and index. * @param old_tree A git_tree object to diff from. + * @param index The index to diff with; repo index used if NULL. * @param opts Structure with options to influence diff or NULL for defaults. */ GIT_EXTERN(int) git_diff_index_to_tree( git_diff_list **diff, git_repository *repo, git_tree *old_tree, + git_index *index, const git_diff_options *opts); /**< can be NULL for defaults */ /** @@ -357,11 +359,13 @@ GIT_EXTERN(int) git_diff_index_to_tree( * * @param diff Output pointer to a git_diff_list pointer to be allocated. * @param repo The repository. + * @param index The index to diff from; repo index used if NULL. * @param opts Structure with options to influence diff or NULL for defaults. */ GIT_EXTERN(int) git_diff_workdir_to_index( git_diff_list **diff, git_repository *repo, + git_index *index, const git_diff_options *opts); /**< can be NULL for defaults */ /** |