X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=checkout-cache.c;h=f65be62b4abad184bd755884fb72681fc28c8b3b;hb=bb233d690a9782e1570dc93ead2bf04aaca7cfe4;hp=8d5e4cd148f6111ab7e0bfb7f9142693e08f66bd;hpb=ccc4feb579265266d0a4a73c0c9443ecc0c26ce3;p=git.git

diff --git a/checkout-cache.c b/checkout-cache.c
index 8d5e4cd1..f65be62b 100644
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -52,19 +52,20 @@ static void create_directories(const char *path)
 
 static int create_file(const char *path, unsigned int mode)
 {
-	int fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0600);
+	int fd;
+
+	mode = (mode & 0100) ? 0777 : 0666;
+	fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
 	if (fd < 0) {
 		if (errno == ENOENT) {
 			create_directories(path);
-			fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0600);
+			fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
 		}
 	}
-	if (fd >= 0)
-		fchmod(fd, mode);
 	return fd;
 }
 
-static int write_entry(struct cache_entry *ce)
+static int write_entry(struct cache_entry *ce, const char *path)
 {
 	int fd;
 	void *new;
@@ -75,57 +76,79 @@ static int write_entry(struct cache_entry *ce)
 	new = read_sha1_file(ce->sha1, type, &size);
 	if (!new || strcmp(type, "blob")) {
 		return error("checkout-cache: unable to read sha1 file of %s (%s)",
-			ce->name, sha1_to_hex(ce->sha1));
+			path, sha1_to_hex(ce->sha1));
 	}
-	fd = create_file(ce->name, ntohl(ce->ce_mode));
+	fd = create_file(path, ntohl(ce->ce_mode));
 	if (fd < 0) {
 		free(new);
 		return error("checkout-cache: unable to create %s (%s)",
-			ce->name, strerror(errno));
+			path, strerror(errno));
 	}
 	wrote = write(fd, new, size);
 	close(fd);
 	free(new);
 	if (wrote != size)
-		return error("checkout-cache: unable to write %s", ce->name);
+		return error("checkout-cache: unable to write %s", path);
 	return 0;
 }
 
-static int checkout_entry(struct cache_entry *ce)
+static int checkout_entry(struct cache_entry *ce, const char *base_dir)
 {
 	struct stat st;
+	static char path[MAXPATHLEN+1];
+	int len = strlen(base_dir);
 
-	if (!stat(ce->name, &st)) {
+	memcpy(path, base_dir, len);
+	strcpy(path + len, ce->name);
+
+	if (!stat(path, &st)) {
 		unsigned changed = cache_match_stat(ce, &st);
 		if (!changed)
 			return 0;
 		if (!force) {
 			if (!quiet)
-				fprintf(stderr, "checkout-cache: %s already exists\n", ce->name);
+				fprintf(stderr, "checkout-cache: %s already exists\n", path);
 			return 0;
 		}
+
+		/*
+		 * We unlink the old file, to get the new one with the
+		 * right permissions (including umask, which is nasty
+		 * to emulate by hand - much easier to let the system
+		 * just do the right thing)
+		 */
+		unlink(path);
 	}
-	return write_entry(ce);
+	return write_entry(ce, path);
 }
 
-static int checkout_file(const char *name)
+static int checkout_file(const char *name, const char *base_dir)
 {
 	int pos = cache_name_pos(name, strlen(name));
 	if (pos < 0) {
-		if (!quiet)
-			fprintf(stderr, "checkout-cache: %s is not in the cache\n", name);
+		if (!quiet) {
+			pos = -pos - 1;
+			fprintf(stderr,
+				"checkout-cache: %s is %s.\n",
+				name,
+				(pos < active_nr &&
+				 !strcmp(active_cache[pos]->name, name)) ?
+				"unmerged" : "not in the cache");
+		}
 		return -1;
 	}
-	return checkout_entry(active_cache[pos]);
+	return checkout_entry(active_cache[pos], base_dir);
 }
 
-static int checkout_all(void)
+static int checkout_all(const char *base_dir)
 {
 	int i;
 
 	for (i = 0; i < active_nr ; i++) {
 		struct cache_entry *ce = active_cache[i];
-		if (checkout_entry(ce) < 0)
+		if (ce_stage(ce))
+			continue;
+		if (checkout_entry(ce, base_dir) < 0)
 			return -1;
 	}
 	return 0;
@@ -134,6 +157,7 @@ static int checkout_all(void)
 int main(int argc, char **argv)
 {
 	int i, force_filename = 0;
+	const char *base_dir = "";
 
 	if (read_cache() < 0) {
 		die("invalid cache");
@@ -143,7 +167,7 @@ int main(int argc, char **argv)
 		const char *arg = argv[i];
 		if (!force_filename) {
 			if (!strcmp(arg, "-a")) {
-				checkout_all();
+				checkout_all(base_dir);
 				continue;
 			}
 			if (!strcmp(arg, "--")) {
@@ -158,8 +182,12 @@ int main(int argc, char **argv)
 				quiet = 1;
 				continue;
 			}
+			if (!memcmp(arg, "--prefix=", 9)) {
+				base_dir = arg+9;
+				continue;
+			}
 		}
-		checkout_file(arg);
+		checkout_file(arg, base_dir);
 	}
 	return 0;
 }