From 044894f130323d40e2472e85a880761e227be855 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Fri, 30 Sep 2016 00:37:31 -0700
Subject: git: Update to 2.10.0

---
 core/git/.rev       | 2 +-
 core/git/config.h   | 3 ++-
 core/git/gen.rc     | 6 +++++-
 core/git/sh_gen.sed | 3 ++-
 core/git/src        | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'core/git')

diff --git a/core/git/.rev b/core/git/.rev
index 00750edc..b8626c4c 100644
--- a/core/git/.rev
+++ b/core/git/.rev
@@ -1 +1 @@
-3
+4
diff --git a/core/git/config.h b/core/git/config.h
index 8ed426a1..a2c743b6 100644
--- a/core/git/config.h
+++ b/core/git/config.h
@@ -7,6 +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.9.3"
+#define GIT_VERSION "2.10.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 987d23ba..ac8d5d41 100644
--- a/core/git/gen.rc
+++ b/core/git/gen.rc
@@ -15,6 +15,7 @@ deps=(\
 )
 
 cc exec_cmd.c '||' $deps ; with cflags '$cflags ''-DPREFIX=""'''
+cc common-main.c '||' $deps
 
 # src/Makefile:/^LIB_OBJS.\+=
 lib libgit.a -d $"deps\
@@ -60,6 +61,7 @@ lib libgit.a -d $"deps\
 	diffcore-pickaxe.c\
 	diffcore-rename.c\
 	dir.c\
+	dir-iterator.c\
 	editor.c\
 	entry.c\
 	environment.c\
@@ -93,6 +95,7 @@ lib libgit.a -d $"deps\
 	merge-recursive.c\
 	merge.c\
 	mergesort.c\
+	mru.c\
 	name-hash.c\
 	notes-cache.c\
 	notes-merge.c\
@@ -125,6 +128,7 @@ lib libgit.a -d $"deps\
 	reflog-walk.c\
 	refs.c\
 	refs/files-backend.c\
+	refs/iterator.c\
 	remote.c\
 	replace_object.c\
 	rerere.c\
@@ -191,7 +195,7 @@ lib libxdiff.a xdiff/^(\
 )
 
 libs=(\
-	libgit.a libxdiff.a\
+	common-main.c.o libgit.a libxdiff.a\
 	'$builddir'/core/^(\
 		curl/libcurl.a\
 		libressl/^(libssl.a libcrypto.a)\
diff --git a/core/git/sh_gen.sed b/core/git/sh_gen.sed
index ceca9e25..ea0f0f21 100644
--- a/core/git/sh_gen.sed
+++ b/core/git/sh_gen.sed
@@ -6,4 +6,5 @@ s|@@USE_GETTEXT_SCHEME@@||g
 /^\# @@BROKEN_PATH_FIX@@$/d
 s|@@GITWEBDIR@@|/share/gitweb|g
 s|@@PERL@@|/bin/perl|g
-s|@@SANE_TEXT_GREP@@||g
\ No newline at end of file
+s|@@SANE_TEXT_GREP@@||g
+s|@@PAGER_ENV@@|LESS=FRX LV=-c|g
diff --git a/core/git/src b/core/git/src
index e0c1ceaf..6ebdac1b 160000
--- a/core/git/src
+++ b/core/git/src
@@ -1 +1 @@
-Subproject commit e0c1ceafc5bece92d35773a75fff59497e1d9bd5
+Subproject commit 6ebdac1bab966b720d776aa43ca188fe378b1f4b
-- 
cgit v1.2.3