X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/40c3588bd74ab27e1d3c1c5ca2f08733acfc0cf2..3ce9ffbc0d0c0a7d392e14621dce16f08772b948:/packages/git/config.c.patch

diff --git a/packages/git/config.c.patch b/packages/git/config.c.patch
index 7d6be676..9e98f8c6 100644
--- a/packages/git/config.c.patch
+++ b/packages/git/config.c.patch
@@ -1,9 +1,9 @@
-diff -u -r ../git-2.9.0/config.c ./config.c
---- ../git-2.9.0/config.c	2016-06-13 15:07:49.000000000 -0400
-+++ ./config.c	2016-06-19 20:16:44.473791157 -0400
-@@ -49,6 +49,25 @@
-  */
- static struct config_set the_config_set;
+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;
  
 +/*
 + * Protecting the project-specific git configuration file (.git/config) is
@@ -27,29 +27,29 @@ diff -u -r ../git-2.9.0/config.c ./config.c
  static int config_file_fgetc(struct config_source *conf)
  {
  	return getc_unlocked(conf->u.file);
-@@ -2123,9 +2142,13 @@
+@@ -2608,9 +2627,13 @@
  		in_fd = -1;
  
- 		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
- 			error_errno("chmod on %s failed", get_lock_file_path(lock));
+ 			error_errno("chmod on %s failed", get_lock_file_path(&lock));
  			ret = CONFIG_NO_WRITE;
  			goto out_free;
 +#endif
  		}
  
  		if (store.seen == 0)
-@@ -2330,9 +2353,13 @@
- 	fstat(fileno(config_file), &st);
+@@ -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
  	}