git: Update from 2.14.2 to 2.14.3

[termux-packages] / packages / git / config.c.patch

diff --git a/packages/git/config.c.patch b/packages/git/config.c.patch
index 7d6be67..d6e3144 100644 (file)
--- 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.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,22 +27,22 @@ 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 @@
+@@ -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_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);
+@@ -2737,9 +2760,13 @@
+       }
  
        if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
 +#ifdef __ANDROID__