diff options
| author | Russell Belfer <rb@github.com> | 2013-10-21 09:07:19 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-10-21 09:07:19 -0700 |
| commit | 74a627f04528f7e02f69d8d7947820582ce7ca15 (patch) | |
| tree | c71d9a9e95bcaa1efc1232f41c56ca8072e84ed4 /include/git2/diff.h | |
| parent | 10672e3e455eba2d4ca983070ed427caeeb24a6f (diff) | |
| download | libgit2-74a627f04528f7e02f69d8d7947820582ce7ca15.tar.gz | |
Tweak to git_diff_delta structure for nfiles
While the base git_diff_delta structure always contains two files,
when we introduce conflict data, it will be helpful to have an
indicator when an additional file is involved.
Diffstat (limited to 'include/git2/diff.h')
| -rw-r--r-- | include/git2/diff.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index fd79ccf04..f1572cbd5 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -292,8 +292,9 @@ typedef struct { */ typedef struct { git_delta_t status; - uint32_t similarity; /**< for RENAMED and COPIED, value 0-100 */ - uint32_t flags; + uint32_t flags; /**< git_diff_flag_t values */ + uint16_t similarity; /**< for RENAMED and COPIED, value 0-100 */ + uint16_t nfiles; /**< number of files in this delta */ git_diff_file old_file; git_diff_file new_file; } git_diff_delta; |