1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32
|
Last-Update: 2014-09-10
Forwarded: no
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: fixed compile errors in `glib-mkenums` with libglib2.0-dev 2.40
--- a/libgit2-glib/ggit-types.h
+++ b/libgit2-glib/ggit-types.h
@@ -955,11 +955,9 @@
GGIT_STATUS_OPTION_RENAMES_HEAD_TO_INDEX = (1 << 7),
GGIT_STATUS_OPTION_RENAMES_INDEX_TO_WORKDIR = (1 << 8),
GGIT_STATUS_OPTION_SORT_CASE_SENSITIVELY = (1 << 9),
GGIT_STATUS_OPTION_SORT_CASE_INSENSITIVELY = (1 << 10),
- GGIT_STATUS_OPTION_DEFAULT = GGIT_STATUS_OPTION_INCLUDE_IGNORED |
- GGIT_STATUS_OPTION_INCLUDE_UNTRACKED |
- GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS
+ GGIT_STATUS_OPTION_DEFAULT = GGIT_STATUS_OPTION_INCLUDE_IGNORED | GGIT_STATUS_OPTION_INCLUDE_UNTRACKED | GGIT_STATUS_OPTION_RECURSE_UNTRACKED_DIRS
} GgitStatusOption;
/**
* GgitStatusShow:
@@ -1051,10 +1049,9 @@
GGIT_DIFF_FIND_COPIES = (1u << 2),
GGIT_DIFF_FIND_COPIES_FROM_UNMODIFIED = (1u << 3),
GGIT_DIFF_FIND_REWRITES = (1u << 4),
GGIT_DIFF_BREAK_REWRITES = (1u << 5),
- GGIT_DIFF_FIND_AND_BREAK_REWRITES = (GGIT_DIFF_FIND_REWRITES |
- GGIT_DIFF_BREAK_REWRITES),
+ GGIT_DIFF_FIND_AND_BREAK_REWRITES = (GGIT_DIFF_FIND_REWRITES | GGIT_DIFF_BREAK_REWRITES),
GGIT_DIFF_FIND_FOR_UNTRACKED = (1u << 6),
GGIT_DIFF_FIND_ALL = (0x0ff),
GGIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE = 0,
GGIT_DIFF_FIND_IGNORE_WHITESPACE = (1u << 12),
|