Skip to content

Commit 27081f9

Browse files
MikeJerredMikeJerred
committed
merge: upstream/master into master
2 parents 3f51e31 + a381c0b commit 27081f9

26 files changed

+744
-109
lines changed

‎.github/workflows/tests.yml

Whitespace-only changes.

‎CHANGELOG.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
# Change Log
22

3+
## <a name="v0-28-0-alpha.20" href="#v0-28-0-alpha-20">v0.28.0-alpha.20</a> [(2022-11-11)](https://github.com/nodegit/nodegit/releases/tag/v0.28.0-alpha.20)
4+
5+
[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.28.0-alpha.19...v0.28.0-alpha.20)
6+
7+
#### Summary of changes
8+
- Fix electron build issues
9+
10+
#### Merged PRs into NodeGit
11+
- [Fix electron build issues](https://github.com/nodegit/nodegit/pull/1955)
12+
13+
## <a name="v0-28-0-alpha.19" href="#v0-28-0-alpha-19">v0.28.0-alpha.19</a> [(2022-11-08)](https://github.com/nodegit/nodegit/releases/tag/v0.28.0-alpha.19)
14+
15+
[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.28.0-alpha.18...v0.28.0-alpha.19)
16+
17+
#### Summary of changes
18+
- OpenSSL bump
19+
- OpenSSL binaries will be automatically downloaded when building for Electron on Windows and macOS
20+
- Crash fix on Electron 18+ due to Nan bug
21+
- Partial stash support
22+
23+
#### Merged PRs into NodeGit
24+
- [Allow overriding C++ standard](https://github.com/nodegit/nodegit/pull/1953)
25+
- [Bump OpenSSL to 1.1.1s](https://github.com/nodegit/nodegit/pull/1952)
26+
- [Fix intermittent crash on Electron 18+](https://github.com/nodegit/nodegit/pull/1951)
27+
- [type is a call](https://github.com/nodegit/nodegit/pull/1942)
28+
- [Fix leak in agent](https://github.com/nodegit/nodegit/pull/1947)
29+
- [Default to using precompiled OpenSSL for Electron](https://github.com/nodegit/nodegit/pull/1949)
30+
- [Partial stash support](https://github.com/nodegit/nodegit/pull/1948)
31+
- [Switch CI to macOS-11](https://github.com/nodegit/nodegit/pull/1950)
32+
- [Preemptively Patch OpenSSL 1.1.1q](https://github.com/nodegit/nodegit/pull/1928)
33+
- [Add getAllFilepaths function in tree object](https://github.com/nodegit/nodegit/pull/1919)
34+
335
## <a name="v0-28-0-alpha.18" href="#v0-28-0-alpha-18">v0.28.0-alpha.18</a> [(2022-05-27)](https://github.com/nodegit/nodegit/releases/tag/v0.28.0-alpha.18)
436

537
[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.28.0-alpha.17...v0.28.0-alpha.18)

‎generate/input/descriptor.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3981,6 +3981,9 @@
39813981
"git_stash_apply_options_init": {
39823982
"ignore": true
39833983
},
3984+
"git_stash_save_options_init": {
3985+
"ignore": true
3986+
},
39843987
"git_stash_drop": {
39853988
"isAsync": true,
39863989
"return": {

‎generate/input/libgit2-supplement.json

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,70 @@
10131013
"type": "int"
10141014
},
10151015
"group": "status_list"
1016+
},
1017+
"git_stash_save_options_init": {
1018+
"file": "git2/stash.h",
1019+
"args": [
1020+
{
1021+
"name": "opts",
1022+
"type": "git_stash_save_options *"
1023+
},
1024+
{
1025+
"name": "version",
1026+
"type": "unsigned int"
1027+
}
1028+
],
1029+
"return": {
1030+
"type": "int"
1031+
},
1032+
"group": "stash"
1033+
},
1034+
"git_stash_save_with_opts": {
1035+
"file": "git2/stash.h",
1036+
"args": [
1037+
{
1038+
"name": "out",
1039+
"type": "git_oid *"
1040+
},
1041+
{
1042+
"name": "repo",
1043+
"type": "git_repository *"
1044+
},
1045+
{
1046+
"name": "opts",
1047+
"type": "git_stash_save_options *"
1048+
}
1049+
],
1050+
"return": {
1051+
"type": "int"
1052+
},
1053+
"group": "stash"
1054+
},
1055+
"git_tree_get_all_filepaths": {
1056+
"args": [
1057+
{
1058+
"name": "tree",
1059+
"type": "git_tree *"
1060+
},
1061+
{
1062+
"name": "repo",
1063+
"type": "git_repository *"
1064+
},
1065+
{
1066+
"name": "out",
1067+
"type": "std::vector<std::string> *"
1068+
}
1069+
],
1070+
"type": "function",
1071+
"isManual": true,
1072+
"cFile": "generate/templates/manual/tree/get_all_filepaths.cc",
1073+
"isAsync": true,
1074+
"isPrototypeMethod": true,
1075+
"group": "tree",
1076+
"return": {
1077+
"type": "int",
1078+
"isErrorCode": true
1079+
}
10161080
}
10171081
},
10181082
"groups": [
@@ -1214,6 +1278,13 @@
12141278
"git_revwalk_file_history_walk"
12151279
]
12161280
],
1281+
[
1282+
"stash",
1283+
[
1284+
"git_stash_save_options_init",
1285+
"git_stash_save_with_opts"
1286+
]
1287+
],
12171288
[
12181289
"status_list",
12191290
[
@@ -1223,6 +1294,12 @@
12231294
"git_status_list_new"
12241295
]
12251296
],
1297+
[
1298+
"tree",
1299+
[
1300+
"git_tree_get_all_filepaths"
1301+
]
1302+
],
12261303
[
12271304
"tree_entry",
12281305
[
@@ -1822,6 +1899,73 @@
18221899
}
18231900
}
18241901
],
1902+
[
1903+
"git_stash_flags",
1904+
{
1905+
"type": "enum",
1906+
"fields": [
1907+
{
1908+
"type": "unsigned int",
1909+
"name": "GIT_STASH_DEFAULT",
1910+
"value": 0
1911+
},
1912+
{
1913+
"type": "unsigned int",
1914+
"name": "GIT_STASH_KEEP_INDEX",
1915+
"value": 1
1916+
},
1917+
{
1918+
"type": "unsigned int",
1919+
"name": "GIT_STASH_INCLUDE_UNTRACKED",
1920+
"value": 2
1921+
},
1922+
{
1923+
"type": "unsigned int",
1924+
"name": "GIT_STASH_INCLUDE_IGNORED",
1925+
"value": 4
1926+
},
1927+
{
1928+
"type": "unsigned int",
1929+
"name": "GIT_STASH_KEEP_ALL",
1930+
"value": 8
1931+
}
1932+
]
1933+
}
1934+
],
1935+
[
1936+
"git_stash_save_options",
1937+
{
1938+
"type": "struct",
1939+
"fields": [
1940+
{
1941+
"type": "unsigned int",
1942+
"name": "version"
1943+
},
1944+
{
1945+
"type": "const git_signature *",
1946+
"name": "stasher"
1947+
},
1948+
{
1949+
"type": "const char *",
1950+
"name": "message"
1951+
},
1952+
{
1953+
"type": "uint32_t",
1954+
"name": "flags"
1955+
},
1956+
{
1957+
"type": "git_strarray",
1958+
"name": "paths"
1959+
}
1960+
],
1961+
"used": {
1962+
"needs": [
1963+
"git_stash_save_with_opts",
1964+
"git_stash_save_options_init"
1965+
]
1966+
}
1967+
}
1968+
],
18251969
[
18261970
"git_status_options",
18271971
{

‎generate/templates/manual/src/convenient_hunk.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void ConvenientHunk::InitializeComponent(Local<v8::Object> target, nodegit::Cont
3939
Local<External> nodegitExternal = Nan::New<External>(nodegitContext);
4040
Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction, nodegitExternal);
4141

42-
tpl->InstanceTemplate()->SetInternalFieldCount(1);
42+
tpl->InstanceTemplate()->SetInternalFieldCount(2);
4343
tpl->SetClassName(Nan::New("ConvenientHunk").ToLocalChecked());
4444

4545
Nan::SetPrototypeMethod(tpl, "size", Size, nodegitExternal);

‎generate/templates/manual/src/convenient_patch.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void ConvenientPatch::InitializeComponent(Local<v8::Object> target, nodegit::Con
136136
Local<External> nodegitExternal = Nan::New<External>(nodegitContext);
137137
Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction, nodegitExternal);
138138

139-
tpl->InstanceTemplate()->SetInternalFieldCount(1);
139+
tpl->InstanceTemplate()->SetInternalFieldCount(2);
140140
tpl->SetClassName(Nan::New("ConvenientPatch").ToLocalChecked());
141141

142142
Nan::SetPrototypeMethod(tpl, "hunks", Hunks, nodegitExternal);

‎generate/templates/manual/src/promise_completion.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ void PromiseCompletion::InitializeComponent(nodegit::Context *nodegitContext) {
66
Nan::HandleScope scope;
77
v8::Local<v8::Value> nodegitExternal = Nan::New<v8::External>(nodegitContext);
88
v8::Local<v8::FunctionTemplate> newTemplate = Nan::New<v8::FunctionTemplate>(New, nodegitExternal);
9-
newTemplate->InstanceTemplate()->SetInternalFieldCount(1);
9+
newTemplate->InstanceTemplate()->SetInternalFieldCount(2);
1010

1111
nodegitContext->SaveToPersistent(
1212
"PromiseCompletion::Template",

‎generate/templates/manual/src/wrapper.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void Wrapper::InitializeComponent(Local<v8::Object> target, nodegit::Context *no
2222
Local<External> nodegitExternal = Nan::New<External>(nodegitContext);
2323
Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(JSNewFunction, nodegitExternal);
2424

25-
tpl->InstanceTemplate()->SetInternalFieldCount(1);
25+
tpl->InstanceTemplate()->SetInternalFieldCount(2);
2626
tpl->SetClassName(Nan::New("Wrapper").ToLocalChecked());
2727

2828
Nan::SetPrototypeMethod(tpl, "toBuffer", ToBuffer, nodegitExternal);

0 commit comments

Comments
 (0)