From 43abf37dfeba40f7b95c65be6bf261f7e447f641 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 31 Oct 2017 19:58:59 -0700
Subject: git: Update to 2.15.0

---
 pkg/git/.gitignore | 2 +-
 pkg/git/config.h   | 4 +---
 pkg/git/gen.lua    | 4 ++++
 pkg/git/man.txt    | 2 +-
 pkg/git/rev        | 2 +-
 pkg/git/sha256     | 2 +-
 pkg/git/src        | 2 +-
 pkg/git/url        | 2 +-
 8 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'pkg/git')

diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore
index b599c08c..8f66d9a1 100644
--- a/pkg/git/.gitignore
+++ b/pkg/git/.gitignore
@@ -1,3 +1,3 @@
-/git-manpages-2.14.3.tar.xz
+/git-manpages-2.15.0.tar.xz
 /man
 /man.ninja
diff --git a/pkg/git/config.h b/pkg/git/config.h
index d5e07f0a..991c5bcd 100644
--- a/pkg/git/config.h
+++ b/pkg/git/config.h
@@ -9,7 +9,7 @@
 #define GIT_LOCALE_PATH "/share/locale"
 #define GIT_MAN_PATH "share/man"
 #define GIT_USER_AGENT "git/" GIT_VERSION
-#define GIT_VERSION "2.14.3"
+#define GIT_VERSION "2.15.0"
 #define PAGER_ENV "LESS=FRX LV=-c"
 #define NO_SYS_POLL_H
 #define NO_OPENSSL
@@ -19,6 +19,4 @@
 #define SHA1DC_NO_STANDARD_INCLUDES
 #define SHA1DC_INIT_SAFE_HASH_DEFAULT 0
 #define SHA1DC_CUSTOM_INCLUDE_SHA1_C "cache.h"
-#define SHA1DC_CUSTOM_TRAILING_INCLUDE_SHA1_C "sha1dc_git.c"
-#define SHA1DC_CUSTOM_TRAILING_INCLUDE_SHA1_H "sha1dc_git.h"
 #define SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C "git-compat-util.h"
diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua
index 03341f53..d80a3a1d 100644
--- a/pkg/git/gen.lua
+++ b/pkg/git/gen.lua
@@ -108,7 +108,9 @@ lib('libgit.a', [[
 	notes-utils.c
 	notes.c
 	object.c
+	oidmap.c
 	oidset.c
+	packfile.c
 	pack-bitmap-write.c
 	pack-bitmap.c
 	pack-check.c
@@ -136,6 +138,7 @@ lib('libgit.a', [[
 	refs.c
 	refs/files-backend.c
 	refs/iterator.c
+	refs/packed-backend.c
 	refs/ref-cache.c
 	remote.c
 	replace_object.c
@@ -192,6 +195,7 @@ lib('libgit.a', [[
 	xdiff-interface.c
 	zlib.c
 
+	sha1dc_git.c
 	sha1dc/sha1.c
 	sha1dc/ubc_check.c
 
diff --git a/pkg/git/man.txt b/pkg/git/man.txt
index 3cf62c21..85174bfd 100644
--- a/pkg/git/man.txt
+++ b/pkg/git/man.txt
@@ -1,4 +1,4 @@
-# 2,<xzcat git-manpages-2.14.3.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
+# 2,<xzcat git-manpages-2.15.0.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort
 man1/git-add.1
 man1/git-am.1
 man1/git-annotate.1
diff --git a/pkg/git/rev b/pkg/git/rev
index 40994076..a45fd52c 100644
--- a/pkg/git/rev
+++ b/pkg/git/rev
@@ -1 +1 @@
-23
+24
diff --git a/pkg/git/sha256 b/pkg/git/sha256
index e613626e..234383cb 100644
--- a/pkg/git/sha256
+++ b/pkg/git/sha256
@@ -1 +1 @@
-5b0e3d93bafd539046b67778db0b5d627fe08ee5ef1be8b5b924517ed141b001  git-manpages-2.14.3.tar.xz
+22ad09441490f77bca781168fc66fd6576f0175407c5a95c1cdc96dfd3731c77  git-manpages-2.15.0.tar.xz
diff --git a/pkg/git/src b/pkg/git/src
index fc849d8d..cb5918aa 160000
--- a/pkg/git/src
+++ b/pkg/git/src
@@ -1 +1 @@
-Subproject commit fc849d8d6b90e5c1e0c37bc0d60dd92b2fe7347f
+Subproject commit cb5918aa0d50f50e83787f65c2ddc3dcb10159fe
diff --git a/pkg/git/url b/pkg/git/url
index 2fc68d17..363a604d 100644
--- a/pkg/git/url
+++ b/pkg/git/url
@@ -1 +1 @@
-url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.14.3.tar.xz"
+url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.15.0.tar.xz"
-- 
cgit v1.2.3