@@ -494,11 +494,11 @@ pub type git_remote_create_cb = extern "C" fn(
494
494
git_enum ! {
495
495
pub enum git_checkout_notify_t {
496
496
GIT_CHECKOUT_NOTIFY_NONE = 0 ,
497
- GIT_CHECKOUT_NOTIFY_CONFLICT = ( 1 << 0 ) ,
498
- GIT_CHECKOUT_NOTIFY_DIRTY = ( 1 << 1 ) ,
499
- GIT_CHECKOUT_NOTIFY_UPDATED = ( 1 << 2 ) ,
500
- GIT_CHECKOUT_NOTIFY_UNTRACKED = ( 1 << 3 ) ,
501
- GIT_CHECKOUT_NOTIFY_IGNORED = ( 1 << 4 ) ,
497
+ GIT_CHECKOUT_NOTIFY_CONFLICT = 1 << 0 ,
498
+ GIT_CHECKOUT_NOTIFY_DIRTY = 1 << 1 ,
499
+ GIT_CHECKOUT_NOTIFY_UPDATED = 1 << 2 ,
500
+ GIT_CHECKOUT_NOTIFY_UNTRACKED = 1 << 3 ,
501
+ GIT_CHECKOUT_NOTIFY_IGNORED = 1 << 4 ,
502
502
503
503
GIT_CHECKOUT_NOTIFY_ALL = 0x0FFFF ,
504
504
}
@@ -508,43 +508,43 @@ git_enum! {
508
508
pub enum git_status_t {
509
509
GIT_STATUS_CURRENT = 0 ,
510
510
511
- GIT_STATUS_INDEX_NEW = ( 1 << 0 ) ,
512
- GIT_STATUS_INDEX_MODIFIED = ( 1 << 1 ) ,
513
- GIT_STATUS_INDEX_DELETED = ( 1 << 2 ) ,
514
- GIT_STATUS_INDEX_RENAMED = ( 1 << 3 ) ,
515
- GIT_STATUS_INDEX_TYPECHANGE = ( 1 << 4 ) ,
516
-
517
- GIT_STATUS_WT_NEW = ( 1 << 7 ) ,
518
- GIT_STATUS_WT_MODIFIED = ( 1 << 8 ) ,
519
- GIT_STATUS_WT_DELETED = ( 1 << 9 ) ,
520
- GIT_STATUS_WT_TYPECHANGE = ( 1 << 10 ) ,
521
- GIT_STATUS_WT_RENAMED = ( 1 << 11 ) ,
522
- GIT_STATUS_WT_UNREADABLE = ( 1 << 12 ) ,
523
-
524
- GIT_STATUS_IGNORED = ( 1 << 14 ) ,
525
- GIT_STATUS_CONFLICTED = ( 1 << 15 ) ,
511
+ GIT_STATUS_INDEX_NEW = 1 << 0 ,
512
+ GIT_STATUS_INDEX_MODIFIED = 1 << 1 ,
513
+ GIT_STATUS_INDEX_DELETED = 1 << 2 ,
514
+ GIT_STATUS_INDEX_RENAMED = 1 << 3 ,
515
+ GIT_STATUS_INDEX_TYPECHANGE = 1 << 4 ,
516
+
517
+ GIT_STATUS_WT_NEW = 1 << 7 ,
518
+ GIT_STATUS_WT_MODIFIED = 1 << 8 ,
519
+ GIT_STATUS_WT_DELETED = 1 << 9 ,
520
+ GIT_STATUS_WT_TYPECHANGE = 1 << 10 ,
521
+ GIT_STATUS_WT_RENAMED = 1 << 11 ,
522
+ GIT_STATUS_WT_UNREADABLE = 1 << 12 ,
523
+
524
+ GIT_STATUS_IGNORED = 1 << 14 ,
525
+ GIT_STATUS_CONFLICTED = 1 << 15 ,
526
526
}
527
527
}
528
528
529
529
git_enum ! {
530
530
pub enum git_status_opt_t {
531
- GIT_STATUS_OPT_INCLUDE_UNTRACKED = ( 1 << 0 ) ,
532
- GIT_STATUS_OPT_INCLUDE_IGNORED = ( 1 << 1 ) ,
533
- GIT_STATUS_OPT_INCLUDE_UNMODIFIED = ( 1 << 2 ) ,
534
- GIT_STATUS_OPT_EXCLUDE_SUBMODULES = ( 1 << 3 ) ,
535
- GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS = ( 1 << 4 ) ,
536
- GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH = ( 1 << 5 ) ,
537
- GIT_STATUS_OPT_RECURSE_IGNORED_DIRS = ( 1 << 6 ) ,
538
- GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX = ( 1 << 7 ) ,
539
- GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR = ( 1 << 8 ) ,
540
- GIT_STATUS_OPT_SORT_CASE_SENSITIVELY = ( 1 << 9 ) ,
541
- GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY = ( 1 << 10 ) ,
542
-
543
- GIT_STATUS_OPT_RENAMES_FROM_REWRITES = ( 1 << 11 ) ,
544
- GIT_STATUS_OPT_NO_REFRESH = ( 1 << 12 ) ,
545
- GIT_STATUS_OPT_UPDATE_INDEX = ( 1 << 13 ) ,
546
- GIT_STATUS_OPT_INCLUDE_UNREADABLE = ( 1 << 14 ) ,
547
- GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED = ( 1 << 15 ) ,
531
+ GIT_STATUS_OPT_INCLUDE_UNTRACKED = 1 << 0 ,
532
+ GIT_STATUS_OPT_INCLUDE_IGNORED = 1 << 1 ,
533
+ GIT_STATUS_OPT_INCLUDE_UNMODIFIED = 1 << 2 ,
534
+ GIT_STATUS_OPT_EXCLUDE_SUBMODULES = 1 << 3 ,
535
+ GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS = 1 << 4 ,
536
+ GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH = 1 << 5 ,
537
+ GIT_STATUS_OPT_RECURSE_IGNORED_DIRS = 1 << 6 ,
538
+ GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX = 1 << 7 ,
539
+ GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR = 1 << 8 ,
540
+ GIT_STATUS_OPT_SORT_CASE_SENSITIVELY = 1 << 9 ,
541
+ GIT_STATUS_OPT_SORT_CASE_INSENSITIVELY = 1 << 10 ,
542
+
543
+ GIT_STATUS_OPT_RENAMES_FROM_REWRITES = 1 << 11 ,
544
+ GIT_STATUS_OPT_NO_REFRESH = 1 << 12 ,
545
+ GIT_STATUS_OPT_UPDATE_INDEX = 1 << 13 ,
546
+ GIT_STATUS_OPT_INCLUDE_UNREADABLE = 1 << 14 ,
547
+ GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED = 1 << 15 ,
548
548
}
549
549
}
550
550
@@ -601,26 +601,26 @@ pub struct git_status_entry {
601
601
git_enum ! {
602
602
pub enum git_checkout_strategy_t {
603
603
GIT_CHECKOUT_NONE = 0 ,
604
- GIT_CHECKOUT_SAFE = ( 1 << 0 ) ,
605
- GIT_CHECKOUT_FORCE = ( 1 << 1 ) ,
606
- GIT_CHECKOUT_RECREATE_MISSING = ( 1 << 2 ) ,
607
- GIT_CHECKOUT_ALLOW_CONFLICTS = ( 1 << 4 ) ,
608
- GIT_CHECKOUT_REMOVE_UNTRACKED = ( 1 << 5 ) ,
609
- GIT_CHECKOUT_REMOVE_IGNORED = ( 1 << 6 ) ,
610
- GIT_CHECKOUT_UPDATE_ONLY = ( 1 << 7 ) ,
611
- GIT_CHECKOUT_DONT_UPDATE_INDEX = ( 1 << 8 ) ,
612
- GIT_CHECKOUT_NO_REFRESH = ( 1 << 9 ) ,
613
- GIT_CHECKOUT_SKIP_UNMERGED = ( 1 << 10 ) ,
614
- GIT_CHECKOUT_USE_OURS = ( 1 << 11 ) ,
615
- GIT_CHECKOUT_USE_THEIRS = ( 1 << 12 ) ,
616
- GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH = ( 1 << 13 ) ,
617
- GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES = ( 1 << 18 ) ,
618
- GIT_CHECKOUT_DONT_OVERWRITE_IGNORED = ( 1 << 19 ) ,
619
- GIT_CHECKOUT_CONFLICT_STYLE_MERGE = ( 1 << 20 ) ,
620
- GIT_CHECKOUT_CONFLICT_STYLE_DIFF3 = ( 1 << 21 ) ,
621
-
622
- GIT_CHECKOUT_UPDATE_SUBMODULES = ( 1 << 16 ) ,
623
- GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED = ( 1 << 17 ) ,
604
+ GIT_CHECKOUT_SAFE = 1 << 0 ,
605
+ GIT_CHECKOUT_FORCE = 1 << 1 ,
606
+ GIT_CHECKOUT_RECREATE_MISSING = 1 << 2 ,
607
+ GIT_CHECKOUT_ALLOW_CONFLICTS = 1 << 4 ,
608
+ GIT_CHECKOUT_REMOVE_UNTRACKED = 1 << 5 ,
609
+ GIT_CHECKOUT_REMOVE_IGNORED = 1 << 6 ,
610
+ GIT_CHECKOUT_UPDATE_ONLY = 1 << 7 ,
611
+ GIT_CHECKOUT_DONT_UPDATE_INDEX = 1 << 8 ,
612
+ GIT_CHECKOUT_NO_REFRESH = 1 << 9 ,
613
+ GIT_CHECKOUT_SKIP_UNMERGED = 1 << 10 ,
614
+ GIT_CHECKOUT_USE_OURS = 1 << 11 ,
615
+ GIT_CHECKOUT_USE_THEIRS = 1 << 12 ,
616
+ GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH = 1 << 13 ,
617
+ GIT_CHECKOUT_SKIP_LOCKED_DIRECTORIES = 1 << 18 ,
618
+ GIT_CHECKOUT_DONT_OVERWRITE_IGNORED = 1 << 19 ,
619
+ GIT_CHECKOUT_CONFLICT_STYLE_MERGE = 1 << 20 ,
620
+ GIT_CHECKOUT_CONFLICT_STYLE_DIFF3 = 1 << 21 ,
621
+
622
+ GIT_CHECKOUT_UPDATE_SUBMODULES = 1 << 16 ,
623
+ GIT_CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED = 1 << 17 ,
624
624
}
625
625
}
626
626
@@ -915,11 +915,11 @@ git_enum! {
915
915
916
916
git_enum ! {
917
917
pub enum git_repository_open_flag_t {
918
- GIT_REPOSITORY_OPEN_NO_SEARCH = ( 1 << 0 ) ,
919
- GIT_REPOSITORY_OPEN_CROSS_FS = ( 1 << 1 ) ,
920
- GIT_REPOSITORY_OPEN_BARE = ( 1 << 2 ) ,
921
- GIT_REPOSITORY_OPEN_NO_DOTGIT = ( 1 << 3 ) ,
922
- GIT_REPOSITORY_OPEN_FROM_ENV = ( 1 << 4 ) ,
918
+ GIT_REPOSITORY_OPEN_NO_SEARCH = 1 << 0 ,
919
+ GIT_REPOSITORY_OPEN_CROSS_FS = 1 << 1 ,
920
+ GIT_REPOSITORY_OPEN_BARE = 1 << 2 ,
921
+ GIT_REPOSITORY_OPEN_NO_DOTGIT = 1 << 3 ,
922
+ GIT_REPOSITORY_OPEN_FROM_ENV = 1 << 4 ,
923
923
}
924
924
}
925
925
@@ -939,12 +939,12 @@ pub const GIT_REPOSITORY_INIT_OPTIONS_VERSION: c_uint = 1;
939
939
940
940
git_enum ! {
941
941
pub enum git_repository_init_flag_t {
942
- GIT_REPOSITORY_INIT_BARE = ( 1 << 0 ) ,
943
- GIT_REPOSITORY_INIT_NO_REINIT = ( 1 << 1 ) ,
944
- GIT_REPOSITORY_INIT_NO_DOTGIT_DIR = ( 1 << 2 ) ,
945
- GIT_REPOSITORY_INIT_MKDIR = ( 1 << 3 ) ,
946
- GIT_REPOSITORY_INIT_MKPATH = ( 1 << 4 ) ,
947
- GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE = ( 1 << 5 ) ,
942
+ GIT_REPOSITORY_INIT_BARE = 1 << 0 ,
943
+ GIT_REPOSITORY_INIT_NO_REINIT = 1 << 1 ,
944
+ GIT_REPOSITORY_INIT_NO_DOTGIT_DIR = 1 << 2 ,
945
+ GIT_REPOSITORY_INIT_MKDIR = 1 << 3 ,
946
+ GIT_REPOSITORY_INIT_MKPATH = 1 << 4 ,
947
+ GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE = 1 << 5 ,
948
948
}
949
949
}
950
950
@@ -959,9 +959,9 @@ git_enum! {
959
959
git_enum ! {
960
960
pub enum git_sort_t {
961
961
GIT_SORT_NONE = 0 ,
962
- GIT_SORT_TOPOLOGICAL = ( 1 << 0 ) ,
963
- GIT_SORT_TIME = ( 1 << 1 ) ,
964
- GIT_SORT_REVERSE = ( 1 << 2 ) ,
962
+ GIT_SORT_TOPOLOGICAL = 1 << 0 ,
963
+ GIT_SORT_TIME = 1 << 1 ,
964
+ GIT_SORT_REVERSE = 1 << 2 ,
965
965
}
966
966
}
967
967
@@ -1231,32 +1231,32 @@ git_enum! {
1231
1231
git_enum ! {
1232
1232
pub enum git_merge_file_flag_t {
1233
1233
GIT_MERGE_FILE_DEFAULT = 0 ,
1234
- GIT_MERGE_FILE_STYLE_MERGE = ( 1 << 0 ) ,
1235
- GIT_MERGE_FILE_STYLE_DIFF3 = ( 1 << 1 ) ,
1236
- GIT_MERGE_FILE_SIMPLIFY_ALNUM = ( 1 << 2 ) ,
1237
- GIT_MERGE_FILE_IGNORE_WHITESPACE = ( 1 << 3 ) ,
1238
- GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE = ( 1 << 4 ) ,
1239
- GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL = ( 1 << 5 ) ,
1240
- GIT_MERGE_FILE_DIFF_PATIENCE = ( 1 << 6 ) ,
1241
- GIT_MERGE_FILE_DIFF_MINIMAL = ( 1 << 7 ) ,
1234
+ GIT_MERGE_FILE_STYLE_MERGE = 1 << 0 ,
1235
+ GIT_MERGE_FILE_STYLE_DIFF3 = 1 << 1 ,
1236
+ GIT_MERGE_FILE_SIMPLIFY_ALNUM = 1 << 2 ,
1237
+ GIT_MERGE_FILE_IGNORE_WHITESPACE = 1 << 3 ,
1238
+ GIT_MERGE_FILE_IGNORE_WHITESPACE_CHANGE = 1 << 4 ,
1239
+ GIT_MERGE_FILE_IGNORE_WHITESPACE_EOL = 1 << 5 ,
1240
+ GIT_MERGE_FILE_DIFF_PATIENCE = 1 << 6 ,
1241
+ GIT_MERGE_FILE_DIFF_MINIMAL = 1 << 7 ,
1242
1242
}
1243
1243
}
1244
1244
1245
1245
git_enum ! {
1246
1246
pub enum git_merge_analysis_t {
1247
1247
GIT_MERGE_ANALYSIS_NONE = 0 ,
1248
- GIT_MERGE_ANALYSIS_NORMAL = ( 1 << 0 ) ,
1249
- GIT_MERGE_ANALYSIS_UP_TO_DATE = ( 1 << 1 ) ,
1250
- GIT_MERGE_ANALYSIS_FASTFORWARD = ( 1 << 2 ) ,
1251
- GIT_MERGE_ANALYSIS_UNBORN = ( 1 << 3 ) ,
1248
+ GIT_MERGE_ANALYSIS_NORMAL = 1 << 0 ,
1249
+ GIT_MERGE_ANALYSIS_UP_TO_DATE = 1 << 1 ,
1250
+ GIT_MERGE_ANALYSIS_FASTFORWARD = 1 << 2 ,
1251
+ GIT_MERGE_ANALYSIS_UNBORN = 1 << 3 ,
1252
1252
}
1253
1253
}
1254
1254
1255
1255
git_enum ! {
1256
1256
pub enum git_merge_preference_t {
1257
1257
GIT_MERGE_PREFERENCE_NONE = 0 ,
1258
- GIT_MERGE_PREFERENCE_NO_FASTFORWARD = ( 1 << 0 ) ,
1259
- GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY = ( 1 << 1 ) ,
1258
+ GIT_MERGE_PREFERENCE_NO_FASTFORWARD = 1 << 0 ,
1259
+ GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY = 1 << 1 ,
1260
1260
}
1261
1261
}
1262
1262
0 commit comments