|
|
@ -1,7 +1,7 @@ |
|
|
|
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 @@
|
|
|
|
diff -u -r ../git-2.19.0/config.c ./config.c
|
|
|
|
--- ../git-2.19.0/config.c 2018-09-10 18:39:13.000000000 +0000
|
|
|
|
+++ ./config.c 2018-09-11 21:16:14.404718876 +0000
|
|
|
|
@@ -77,6 +77,25 @@
|
|
|
|
static int pack_compression_seen; |
|
|
|
static int zlib_compression_seen; |
|
|
|
|
|
|
@ -27,28 +27,28 @@ diff -u -r ../git-2.16.0/config.c ./config.c |
|
|
|
static int config_file_fgetc(struct config_source *conf) |
|
|
|
{ |
|
|
|
return getc_unlocked(conf->u.file); |
|
|
|
@@ -2608,9 +2627,13 @@
|
|
|
|
@@ -2792,9 +2811,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)); |
|
|
|
error_errno(_("chmod on %s failed"), get_lock_file_path(&lock)); |
|
|
|
ret = CONFIG_NO_WRITE; |
|
|
|
goto out_free; |
|
|
|
+#endif
|
|
|
|
} |
|
|
|
|
|
|
|
if (store.seen == 0) |
|
|
|
@@ -2810,9 +2833,13 @@
|
|
|
|
if (store.seen_nr == 0) { |
|
|
|
@@ -3030,9 +3053,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", |
|
|
|
ret = error_errno(_("chmod on %s failed"), |
|
|
|
get_lock_file_path(&lock)); |
|
|
|
goto out; |
|
|
|
+#endif
|
|
|
|