Skip to content

Commit 4aa7452

Browse files
authored
Merge pull request #1690 from implausible/bump/libgit2
Bump libgit2 to fork of latest master
2 parents 661b322 + 6f665bc commit 4aa7452

File tree

9 files changed

+3510
-7234
lines changed

9 files changed

+3510
-7234
lines changed

README.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,17 @@ In Ubuntu:
7676
sudo apt-get install libssl-dev
7777
```
7878

79-
Additionally, you need `curl-config` on your system. You need one of these packages:
80-
* libcurl4-gnutls-dev
81-
* libcurl4-nss-dev
82-
* libcurl4-openssl-dev
79+
You will need the following libraries installed on your linux machine:
80+
- libpcre
81+
- libpcreposix
82+
- libkrb5
83+
- libk5crypto
84+
- libcom_err
85+
86+
When building locally, you will also need development packages for kerberos and pcre, so both of these utilities must be present on your machine:
87+
- pcre-config
88+
- krb5-config
89+
8390

8491
If you are still encountering problems while installing, you should try the
8592
[Building from source](http://www.nodegit.org/guides/install/from-source/)

generate/input/callbacks.json

Lines changed: 52 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,25 @@
476476
"error": -1
477477
}
478478
},
479+
"git_indexer_progress_cb": {
480+
"args": [
481+
{
482+
"name": "stats",
483+
"cType": "const git_indexer_progress *"
484+
},
485+
{
486+
"name": "payload",
487+
"cType": "void *"
488+
}
489+
],
490+
"return": {
491+
"type": "int",
492+
"noResults": 0,
493+
"success": 0,
494+
"error": -1,
495+
"throttle": 100
496+
}
497+
},
479498
"git_note_foreach_cb": {
480499
"args": [
481500
{
@@ -532,6 +551,28 @@
532551
"error": -1
533552
}
534553
},
554+
"git_push_update_reference_cb": {
555+
"args": [
556+
{
557+
"name": "refname",
558+
"cType": "const char *"
559+
},
560+
{
561+
"name": "status",
562+
"cType": "const char *"
563+
},
564+
{
565+
"name": "data",
566+
"cType": "void *"
567+
}
568+
],
569+
"return": {
570+
"type": "int",
571+
"noResults": 1,
572+
"success": 0,
573+
"error": -1
574+
}
575+
},
535576
"git_remote_create_cb": {
536577
"args": [
537578
{
@@ -692,29 +733,6 @@
692733
"error": -1
693734
}
694735
},
695-
"git_smart_subtransport_cb": {
696-
"args": [
697-
{
698-
"name": "out",
699-
"cType": "git_smart_subtransport **",
700-
"isReturn": true
701-
},
702-
{
703-
"name": "owner",
704-
"cType": "git_transport*"
705-
},
706-
{
707-
"name": "param",
708-
"cType": "void *"
709-
}
710-
],
711-
"return": {
712-
"type": "int",
713-
"noResults": 0,
714-
"success": 0,
715-
"error": -1
716-
}
717-
},
718736
"git_stash_apply_progress_cb": {
719737
"args": [
720738
{
@@ -826,26 +844,7 @@
826844
"error": -1
827845
}
828846
},
829-
"git_transfer_progress_cb": {
830-
"args": [
831-
{
832-
"name": "stats",
833-
"cType": "const git_transfer_progress *"
834-
},
835-
{
836-
"name": "payload",
837-
"cType": "void *"
838-
}
839-
],
840-
"return": {
841-
"type": "int",
842-
"noResults": 0,
843-
"success": 0,
844-
"error": -1,
845-
"throttle": 100
846-
}
847-
},
848-
"git_push_transfer_progress": {
847+
"git_push_transfer_progress_cb": {
849848
"args": [
850849
{
851850
"name": "current",
@@ -983,24 +982,28 @@
983982
"error": -1
984983
}
985984
},
986-
"git_push_update_reference_cb": {
985+
"git_url_resolve_cb": {
987986
"args": [
988987
{
989-
"name": "refname",
990-
"cType": "const char *"
988+
"name": "url_resolved",
989+
"cType": "git_buf *"
991990
},
992991
{
993-
"name": "status",
992+
"name": "url",
994993
"cType": "const char *"
995994
},
996995
{
997-
"name": "data",
996+
"name": "direction",
997+
"cType": "int"
998+
},
999+
{
1000+
"name": "payload",
9981001
"cType": "void *"
9991002
}
10001003
],
10011004
"return": {
10021005
"type": "int",
1003-
"noResults": 1,
1006+
"noResults": -30,
10041007
"success": 0,
10051008
"error": -1
10061009
}

0 commit comments

Comments
 (0)