47 lines
1.2 KiB
Diff
47 lines
1.2 KiB
Diff
From 6134cc328f513e32895462e884487513b28029ba Mon Sep 17 00:00:00 2001
|
|
From: Joey Hess <joey@kitenet.net>
|
|
Date: Wed, 13 Aug 2014 13:50:56 -0400
|
|
Subject: [PATCH] avoid using of chmod on android when changing config
|
|
|
|
This breaks on Android's /sdcard, which has a variety of FUSE
|
|
implentations, all total shite.
|
|
---
|
|
config.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/config.c b/config.c
|
|
index 058505c..16854b2 100644
|
|
--- a/config.c
|
|
+++ b/config.c
|
|
@@ -1634,12 +1634,14 @@ int git_config_set_multivar_in_file(const char *config_filename,
|
|
MAP_PRIVATE, in_fd, 0);
|
|
close(in_fd);
|
|
|
|
+ /* not on android
|
|
if (chmod(lock->filename, st.st_mode & 07777) < 0) {
|
|
error("chmod on %s failed: %s",
|
|
lock->filename, strerror(errno));
|
|
ret = CONFIG_NO_WRITE;
|
|
goto out_free;
|
|
}
|
|
+ */
|
|
|
|
if (store.seen == 0)
|
|
store.seen = 1;
|
|
@@ -1813,11 +1815,13 @@ int git_config_rename_section_in_file(const char *config_filename,
|
|
|
|
fstat(fileno(config_file), &st);
|
|
|
|
+ /* not on android
|
|
if (chmod(lock->filename, st.st_mode & 07777) < 0) {
|
|
ret = error("chmod on %s failed: %s",
|
|
lock->filename, strerror(errno));
|
|
goto out;
|
|
}
|
|
+ */
|
|
|
|
while (fgets(buf, sizeof(buf), config_file)) {
|
|
int i;
|
|
--
|
|
2.1.0.rc1
|
|
|