Skip to content

Commit 02e617b

Browse files
implausibleimplausible
authored
Merge pull request #1788 from implausible/bump/libgit2-1.0.0
Bump libgit2 to fork of v1.0.0
2 parents 0327c08 + 3206927 commit 02e617b

File tree

22 files changed

+1163
-1058
lines changed

22 files changed

+1163
-1058
lines changed

‎generate/input/callbacks.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,11 @@
180180
"error": -1
181181
}
182182
},
183-
"git_cred_acquire_cb": {
183+
"git_credential_acquire_cb": {
184184
"args": [
185185
{
186-
"name": "cred",
187-
"cType": "git_cred **",
186+
"name": "credential",
187+
"cType": "git_credential **",
188188
"isReturn": true
189189
},
190190
{

‎generate/input/descriptor.json‎

Lines changed: 77 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
}
3434
}
3535
},
36+
"credential": {
37+
"JsName": "TYPE",
38+
"owner": "Credential"
39+
},
3640
"describe_strategy": {
3741
"ignore": true
3842
},
@@ -106,23 +110,31 @@
106110
}
107111
},
108112
"git_annotated_commit_from_ref": {
109-
"return": {
110-
"ownedBy": ["repo"]
113+
"args": {
114+
"out": {
115+
"ownedBy": ["repo"]
116+
}
111117
}
112118
},
113119
"git_annotated_commit_from_fetchhead": {
114-
"return": {
115-
"ownedBy": ["repo"]
120+
"args": {
121+
"out": {
122+
"ownedBy": ["repo"]
123+
}
116124
}
117125
},
118126
"git_annotated_commit_lookup": {
119-
"return": {
120-
"ownedBy": ["repo"]
127+
"args": {
128+
"out": {
129+
"ownedBy": ["repo"]
130+
}
121131
}
122132
},
123133
"git_annotated_commit_from_revspec": {
124-
"return": {
125-
"ownedBy": ["repo"]
134+
"args": {
135+
"out": {
136+
"ownedBy": ["repo"]
137+
}
126138
}
127139
}
128140
}
@@ -132,6 +144,11 @@
132144
},
133145
"attr": {
134146
"functions": {
147+
"git_attr_cache_flush": {
148+
"return": {
149+
"isErrorCode": true
150+
}
151+
},
135152
"git_attr_foreach": {
136153
"ignore": true
137154
},
@@ -1066,61 +1083,61 @@
10661083
}
10671084
}
10681085
},
1069-
"cred": {
1086+
"credential": {
10701087
"needsForwardDeclaration": false,
10711088
"selfFreeing": true,
1072-
"cType": "git_cred",
1089+
"cType": "git_credential",
10731090
"fields": {
10741091
"free": {
10751092
"ignore": true
10761093
}
10771094
},
10781095
"functions": {
1079-
"git_cred_default_new": {
1096+
"git_credential_default_new": {
10801097
"isAsync": false
10811098
},
1082-
"git_cred_free": {
1099+
"git_credential_free": {
10831100
"ignore": true
10841101
},
1085-
"git_cred_ssh_custom_new": {
1102+
"git_credential_ssh_custom_new": {
10861103
"ignore": true
10871104
},
1088-
"git_cred_ssh_interactive_new": {
1105+
"git_credential_ssh_interactive_new": {
10891106
"ignore": true
10901107
},
1091-
"git_cred_ssh_key_from_agent": {
1108+
"git_credential_ssh_key_from_agent": {
10921109
"isAsync": false
10931110
},
1094-
"git_cred_ssh_key_new": {
1111+
"git_credential_ssh_key_new": {
10951112
"isAsync": false
10961113
},
1097-
"git_cred_userpass": {
1114+
"git_credential_userpass": {
10981115
"ignore": true
10991116
},
1100-
"git_cred_userpass_plaintext_new": {
1117+
"git_credential_userpass_plaintext_new": {
11011118
"isAsync": false
11021119
}
11031120
}
11041121
},
1105-
"cred_default": {
1122+
"credential_default": {
11061123
"ignore": true
11071124
},
1108-
"cred_ssh_custom": {
1125+
"credential_ssh_custom": {
11091126
"ignore": true
11101127
},
1111-
"cred_ssh_interactive": {
1128+
"credential_ssh_interactive": {
11121129
"ignore": true
11131130
},
1114-
"cred_ssh_key": {
1131+
"credential_ssh_key": {
11151132
"ignore": true
11161133
},
1117-
"cred_username": {
1134+
"credential_username": {
11181135
"ignore": true
11191136
},
1120-
"cred_userpass_payload": {
1137+
"credential_userpass_payload": {
11211138
"ignore": true
11221139
},
1123-
"cred_userpass_plaintext": {
1140+
"credential_userpass_plaintext": {
11241141
"ignore": true
11251142
},
11261143
"describe": {
@@ -1996,7 +2013,10 @@
19962013
"git_index_name_clear": {
19972014
"cppFunctionName": "Clear",
19982015
"jsFunctionName": "clear",
1999-
"isAsync": true
2016+
"isAsync": true,
2017+
"return": {
2018+
"isErrorCode": true
2019+
}
20002020
},
20012021
"git_index_name_entrycount": {
20022022
"cppFunctionName": "Entrycount",
@@ -2031,7 +2051,10 @@
20312051
"cppFunctionName": "Clear",
20322052
"jsFunctionName": "clear",
20332053
"isAsync": true,
2034-
"isPrototypeMethod": false
2054+
"isPrototypeMethod": false,
2055+
"return": {
2056+
"isErrorCode": true
2057+
}
20352058
},
20362059
"git_index_reuc_entrycount": {
20372060
"cppFunctionName": "Entrycount",
@@ -2571,10 +2594,17 @@
25712594
"shouldAlloc": true,
25722595
"functions": {
25732596
"git_oid_cpy": {
2597+
"isAsync": false,
25742598
"args": {
2599+
"src": {
2600+
"shouldAlloc": false
2601+
},
25752602
"out": {
25762603
"isReturn": true
25772604
}
2605+
},
2606+
"return": {
2607+
"isErrorCode": true
25782608
}
25792609
},
25802610
"git_oid_fmt": {
@@ -2707,8 +2737,10 @@
27072737
},
27082738
"git_patch_from_diff": {
27092739
"isAsync": true,
2710-
"return": {
2711-
"ownedBy": ["diff"]
2740+
"args": {
2741+
"out": {
2742+
"ownedBy": ["diff"]
2743+
}
27122744
}
27132745
},
27142746
"git_patch_get_delta": {
@@ -3203,7 +3235,10 @@
32033235
}
32043236
},
32053237
"git_remote_disconnect": {
3206-
"isAsync": true
3238+
"isAsync": true,
3239+
"return": {
3240+
"isErrorCode": true
3241+
}
32073242
},
32083243
"git_remote_download": {
32093244
"args": {
@@ -3408,7 +3443,10 @@
34083443
],
34093444
"functions": {
34103445
"git_repository__cleanup": {
3411-
"isAsync": true
3446+
"isAsync": true,
3447+
"return": {
3448+
"isErrorCode": true
3449+
}
34123450
},
34133451
"git_repository_config": {
34143452
"args": {
@@ -3525,6 +3563,9 @@
35253563
"index": {
35263564
"isOptional": true
35273565
}
3566+
},
3567+
"return": {
3568+
"isErrorCode": true
35283569
}
35293570
},
35303571
"git_repository_set_odb": {
@@ -4321,6 +4362,11 @@
43214362
"treebuilder": {
43224363
"selfFreeing": true,
43234364
"functions": {
4365+
"git_treebuilder_clear": {
4366+
"return": {
4367+
"isErrorCode": true
4368+
}
4369+
},
43244370
"git_treebuilder_filter": {
43254371
"ignore": true
43264372
},

0 commit comments

Comments
 (0)