summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2021-09-21 20:23:44 -0400
committerEdward Thomson <ethomson@edwardthomson.com>2021-09-21 20:23:44 -0400
commit1ba7c32709cb7bc1cc0d11d1a87a7d952eb514ae (patch)
tree99e6a926f41c969b005907f50d17b4adb14dd557
parentba01547d4a8190d5e4df317d4b0d0767e160bc57 (diff)
downloadlibgit2-ethomson/diff_enum.tar.gz
diff: update `GIT_DIFF_IGNORE_BLANK_LINES`ethomson/diff_enum
`GIT_DIFF_IGNORE_BLANK_LINES` needs to be within a (signed) int, per the `enum` definition of ISO C.
-rw-r--r--include/git2/diff.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h
index a0a15e76f..a14c01993 100644
--- a/include/git2/diff.h
+++ b/include/git2/diff.h
@@ -133,6 +133,9 @@ typedef enum {
*/
GIT_DIFF_INDENT_HEURISTIC = (1u << 18),
+ /** Ignore blank lines */
+ GIT_DIFF_IGNORE_BLANK_LINES = (1u << 19),
+
/** Treat all files as text, disabling binary attributes & detection */
GIT_DIFF_FORCE_TEXT = (1u << 20),
/** Treat all files as binary, disabling text diffs */
@@ -168,10 +171,6 @@ typedef enum {
* can apply given diff information to binary files.
*/
GIT_DIFF_SHOW_BINARY = (1u << 30),
-
- /** Ignore blank lines */
- GIT_DIFF_IGNORE_BLANK_LINES = (1u << 31),
-
} git_diff_option_t;
/**