New status fixes

This adds support for roughly-right tracking of submodules
(although it does not recurse into submodules to detect
internal modifications a la core git), and it adds support
for including unmodified files in diff iteration if requested.

2 files changed, 5 insertions, 4 deletions

diff --git a/include/git2/diff.h b/include/git2/diff.h
index 0e7c02fd0..cb3ef4e1b 100644
--- a/include/git2/diff.h
+++ b/include/git2/diff.h
@@ -39,7 +39,8 @@ enum {
 	GIT_DIFF_IGNORE_SUBMODULES = (1 << 5),
 	GIT_DIFF_PATIENCE = (1 << 6),
 	GIT_DIFF_INCLUDE_IGNORED = (1 << 7),
-	GIT_DIFF_INCLUDE_UNTRACKED = (1 << 8)
+	GIT_DIFF_INCLUDE_UNTRACKED = (1 << 8),
+	GIT_DIFF_INCLUDE_UNMODIFIED = (1 << 9)
 };
 
 /**
diff --git a/include/git2/status.h b/include/git2/status.h
index 339052933..a24d39fa7 100644
--- a/include/git2/status.h
+++ b/include/git2/status.h
@@ -83,14 +83,14 @@ typedef enum {
  *   the workdir files are included in the status "show" option.
  *   Right now, there is no option to include all files in
  *   directories that are ignored completely.
- * - GIT_STATUS_OPT_EXCLUDE_UNMODIFIED indicates that callback
- *   do not need to be made on unmodified files.
+ * - GIT_STATUS_OPT_INCLUDE_UNMODIFIED indicates that callback
+ *   should be made even on unmodified files.
  * - GIT_STATUS_OPT_EXCLUDE_SUBMODULES indicates that directories
  *   which appear to be submodules should just be skipped over.
  */
 #define GIT_STATUS_OPT_INCLUDE_UNTRACKED  (1 << 0)
 #define GIT_STATUS_OPT_INCLUDE_IGNORED    (1 << 1)
-#define GIT_STATUS_OPT_EXCLUDE_UNMODIFIED (1 << 2)
+#define GIT_STATUS_OPT_INCLUDE_UNMODIFIED (1 << 2)
 #define GIT_STATUS_OPT_EXCLUDE_SUBMODULES (1 << 3)
 
 /**