summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Rogers <alan@github.com>2014-06-03 17:50:00 -0700
committerAlan Rogers <alan@github.com>2014-06-03 17:50:00 -0700
commit7b491a7deac7a97f440fb6d29f2f84d5ef797a42 (patch)
tree6a2e47cb59115ca160af1c00b68d592bc54bcab7
parent79d5b5c91683720c9055d1f5ea3f9468ca9356a4 (diff)
downloadlibgit2-7b491a7deac7a97f440fb6d29f2f84d5ef797a42.tar.gz
GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED
-rw-r--r--include/git2/diff.h5
-rw-r--r--src/status.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h
index ebf47e3c0..db2233f82 100644
--- a/include/git2/diff.h
+++ b/include/git2/diff.h
@@ -193,7 +193,10 @@ typedef enum {
GIT_DIFF_SHOW_BINARY = (1 << 30),
/** Include unreadable files in the diff */
- GIT_DIFF_INCLUDE_UNREADABLE = (1 << 31),
+ GIT_DIFF_INCLUDE_UNREADABLE = (1 << 27),
+
+ /** Include unreadable files in the diff */
+ GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED = (1 << 31),
} git_diff_option_t;
/**
diff --git a/src/status.c b/src/status.c
index 5a592a7c5..e1cb60df9 100644
--- a/src/status.c
+++ b/src/status.c
@@ -315,6 +315,8 @@ int git_status_list_new(
diffopt.flags = diffopt.flags | GIT_DIFF_UPDATE_INDEX;
if ((flags & GIT_STATUS_OPT_INCLUDE_UNREADABLE) != 0)
diffopt.flags = diffopt.flags | GIT_DIFF_INCLUDE_UNREADABLE;
+ if ((flags & GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED) != 0)
+ diffopt.flags = diffopt.flags | GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED;
if ((flags & GIT_STATUS_OPT_RENAMES_FROM_REWRITES) != 0)
findopt.flags = findopt.flags |