X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/11c62dd2484d16cd4cce471166765b8550873956..0d2991c980a7427fddfae81b93092c33620c1575:/packages/git/config.c.patch

diff --git a/packages/git/config.c.patch b/packages/git/config.c.patch
index 05db6356..d6e31440 100644
--- a/packages/git/config.c.patch
+++ b/packages/git/config.c.patch
@@ -1,9 +1,9 @@
-diff -u -r ../git-2.8.1/config.c ./config.c
---- ../git-2.8.1/config.c	2016-04-03 15:07:18.000000000 -0400
-+++ ./config.c	2016-04-21 18:37:26.707906688 -0400
-@@ -49,6 +49,25 @@
-  */
- static struct config_set the_config_set;
+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
+@@ -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,30 +27,29 @@ diff -u -r ../git-2.8.1/config.c ./config.c
  static int config_file_fgetc(struct config_source *conf)
  {
  	return getc_unlocked(conf->u.file);
-@@ -2125,10 +2147,14 @@
+@@ -2535,9 +2554,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("chmod on %s failed: %s",
- 			      get_lock_file_path(lock), strerror(errno));
+ 			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 +2356,13 @@
- 	fstat(fileno(config_file), &st);
+@@ -2737,9 +2760,13 @@
+ 	}
  
  	if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
 +#ifdef __ANDROID__
 +		termux_warn_once_about_lockfile();
 +#else
- 		ret = error("chmod on %s failed: %s",
- 			    get_lock_file_path(lock), strerror(errno));
+ 		ret = error_errno("chmod on %s failed",
+ 				  get_lock_file_path(lock));
  		goto out;
 +#endif
  	}