Keep rename/rename conflicts of intermediate merges while doing recursive merge
[git/mingw/j6t.git] / entry.c
blobd72f811580ad10e792e38b40fe79bf4af3868846
1 #include "cache.h"
2 #include "blob.h"
4 static void create_directories(const char *path, struct checkout *state)
6 int len = strlen(path);
7 char *buf = xmalloc(len + 1);
8 const char *slash = path;
10 while ((slash = strchr(slash+1, '/')) != NULL) {
11 len = slash - path;
12 memcpy(buf, path, len);
13 buf[len] = 0;
14 if (mkdir(buf, 0777)) {
15 if (errno == EEXIST) {
16 struct stat st;
17 if (len > state->base_dir_len && state->force && !unlink(buf) && !mkdir(buf, 0777))
18 continue;
19 if (!stat(buf, &st) && S_ISDIR(st.st_mode))
20 continue; /* ok */
22 die("cannot create directory at %s", buf);
25 free(buf);
28 static void remove_subtree(const char *path)
30 DIR *dir = opendir(path);
31 struct dirent *de;
32 char pathbuf[PATH_MAX];
33 char *name;
35 if (!dir)
36 die("cannot opendir %s", path);
37 strcpy(pathbuf, path);
38 name = pathbuf + strlen(path);
39 *name++ = '/';
40 while ((de = readdir(dir)) != NULL) {
41 struct stat st;
42 if ((de->d_name[0] == '.') &&
43 ((de->d_name[1] == 0) ||
44 ((de->d_name[1] == '.') && de->d_name[2] == 0)))
45 continue;
46 strcpy(name, de->d_name);
47 if (lstat(pathbuf, &st))
48 die("cannot lstat %s", pathbuf);
49 if (S_ISDIR(st.st_mode))
50 remove_subtree(pathbuf);
51 else if (unlink(pathbuf))
52 die("cannot unlink %s", pathbuf);
54 closedir(dir);
55 if (rmdir(path))
56 die("cannot rmdir %s", path);
59 static int create_file(const char *path, unsigned int mode)
61 mode = (mode & 0100) ? 0777 : 0666;
62 return open(path, O_WRONLY | O_CREAT | O_EXCL, mode);
65 static int write_entry(struct cache_entry *ce, char *path, struct checkout *state, int to_tempfile)
67 int fd;
68 void *new;
69 unsigned long size;
70 long wrote;
71 enum object_type type;
73 new = read_sha1_file(ce->sha1, &type, &size);
74 if (!new || type != OBJ_BLOB) {
75 if (new)
76 free(new);
77 return error("git-checkout-index: unable to read sha1 file of %s (%s)",
78 path, sha1_to_hex(ce->sha1));
80 switch (ntohl(ce->ce_mode) & S_IFMT) {
81 char *buf;
82 unsigned long nsize;
84 case S_IFREG:
85 if (to_tempfile) {
86 strcpy(path, ".merge_file_XXXXXX");
87 fd = mkstemp(path);
88 } else
89 fd = create_file(path, ntohl(ce->ce_mode));
90 if (fd < 0) {
91 free(new);
92 return error("git-checkout-index: unable to create file %s (%s)",
93 path, strerror(errno));
97 * Convert from git internal format to working tree format
99 buf = new;
100 nsize = size;
101 if (convert_to_working_tree(ce->name, &buf, &nsize)) {
102 free(new);
103 new = buf;
104 size = nsize;
107 wrote = write_in_full(fd, new, size);
108 close(fd);
109 free(new);
110 if (wrote != size)
111 return error("git-checkout-index: unable to write file %s", path);
112 break;
113 case S_IFLNK:
114 if (to_tempfile || !has_symlinks) {
115 if (to_tempfile) {
116 strcpy(path, ".merge_link_XXXXXX");
117 fd = mkstemp(path);
118 } else
119 fd = create_file(path, 0666);
120 if (fd < 0) {
121 free(new);
122 return error("git-checkout-index: unable to create "
123 "file %s (%s)", path, strerror(errno));
125 wrote = write_in_full(fd, new, size);
126 close(fd);
127 free(new);
128 if (wrote != size)
129 return error("git-checkout-index: unable to write file %s",
130 path);
131 } else {
132 wrote = symlink(new, path);
133 free(new);
134 if (wrote)
135 return error("git-checkout-index: unable to create "
136 "symlink %s (%s)", path, strerror(errno));
138 break;
139 default:
140 free(new);
141 return error("git-checkout-index: unknown file mode for %s", path);
144 if (state->refresh_cache) {
145 struct stat st;
146 lstat(ce->name, &st);
147 fill_stat_cache_info(ce, &st);
149 return 0;
152 int checkout_entry(struct cache_entry *ce, struct checkout *state, char *topath)
154 static char path[PATH_MAX + 1];
155 struct stat st;
156 int len = state->base_dir_len;
158 if (topath)
159 return write_entry(ce, topath, state, 1);
161 memcpy(path, state->base_dir, len);
162 strcpy(path + len, ce->name);
164 if (!lstat(path, &st)) {
165 unsigned changed = ce_match_stat(ce, &st, 1);
166 if (!changed)
167 return 0;
168 if (!state->force) {
169 if (!state->quiet)
170 fprintf(stderr, "git-checkout-index: %s already exists\n", path);
171 return -1;
175 * We unlink the old file, to get the new one with the
176 * right permissions (including umask, which is nasty
177 * to emulate by hand - much easier to let the system
178 * just do the right thing)
180 unlink(path);
181 if (S_ISDIR(st.st_mode)) {
182 if (!state->force)
183 return error("%s is a directory", path);
184 remove_subtree(path);
186 } else if (state->not_new)
187 return 0;
188 create_directories(path, state);
189 return write_entry(ce, path, state, 0);