diff options
| author | Vicent Marti <vicent@github.com> | 2014-05-02 09:50:15 -0700 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-05-02 09:50:15 -0700 |
| commit | 272b462db7cfb50c1ab69e1edda214b21f242ae5 (patch) | |
| tree | 13c7a7ef6e7ef1e6d90949e60a3d4677ef9096e4 /src/diff.h | |
| parent | 9862ef8ef8ffd95a74be8082acab9fea0de85edb (diff) | |
| parent | 99dfa470398b9c4e06e5a5ee61868d3b9e21b26e (diff) | |
| download | libgit2-272b462db7cfb50c1ab69e1edda214b21f242ae5.tar.gz | |
Merge pull request #2308 from libgit2/rb/diff-update-index-stat-cache
Reduce excessive OID calculation for diff and stat
Diffstat (limited to 'src/diff.h')
| -rw-r--r-- | src/diff.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/diff.h b/src/diff.h index aae8fbff1..3305238d0 100644 --- a/src/diff.h +++ b/src/diff.h @@ -8,6 +8,7 @@ #define INCLUDE_diff_h__ #include "git2/diff.h" +#include "git2/sys/diff.h" #include "git2/oid.h" #include <stdio.h> @@ -62,6 +63,7 @@ struct git_diff { git_iterator_type_t old_src; git_iterator_type_t new_src; uint32_t diffcaps; + git_diff_perfdata perf; int (*strcomp)(const char *, const char *); int (*strncomp)(const char *, const char *, size_t); @@ -90,7 +92,9 @@ extern int git_diff_delta__format_file_header( int oid_strlen); extern int git_diff__oid_for_file( - git_repository *, const char *, uint16_t, git_off_t, git_oid *); + git_oid *out, git_diff *, const char *, uint16_t, git_off_t); +extern int git_diff__oid_for_entry( + git_oid *out, git_diff *, const git_index_entry *, const git_oid *update); extern int git_diff__from_iterators( git_diff **diff_ptr, |