Skip to content

Commit 6182e14

Browse files
rcjsuenrcjsuen
committed
Merge branch 'master' into errno
Merge in the latest changes and resolved a conflict by explicitly referencing the v8 namespace when using Local types.
2 parents 8f91110 + 37f62ca commit 6182e14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2077
-840
lines changed

‎CHANGELOG.md‎

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

3+
## <a name="v0-17-0" href="#v0-17-0">v0.17.0</a> [(2017-01-06)](https://github.com/nodegit/nodegit/releases/tag/v0.17.0)
4+
5+
[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.16.0...v0.17.0)
6+
7+
### Targeted Platform Changes
8+
9+
In this release we had added support for Node v7 and latest Electron. We have removed support for Node v0.12 and v5.
10+
11+
We are also deprecating nw.js support since it is currently broken, no one in the current team uses it and we would not be able to currently support nw.js in an effective manner with a good user experience.
12+
13+
### Now building against shared libcurl lib
14+
15+
For proxy support we now use libcurl for HTTP/HTTPS transport which should have no noticeable change in NodeGit remote operations but if changes are noticed this is worth mentioning as a potential source.
16+
17+
### Memory leak fixes and stability increases
18+
19+
Many PR's were made to fix memory leaks as they were found so memory usage should go down in this version for long running scripts. Additionally, when performing operations with callbacks (transfer progress, credentials, etc...) there was a small chance for a segfault when NodeGit would schedule the callback to go into JavaScript. This is now fixed.
20+
21+
### Fixes to the build
22+
23+
Many users, especially on windows, were experiencing errors during the build. The build still isn't perfect but a lot of the bugs were fixed.
24+
25+
### Bump libgit2 to 0bf0526
26+
27+
The majority of changes to NodeGit v17 were in libgit2. The API breaking changes that are known are:
28+
29+
- `RevWalk` is returning different results [libgit2 PR #3921](https://github.com/libgit2/libgit2/pull/3921)
30+
- Changes in error messages returned [libgit2 PR #4049](https://github.com/libgit2/libgit2/pull/4049)
31+
32+
Summary of changes that were brought in:
33+
34+
https://github.com/nodegit/nodegit/pull/1187#issuecomment-277760323
35+
36+
### Changes to NodeGit outside of libgit2 bump
37+
38+
- Define GIT_SSH_MEMORY_CREDENTIALS for libgit2 [PR #949](https://github.com/nodegit/nodegit/pull/949)
39+
- Add "Path" to ssh variable names in tests for clarity [PR #1135](https://github.com/nodegit/nodegit/pull/1135)
40+
- Fix revwalk memory leaks [PR #1137](https://github.com/nodegit/nodegit/pull/1137)
41+
- Fix tree entry leaks [PR #1138](https://github.com/nodegit/nodegit/pull/1138)
42+
- Fix typo in postinstall script [PR #1141](https://github.com/nodegit/nodegit/pull/1141)
43+
- Fix windows exception handling in build [PR #1143](https://github.com/nodegit/nodegit/pull/1143)
44+
- Fix CI failures on node 0.12 [PR #1144](https://github.com/nodegit/nodegit/pull/1144)
45+
- Fix postinstall script crash when install location has spaces in its path [PR #1148](https://github.com/nodegit/nodegit/pull/1148)
46+
- Update 0.13 changelog [PR #1151](https://github.com/nodegit/nodegit/pull/1151)
47+
- Minor documentation fix in Checkout.index [PR #1164](https://github.com/nodegit/nodegit/pull/1164)
48+
- FreeBSD also uses struct timespec st_mtim [PR #1165](https://github.com/nodegit/nodegit/pull/1165)
49+
- README.md needs to show where to get Slack invitation [PR #1170](https://github.com/nodegit/nodegit/pull/1170)
50+
- Add @async tag to `Tree#getEntry` [PR #1178](https://github.com/nodegit/nodegit/pull/1178)
51+
- Fix incorrect anchor link in TESTING.md [PR #1179](https://github.com/nodegit/nodegit/pull/1179)
52+
- Added tests for Tag [PR #1180](https://github.com/nodegit/nodegit/pull/1180)
53+
- Added tests for Branch [PR #1181](https://github.com/nodegit/nodegit/pull/1181)
54+
- Escape the spaces in dir for shell command [PR #1186](https://github.com/nodegit/nodegit/pull/1186)
55+
- Bump libgit to 0bf0526 [PR #1187](https://github.com/nodegit/nodegit/pull/1187)
56+
- Checkout's tree* functions do not support Oid as a parameter [PR #1190](https://github.com/nodegit/nodegit/pull/1190)
57+
- Build against shared library for libcurl [PR #1195](https://github.com/nodegit/nodegit/pull/1195)
58+
- Move libuv calls to correct thread [PR #1197](https://github.com/nodegit/nodegit/pull/1197)
59+
- Update `Repository#createBranch` docs [PR #1198](https://github.com/nodegit/nodegit/pull/1198)
60+
- Remove Node v0.12 and v5 [PR #1199](https://github.com/nodegit/nodegit/pull/1199)
61+
- Specify acceptable types for `lookup` and `dwim` in Reference [PR #1203](https://github.com/nodegit/nodegit/pull/1203)
62+
- Build for Node 7.4.0 [PR #1204](https://github.com/nodegit/nodegit/pull/1204)
63+
- Write the index to a repository directly in merge-cleanly.js examples [PR #1205](https://github.com/nodegit/nodegit/pull/1205)
64+
65+
## <a name="v0-16-0" href="#v0-16-0">v0.16.0</a> [(2016-09-15)](https://github.com/nodegit/nodegit/releases/tag/v0.16.0)
66+
67+
[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.15.1...v0.16.0)
68+
69+
- Bump libssh2 to 1.7.0 [PR #1071](https://github.com/nodegit/nodegit/pull1071)
70+
- Js cleanup [PR #1074](https://github.com/nodegit/nodegit/pull1074)
71+
- Expose merge options and diff flags [PR #1076](https://github.com/nodegit/nodegit/pull1076)
72+
- Fix Tree#entryByName function and add test [PR #1079](https://github.com/nodegit/nodegit/pull1079)
73+
- Add isSubmodule() method [PR #1080](https://github.com/nodegit/nodegit/pull1080)
74+
- Fix two typos in the documentation for Commit#parents [PR #1081](https://github.com/nodegit/nodegit/pull1081)
75+
- Memory management: duplicate time [PR #1090](https://github.com/nodegit/nodegit/pull1090)
76+
- Preempt nan to fix deprecated calls to Get/SetHiddenValue [PR #1106](https://github.com/nodegit/nodegit/pull1106)
77+
- Try re-enabling node >6.2 [PR #1107](https://github.com/nodegit/nodegit/pull1107)
78+
- Bump openssl to 1.0.2h (same as node 6.3.1) [PR #1108](https://github.com/nodegit/nodegit/pull1108)
79+
- Don't run postbuild when we detect electron install [PR #1111](https://github.com/nodegit/nodegit/pull1111)
80+
- Added instructions for CircleCI users [PR #1113](https://github.com/nodegit/nodegit/pull1113)
81+
- Fix up electron and nw.js docs [PR #1114](https://github.com/nodegit/nodegit/pull1114)
82+
- Patch libssh2 to work with vs2015 [PR #1125](https://github.com/nodegit/nodegit/pull1125)
83+
- Fix CI [PR #1126](https://github.com/nodegit/nodegit/pull1126)
84+
85+
386
## <a name="v0-15-1" href="#v0-15-1">v0.15.1</a> [(2016-06-20)](https://github.com/nodegit/nodegit/releases/tag/v0.15.1)
487

588
[Full Changelog](https://github.com/nodegit/nodegit/compare/v0.15.0...v0.15.1)

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ Contribution Guidelines
66
We try to be available pretty often to help when problems come up. We like to split incoming questions
77
into two categories: potential bugs/features, and questions. If you want a feature added, or think you've found a bug
88
in the code (or in the examples), search the [issue tracker](https://github.com/nodegit/nodegit/issues) and if you dont
9-
find anything, file a new issue. If you just have questions, instead of using issues, contact us in our [Gitter room](https://gitter.im/nodegit/nodegit).
9+
find anything, file a new issue. If you just have questions, instead of using issues, [sign up](http://slack.libgit2.org/)
10+
to libgit2's Slack instance and then contact us in the [#nodegit channel](https://libgit2.slack.com/messages/nodegit/).
1011

1112
## How to Help ##
1213

@@ -21,7 +22,7 @@ These are all good easy ways to start getting involved with the project. You can
2122
and see if you can help with any existing issues. Please comment with your intention and any questions before getting
2223
started; duplicating work or doing something that would be rejected always sucks.
2324

24-
Additionally, [the documentation](http://www.nodegit.org) needs some love. Get in touch with one of us on Gitter if
25+
Additionally, [the documentation](http://www.nodegit.org) needs some love. Get in touch with one of us on Slack if
2526
you'd like to lend a hand with that.
2627

27-
For anything else, Gitter is probably the best way to get in touch as well. Happy coding, merge you soon!
28+
For anything else, Slack is probably the best way to get in touch as well. Happy coding, merge you soon!

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ NodeGit
3131
</tbody>
3232
</table>
3333

34-
**Stable (libgit2#master): 0.16.0**
34+
**Stable (libgit2#master): 0.17.0**
3535
**Stable (libgit2@0.24): 0.14.1**
3636

3737
## Have a problem? Come chat with us! ##

‎generate/input/descriptor.json‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,6 +1805,9 @@
18051805
}
18061806
},
18071807
"remote": {
1808+
"dependencies": [
1809+
"../include/remote_head.h"
1810+
],
18081811
"cType": "git_remote",
18091812
"selfFreeing": true,
18101813
"functions": {
@@ -1970,7 +1973,11 @@
19701973
}
19711974
},
19721975
"remote_head": {
1973-
"ignore": true
1976+
"dependencies": [
1977+
"../include/functions/free.h"
1978+
],
1979+
"freeFunctionName": "git_remote_head_free",
1980+
"selfFreeing": true
19741981
},
19751982
"repository": {
19761983
"dependencies": [
@@ -2044,6 +2051,11 @@
20442051
"functions": {
20452052
"git_revert": {
20462053
"isAsync": true,
2054+
"args": {
2055+
"given_opts": {
2056+
"isOptional": true
2057+
}
2058+
},
20472059
"return": {
20482060
"isErrorCode": true
20492061
}
@@ -2175,6 +2187,11 @@
21752187
}
21762188
},
21772189
"git_stash_save": {
2190+
"args": {
2191+
"message": {
2192+
"isOptional": true
2193+
}
2194+
},
21782195
"isAsync": true,
21792196
"return": {
21802197
"isErrorCode": true
@@ -2456,7 +2473,11 @@
24562473
}
24572474
},
24582475
"time": {
2459-
"dupFunction": "git_time_dup"
2476+
"dupFunction": "git_time_dup",
2477+
"dependencies": [
2478+
"git2/sys/time.h"
2479+
]
2480+
24602481
},
24612482
"trace": {
24622483
"functions": {

0 commit comments

Comments
 (0)