diff options
| author | Russell Belfer <rb@github.com> | 2012-10-08 15:14:12 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-10-08 15:22:40 -0700 |
| commit | dfbff793b8f39995d3a8744d6b7d75d5cc7201a0 (patch) | |
| tree | 0ffa00f2e946fc65596b08b6064ac2fee25a0963 /include/git2/diff.h | |
| parent | 543864b677704845660085d2b2b2249cabb084a4 (diff) | |
| download | libgit2-dfbff793b8f39995d3a8744d6b7d75d5cc7201a0.tar.gz | |
Fix a few diff bugs with directory content
There are a few cases where diff should leave directories in
the diff list if we want to match core git, such as when the
directory contains a .git dir. That feature was lost when I
introduced some of the new submodule handling.
This restores that and then fixes a couple of related to diff
output that are triggered by having diffs with directories in
them.
Also, this adds a new flag that can be passed to diff if you
want diff output to actually include the file content of any
untracked files.
Diffstat (limited to 'include/git2/diff.h')
| -rw-r--r-- | include/git2/diff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index 1f7f8ab2a..121c40307 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -47,7 +47,8 @@ enum { GIT_DIFF_INCLUDE_UNMODIFIED = (1 << 9), GIT_DIFF_RECURSE_UNTRACKED_DIRS = (1 << 10), GIT_DIFF_DISABLE_PATHSPEC_MATCH = (1 << 11), - GIT_DIFF_DELTAS_ARE_ICASE = (1 << 12) + GIT_DIFF_DELTAS_ARE_ICASE = (1 << 12), + GIT_DIFF_INCLUDE_UNTRACKED_CONTENT = (1 << 13), }; /** |