summaryrefslogtreecommitdiff
path: root/standalone/android/git.patch
blob: 32dd1cecc3b1a94bd4cfaab80ae051d1b8df3bf0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
From ec690f617cab405ec2c6420bde53e9d9ed984e5c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 3 Jul 2014 15:55:17 -0400
Subject: [PATCH] Revert "config: preserve config file permissions on edits"

This reverts commit daa22c6f8da466bd7a438f1bc27375fd737ffcf3.

This breaks on Android's /sdcard, which has a variety of FUSE
implentations, all total shite.

diff --git a/config.c b/config.c
index a1aef1c..7f3303d 100644
--- a/config.c
+++ b/config.c
@@ -1637,13 +1637,6 @@ int git_config_set_multivar_in_file(const char *config_filename,
 			MAP_PRIVATE, in_fd, 0);
 		close(in_fd);
 
-		if (fchmod(fd, st.st_mode & 07777) < 0) {
-			error("fchmod on %s failed: %s",
-				lock->filename, strerror(errno));
-			ret = CONFIG_NO_WRITE;
-			goto out_free;
-		}
-
 		if (store.seen == 0)
 			store.seen = 1;
 
@@ -1792,7 +1785,6 @@ int git_config_rename_section_in_file(const char *config_filename,
 	int out_fd;
 	char buf[1024];
 	FILE *config_file;
-	struct stat st;
 
 	if (new_name && !section_name_is_ok(new_name)) {
 		ret = error("invalid section name: %s", new_name);
@@ -1814,14 +1806,6 @@ int git_config_rename_section_in_file(const char *config_filename,
 		goto unlock_and_out;
 	}
 
-	fstat(fileno(config_file), &st);
-
-	if (fchmod(out_fd, st.st_mode & 07777) < 0) {
-		ret = error("fchmod on %s failed: %s",
-				lock->filename, strerror(errno));
-		goto out;
-	}
-
 	while (fgets(buf, sizeof(buf), config_file)) {
 		int i;
 		int length;
-- 
2.0.1