diff options
| author | Ben Straub <bs@github.com> | 2013-10-28 11:04:58 -0700 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2013-10-28 11:04:58 -0700 |
| commit | 42c8f8f807fe986534e0cbabbfabc32cb4eb9077 (patch) | |
| tree | fa76cb66e6d49855be344026b1cbe31d03962916 /src/diff_file.c | |
| parent | a7d28f40a2a01382b76c55ca0a0672c177adaf69 (diff) | |
| parent | 5c50f22a93c78190fb7d81802199ff9defc8cf55 (diff) | |
| download | libgit2-42c8f8f807fe986534e0cbabbfabc32cb4eb9077.tar.gz | |
Merge remote-tracking branch 'libgit2/development' into blame
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: |