diff options
| author | Vicent Martà <vicent@github.com> | 2013-05-24 11:39:56 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-05-24 11:39:56 -0700 |
| commit | 85281328be6341794341a9a46b54e3a557b2b889 (patch) | |
| tree | b0bac0291ac788c6771b02e4ed59e970d2c669c7 /src/diff.c | |
| parent | 5e57cfa1b34374835f03e8d0ea61c338ed5cd9f0 (diff) | |
| parent | 7a5ee3dc923caf2b3b9b5e9b2408340f6ae32d7d (diff) | |
| download | libgit2-85281328be6341794341a9a46b54e3a557b2b889.tar.gz | |
Merge pull request #1608 from arrbee/various-cleanups-and-tweaks
Various cleanups and tweaks
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/diff.c b/src/diff.c index d2389f103..b96ff4705 100644 --- a/src/diff.c +++ b/src/diff.c @@ -383,6 +383,10 @@ static int diff_list_apply_options( if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_INCLUDE_TYPECHANGE_TREES)) diff->opts.flags |= GIT_DIFF_INCLUDE_TYPECHANGE; + /* flag INCLUDE_UNTRACKED_CONTENT implies INCLUDE_UNTRACKED */ + if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_INCLUDE_UNTRACKED_CONTENT)) + diff->opts.flags |= GIT_DIFF_INCLUDE_UNTRACKED; + /* load config values that affect diff behavior */ if (git_repository_config__weakptr(&cfg, repo) < 0) return -1; |