git: Update from 2.14.2 to 2.14.3

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

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
+ * not possible on a shared file system on Android, which on an unpatched
+ * git causes operations such as clone to fail with an error message.
+ *
+ * For the Termux git package we introduce a warning about the configuration
+ * file being unprotected, but proceed in order to allow git repositories
+ * to be cloned to shared storage accessible to other apps.
+ */
+static void termux_warn_once_about_lockfile()
+{
+	static int already_warned;
+	if (!already_warned) {
+		warning("Cannot protect .git/config on this file system"
+				" - do not store sensitive information here.");
+		already_warned = 1;
+	}
+}
+
 static int config_file_fgetc(struct config_source *conf)
 {
 	return getc_unlocked(conf->u.file);
@@ -2535,9 +2554,13 @@
 		in_fd = -1;
 
 		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));
 			ret = CONFIG_NO_WRITE;
 			goto out_free;
+#endif
 		}
 
 		if (store.seen == 0)
@@ -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_errno("chmod on %s failed",
 				  get_lock_file_path(lock));
 		goto out;
+#endif
 	}
 
 	while (fgets(buf, sizeof(buf), config_file)) {