From 3e3c72a36f396a0af5eddec6cf679e52e071d229 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 20 Jan 2018 22:58:10 +0100
Subject: [PATCH] git: Update from 2.15.1 to 2.16.0

---
 packages/git/build.sh       |  4 ++--
 packages/git/config.c.patch | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/git/build.sh b/packages/git/build.sh
index b5dc54636..61b4ccc4c 100755
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -2,8 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://git-scm.com/
 TERMUX_PKG_DESCRIPTION="Fast, scalable, distributed revision control system"
 # less is required as a pager for git log, and the busybox less does not handle used escape sequences.
 TERMUX_PKG_DEPENDS="libcurl, less, openssl"
-TERMUX_PKG_VERSION=2.15.1
-TERMUX_PKG_SHA256=999c90fd7d45066992cdb87dda35bdff6dfc1d01496118ea718dfb866da4045c
+TERMUX_PKG_VERSION=2.16.0
+TERMUX_PKG_SHA256=0d10764e66b3d650dee0d99a1c77afa4aaae5e739c0973fcc1c5b9e6516e30f8
 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
 ## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/git/config.c.patch b/packages/git/config.c.patch
index d6e31440d..9e98f8c6f 100644
--- a/packages/git/config.c.patch
+++ b/packages/git/config.c.patch
@@ -1,6 +1,6 @@
-diff -u -r ../git-2.14.3/config.c ./config.c
---- ../git-2.14.3/config.c	2017-10-23 08:03:35.000000000 +0200
-+++ ./config.c	2017-10-25 14:27:28.038111765 +0200
+diff -u -r ../git-2.16.0/config.c ./config.c
+--- ../git-2.16.0/config.c	2018-01-17 22:49:47.000000000 +0000
++++ ./config.c	2018-01-20 21:49:42.940523576 +0000
 @@ -73,6 +73,25 @@
  static int pack_compression_seen;
  static int zlib_compression_seen;
@@ -27,7 +27,7 @@ diff -u -r ../git-2.14.3/config.c ./config.c
  static int config_file_fgetc(struct config_source *conf)
  {
  	return getc_unlocked(conf->u.file);
-@@ -2535,9 +2554,13 @@
+@@ -2608,9 +2627,13 @@
  		in_fd = -1;
  
  		if (chmod(get_lock_file_path(&lock), st.st_mode & 07777) < 0) {
@@ -41,15 +41,15 @@ diff -u -r ../git-2.14.3/config.c ./config.c
  		}
  
  		if (store.seen == 0)
-@@ -2737,9 +2760,13 @@
+@@ -2810,9 +2833,13 @@
  	}
  
- 	if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
+ 	if (chmod(get_lock_file_path(&lock), st.st_mode & 07777) < 0) {
 +#ifdef __ANDROID__
 +		termux_warn_once_about_lockfile();
 +#else
  		ret = error_errno("chmod on %s failed",
- 				  get_lock_file_path(lock));
+ 				  get_lock_file_path(&lock));
  		goto out;
 +#endif
  	}