summaryrefslogtreecommitdiff
path: root/checkout-cache.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-09 19:11:25 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-09 19:11:25 (GMT)
commit83adac3c57ad8cd2c8d44b525414b949950e316d (patch)
tree314297184c51fc558a83b8701a83f28a0e740d7a /checkout-cache.c
parent197ee8c97076ee784db9f4b5a9294e86f42d068c (diff)
downloadgit-83adac3c57ad8cd2c8d44b525414b949950e316d.zip
git-83adac3c57ad8cd2c8d44b525414b949950e316d.tar.gz
git-83adac3c57ad8cd2c8d44b525414b949950e316d.tar.bz2
Make "read-tree" read the tree into the current directory cache.
It will no longer update the actual working directory, just the cache. To update the working directory, you need to use "checkout-cache".
Diffstat (limited to 'checkout-cache.c')
-rw-r--r--checkout-cache.c30
1 files changed, 29 insertions, 1 deletions
diff --git a/checkout-cache.c b/checkout-cache.c
index 6baf4f2..cfbc47e 100644
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -36,6 +36,34 @@
static int force = 0, quiet = 0;
+static void create_directories(const char *path)
+{
+ int len = strlen(path);
+ char *buf = malloc(len + 1);
+ const char *slash = path;
+
+ while ((slash = strchr(slash+1, '/')) != NULL) {
+ len = slash - path;
+ memcpy(buf, path, len);
+ buf[len] = 0;
+ mkdir(buf, 0700);
+ }
+}
+
+static int create_file(const char *path, unsigned int mode)
+{
+ int fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0600);
+ if (fd < 0) {
+ if (errno == ENOENT) {
+ create_directories(path);
+ fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0600);
+ }
+ }
+ if (fd >= 0)
+ fchmod(fd, mode);
+ return fd;
+}
+
static int write_entry(struct cache_entry *ce)
{
int fd;
@@ -50,7 +78,7 @@ static int write_entry(struct cache_entry *ce)
ce->name, sha1_to_hex(ce->sha1));
return -1;
}
- fd = open(ce->name, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+ fd = create_file(ce->name, ce->st_mode);
if (fd < 0) {
fprintf(stderr, "checkout-cache: unable to create %s (%s)\n",
ce->name, strerror(errno));