From 26891c80bb9d2ba82562f0f64de6f94c6121b242 Mon Sep 17 00:00:00 2001 From: John Haley Date: Thu, 20 Apr 2017 06:14:14 -0700 Subject: [PATCH 1/8] Bump libgit2 to 9e76f2c7 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index 12f0b704d..9e76f2c72 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 12f0b704d2d3269db5bc6d95f098aea3eb645f63 +Subproject commit 9e76f2c72bb562aba6f72b95216bc4e885a46551 From 6de942bb354cbb3086f6c67ce7ba2f5a8ad84c87 Mon Sep 17 00:00:00 2001 From: John Haley Date: Thu, 20 Apr 2017 07:30:39 -0700 Subject: [PATCH 2/8] Added files to include block in libgit2.gyp and sorted said block --- vendor/libgit2.gyp | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index a49fa60de..316a0f3c1 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -31,11 +31,12 @@ "libgit2/include/git2/sys/hashsig.h", "libgit2/include/git2/sys/merge.h", "libgit2/include/git2/sys/time.h", + "libgit2/include/git2/worktree.h", "libgit2/src/annotated_commit.c", "libgit2/src/annotated_commit.h", - "libgit2/src/array.h", "libgit2/src/apply.c", "libgit2/src/apply.h", + "libgit2/src/array.h", "libgit2/src/attr_file.c", "libgit2/src/attr_file.h", "libgit2/src/attr.c", @@ -74,9 +75,9 @@ "libgit2/src/config_file.h", "libgit2/src/config.c", "libgit2/src/config.h", + "libgit2/src/crlf.c", "libgit2/src/curl_stream.c", "libgit2/src/curl_stream.h", - "libgit2/src/crlf.c", "libgit2/src/date.c", "libgit2/src/delta.c", "libgit2/src/delta.h", @@ -114,21 +115,32 @@ "libgit2/src/graph.c", "libgit2/src/hash.c", "libgit2/src/hash.h", + "libgit2/src/hash/hash_collisiondetect.h", + "libgit2/src/hash/hash_common_crypto.h", + "libgit2/src/hash/hash_generic.c", + "libgit2/src/hash/hash_generic.h", + "libgit2/src/hash/hash_openssl.h", + "libgit2/src/hash/sha1dc/sha1.c", + "libgit2/src/hash/sha1dc/sha1.h", + "libgit2/src/hash/sha1dc/ubc_check.c", + "libgit2/src/hash/sha1dc/ubc_check.h", "libgit2/src/hashsig.c", "libgit2/src/ident.c", + "libgit2/src/idxmap.c", "libgit2/src/ignore.c", "libgit2/src/ignore.h", "libgit2/src/index.c", "libgit2/src/index.h", "libgit2/src/indexer.c", + "libgit2/src/indexer.h", "libgit2/src/iterator.c", "libgit2/src/iterator.h", "libgit2/src/khash.h", "libgit2/src/map.h", + "libgit2/src/merge_driver.c", "libgit2/src/merge_file.c", "libgit2/src/merge_file.h", "libgit2/src/merge.c", - "libgit2/src/merge_driver.c", "libgit2/src/merge.h", "libgit2/src/message.c", "libgit2/src/message.h", @@ -146,11 +158,13 @@ "libgit2/src/odb_pack.c", "libgit2/src/odb.c", "libgit2/src/odb.h", + "libgit2/src/offmap.c", "libgit2/src/offmap.h", "libgit2/src/oid.c", "libgit2/src/oid.h", "libgit2/src/oidarray.c", "libgit2/src/oidarray.h", + "libgit2/src/oidmap.c", "libgit2/src/oidmap.h", "libgit2/src/openssl_stream.c", "libgit2/src/openssl_stream.h", @@ -158,14 +172,14 @@ "libgit2/src/pack-objects.h", "libgit2/src/pack.c", "libgit2/src/pack.h", - "libgit2/src/path.c", - "libgit2/src/path.h", - "libgit2/src/patch.c", - "libgit2/src/patch.h", "libgit2/src/patch_generate.c", "libgit2/src/patch_generate.h", "libgit2/src/patch_parse.c", "libgit2/src/patch_parse.h", + "libgit2/src/patch.c", + "libgit2/src/patch.h", + "libgit2/src/path.c", + "libgit2/src/path.h", "libgit2/src/pathspec.c", "libgit2/src/pathspec.h", "libgit2/src/pool.c", @@ -249,6 +263,8 @@ "libgit2/src/varint.h", "libgit2/src/vector.c", "libgit2/src/vector.h", + "libgit2/src/worktree.c", + "libgit2/src/worktree.h", "libgit2/src/xdiff/xdiff.h", "libgit2/src/xdiff/xdiffi.c", "libgit2/src/xdiff/xdiffi.h", From 6717731f5a3812d2f28542db9bde421409efbb05 Mon Sep 17 00:00:00 2001 From: John Haley Date: Thu, 20 Apr 2017 09:26:53 -0700 Subject: [PATCH 3/8] Don't include openssl on windows --- vendor/libgit2.gyp | 1 - 1 file changed, 1 deletion(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index 316a0f3c1..8eeea27a2 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -119,7 +119,6 @@ "libgit2/src/hash/hash_common_crypto.h", "libgit2/src/hash/hash_generic.c", "libgit2/src/hash/hash_generic.h", - "libgit2/src/hash/hash_openssl.h", "libgit2/src/hash/sha1dc/sha1.c", "libgit2/src/hash/sha1dc/sha1.h", "libgit2/src/hash/sha1dc/ubc_check.c", From 531110e8f903715358d84767fd92a8c6c122d58d Mon Sep 17 00:00:00 2001 From: John Haley Date: Thu, 20 Apr 2017 09:34:14 -0700 Subject: [PATCH 4/8] Let's try to fix windows! --- vendor/libgit2.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index 8eeea27a2..21d7b6f32 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -117,8 +117,6 @@ "libgit2/src/hash.h", "libgit2/src/hash/hash_collisiondetect.h", "libgit2/src/hash/hash_common_crypto.h", - "libgit2/src/hash/hash_generic.c", - "libgit2/src/hash/hash_generic.h", "libgit2/src/hash/sha1dc/sha1.c", "libgit2/src/hash/sha1dc/sha1.h", "libgit2/src/hash/sha1dc/ubc_check.c", From 96ebbbd15e2773e8d92d0a738bffba4fc0e8228a Mon Sep 17 00:00:00 2001 From: John Haley Date: Thu, 20 Apr 2017 09:44:11 -0700 Subject: [PATCH 5/8] Update `WIN32_SHA1` to `GIT_SHA1_WIN32` --- vendor/libgit2.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index 21d7b6f32..5600acda9 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -331,7 +331,7 @@ ["OS=='win'", { "defines": [ "GIT_WINHTTP", - "WIN32_SHA1" + "GIT_SHA1_WIN32" ], "msvs_settings": { "VCLinkerTool": { From c85384d93bf8742d77b3603cfc6d9993c7427dc6 Mon Sep 17 00:00:00 2001 From: John Haley Date: Thu, 20 Apr 2017 09:56:32 -0700 Subject: [PATCH 6/8] Cleaning up the gyp file while we're here --- vendor/libgit2.gyp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index 5600acda9..ab11686ba 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -288,9 +288,7 @@ ], "sources": [ "libgit2/src/stransport_stream.c", - "libgit2/src/stransport_stream.h", - "libgit2/src/tls_stream.c", - "libgit2/src/tls_stream.h" + "libgit2/src/stransport_stream.h" ], "link_settings": { "xcode_settings": { @@ -307,10 +305,12 @@ ], "defines": [ "GIT_CURL", - "OPENSSL_SHA1" + "GIT_SHA1_OPENSSL" ], "sources": [ - "libgit2/src/hash/hash_openssl.h" + "libgit2/src/hash/hash_openssl.h", + "libgit2/src/tls_stream.c", + "libgit2/src/tls_stream.h" ] }], ["OS=='linux' or OS.endswith('bsd')" , { @@ -320,12 +320,7 @@ "-w", ], "defines": [ - "GIT_OPENSSL", "GIT_USE_STAT_MTIM" - ], - "sources": [ - "libgit2/src/tls_stream.c", - "libgit2/src/tls_stream.h" ] }], ["OS=='win'", { From 6cff1a7d92db6fe9e6c9b1c4c565ab1d4485a9e9 Mon Sep 17 00:00:00 2001 From: John Haley Date: Thu, 20 Apr 2017 09:59:24 -0700 Subject: [PATCH 7/8] More gyp file cleanup! --- vendor/libgit2.gyp | 2 -- 1 file changed, 2 deletions(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index ab11686ba..7a066c1cc 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -115,8 +115,6 @@ "libgit2/src/graph.c", "libgit2/src/hash.c", "libgit2/src/hash.h", - "libgit2/src/hash/hash_collisiondetect.h", - "libgit2/src/hash/hash_common_crypto.h", "libgit2/src/hash/sha1dc/sha1.c", "libgit2/src/hash/sha1dc/sha1.h", "libgit2/src/hash/sha1dc/ubc_check.c", From 22cec451c82a57e08d3ef5f2e7290f893d1747a4 Mon Sep 17 00:00:00 2001 From: John Haley Date: Thu, 20 Apr 2017 10:11:16 -0700 Subject: [PATCH 8/8] Whoops --- vendor/libgit2.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index 7a066c1cc..f00470f99 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -318,6 +318,7 @@ "-w", ], "defines": [ + "GIT_OPENSSL", "GIT_USE_STAT_MTIM" ] }],