|
|
@ -1,6 +1,6 @@ |
|
|
|
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
|
|
|
|
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; |
|
|
@ -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 @@
|
|
|
|
@@ -2123,9 +2142,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("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 @@
|
|
|
|
@@ -2330,9 +2353,13 @@
|
|
|
|
fstat(fileno(config_file), &st); |
|
|
|
|
|
|
|
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
|
|
|
|
} |
|
|
|