Skip to content

Commit 291cf12

Browse files
authored
Merge pull request libgit2#4680 from pks-t/pks/diff-opts-enum
diff: fix enum value being out of allowed range
2 parents 3be7301 + 2d9d246 commit 291cf12

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

include/git2/diff.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,12 @@ typedef enum {
171171
* Options controlling how output will be generated
172172
*/
173173

174+
/** Use a heuristic that takes indentation and whitespace into account
175+
* which generally can produce better diffs when dealing with ambiguous
176+
* diff hunks.
177+
*/
178+
GIT_DIFF_INDENT_HEURISTIC = (1u << 18),
179+
174180
/** Treat all files as text, disabling binary attributes & detection */
175181
GIT_DIFF_FORCE_TEXT = (1u << 20),
176182
/** Treat all files as binary, disabling text diffs */
@@ -206,12 +212,6 @@ typedef enum {
206212
* can apply given diff information to binary files.
207213
*/
208214
GIT_DIFF_SHOW_BINARY = (1u << 30),
209-
210-
/** Use a heuristic that takes indentation and whitespace into account
211-
* which generally can produce better diffs when dealing with ambiguous
212-
* diff hunks.
213-
*/
214-
GIT_DIFF_INDENT_HEURISTIC = (1u << 31),
215215
} git_diff_option_t;
216216

217217
/**

0 commit comments

Comments
 (0)