From 2e7c021307a70c78b5ccfa43cf8d9a63bfa57735 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 3 Dec 2016 01:19:48 -0800
Subject: git: Update to 2.11.0

---
 core/git/config.h                                                 | 2 +-
 core/git/gen.rc                                                   | 2 ++
 .../0001-Drop-dashes-from-builtin-invocations-in-scripts.patch    | 8 ++++----
 core/git/rev                                                      | 2 +-
 core/git/src                                                      | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'core/git')

diff --git a/core/git/config.h b/core/git/config.h
index 136eca12..47cb9d5b 100644
--- a/core/git/config.h
+++ b/core/git/config.h
@@ -7,7 +7,7 @@
 #define GIT_LOCALE_PATH "/share/locale"
 #define GIT_MAN_PATH "share/man"
 #define GIT_USER_AGENT "git/" GIT_VERSION
-#define GIT_VERSION "2.10.2"
+#define GIT_VERSION "2.11.0"
 #define NO_SYS_POLL_H
 #define PAGER_ENV "LESS=FRX LV=-c"
 #define SHA1_HEADER <openssl/sha.h>
diff --git a/core/git/gen.rc b/core/git/gen.rc
index 8cca8844..3fdcabef 100644
--- a/core/git/gen.rc
+++ b/core/git/gen.rc
@@ -22,6 +22,7 @@ lib libgit.a -d '$dir'/deps\
 	advice.c\
 	alias.c\
 	alloc.c\
+	apply.c\
 	archive-tar.c\
 	archive-zip.c\
 	archive.c\
@@ -155,6 +156,7 @@ lib libgit.a -d '$dir'/deps\
 	symlinks.c\
 	tag.c\
 	tempfile.c\
+	tmp-objdir.c\
 	trace.c\
 	trailer.c\
 	transport-helper.c\
diff --git a/core/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch b/core/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
index 3e4e3865..717f8b13 100644
--- a/core/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
+++ b/core/git/patch/0001-Drop-dashes-from-builtin-invocations-in-scripts.patch
@@ -1,4 +1,4 @@
-From 449ed800f543c7c1258a54b568cf4deb095954b2 Mon Sep 17 00:00:00 2001
+From b8d3b9e40f00194a25797f606aeebf946b38eba2 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 3 Dec 2016 00:41:41 -0800
 Subject: [PATCH] Drop dashes from builtin invocations in scripts
@@ -76,10 +76,10 @@ index d3c3998..dcfa271 100644
  GIT_DIR=$(git rev-parse -q --git-dir) || :;
  
 diff --git a/git-submodule.sh b/git-submodule.sh
-index b57f87d..1d25678 100755
+index a024a13..4aac71f 100755
 --- a/git-submodule.sh
 +++ b/git-submodule.sh
-@@ -838,7 +838,7 @@ cmd_summary() {
+@@ -843,7 +843,7 @@ cmd_summary() {
  				test $status != A && test $ignore_config = all && continue
  			fi
  			# Also show added or modified modules which are checked out
@@ -88,7 +88,7 @@ index b57f87d..1d25678 100755
  			printf '%s\n' "$sm_path"
  		done
  	)
-@@ -872,11 +872,11 @@ cmd_summary() {
+@@ -877,11 +877,11 @@ cmd_summary() {
  		missing_dst=
  
  		test $mod_src = 160000 &&
diff --git a/core/git/rev b/core/git/rev
index 7f8f011e..45a4fb75 100644
--- a/core/git/rev
+++ b/core/git/rev
@@ -1 +1 @@
-7
+8
diff --git a/core/git/src b/core/git/src
index ac84098b..454cb6bd 160000
--- a/core/git/src
+++ b/core/git/src
@@ -1 +1 @@
-Subproject commit ac84098b7e32406a982ac01cc76a663d5605224b
+Subproject commit 454cb6bd52a4de614a3633e4f547af03d5c3b640
-- 
cgit v1.2.3