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_file.c | |
| 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_file.c')
| -rw-r--r-- | src/diff_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/diff_file.c b/src/diff_file.c index 5939ee8b8..a4c8641bc 100644 --- a/src/diff_file.c +++ b/src/diff_file.c @@ -88,7 +88,7 @@ static int diff_file_content_init_common( int git_diff_file_content__init_from_diff( git_diff_file_content *fc, - git_diff_list *diff, + git_diff *diff, size_t delta_index, bool use_old) { @@ -110,7 +110,7 @@ int git_diff_file_content__init_from_diff( has_data = use_old; break; case GIT_DELTA_UNTRACKED: has_data = !use_old && - (diff->opts.flags & GIT_DIFF_INCLUDE_UNTRACKED_CONTENT) != 0; + (diff->opts.flags & GIT_DIFF_SHOW_UNTRACKED_CONTENT) != 0; break; case GIT_DELTA_MODIFIED: case GIT_DELTA_COPIED: |