Diff clean-up.
[git/git.git] / update-index.c
CommitLineData
8bc9a0c7
LT
1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
e83c5163
LT
6#include "cache.h"
7
121481ab
LT
8/*
9 * Default to not allowing changes to the list of files. The
10 * tool doesn't actually care, but this makes it harder to add
11 * files to the revision control by mistake by doing something
215a7ad1 12 * like "git-update-index *" and suddenly having all the object
121481ab
LT
13 * files be revision controlled.
14 */
df6e1516 15static int allow_add = 0, allow_remove = 0, allow_replace = 0, not_new = 0, quiet = 0, info_only = 0;
9b63f501 16static int force_remove;
c6e007b0
JB
17
18/* Three functions to allow overloaded pointer return; see linux/err.h */
19static inline void *ERR_PTR(long error)
20{
21 return (void *) error;
22}
23
24static inline long PTR_ERR(const void *ptr)
25{
26 return (long) ptr;
27}
28
29static inline long IS_ERR(const void *ptr)
30{
31 return (unsigned long)ptr > (unsigned long)-1000L;
32}
121481ab 33
6b5ee137 34static int add_file_to_cache(const char *path)
e83c5163 35{
4c5abf42 36 int size, namelen, option, status;
e83c5163
LT
37 struct cache_entry *ce;
38 struct stat st;
39 int fd;
ffbe1add 40 char *target;
e83c5163 41
4c5abf42
JH
42 status = lstat(path, &st);
43 if (status < 0 || S_ISDIR(st.st_mode)) {
44 /* When we used to have "path" and now we want to add
45 * "path/file", we need a way to remove "path" before
46 * being able to add "path/file". However,
215a7ad1 47 * "git-update-index --remove path" would not work.
4c5abf42
JH
48 * --force-remove can be used but this is more user
49 * friendly, especially since we can do the opposite
50 * case just fine without --force-remove.
51 */
52 if (status == 0 || (errno == ENOENT || errno == ENOTDIR)) {
34143b26
PB
53 if (allow_remove) {
54 if (remove_file_from_cache(path))
55 return error("%s: cannot remove from the index",
56 path);
57 else
58 return 0;
59 } else if (status < 0) {
60 return error("%s: does not exist and --remove not passed",
61 path);
62 }
121481ab 63 }
89bc8c78 64 if (0 == status)
34143b26
PB
65 return error("%s: is a directory - add files inside instead",
66 path);
89bc8c78
AW
67 else
68 return error("lstat(\"%s\"): %s", path,
69 strerror(errno));
e83c5163 70 }
e83c5163
LT
71 namelen = strlen(path);
72 size = cache_entry_size(namelen);
812666c8 73 ce = xmalloc(size);
e83c5163
LT
74 memset(ce, 0, size);
75 memcpy(ce->name, path, namelen);
711cf3a0 76 fill_stat_cache_info(ce, &st);
e4479470 77 ce->ce_mode = create_ce_mode(st.st_mode);
f5cabd13 78 ce->ce_flags = htons(namelen);
8ae0a8c5
KS
79 switch (st.st_mode & S_IFMT) {
80 case S_IFREG:
81 fd = open(path, O_RDONLY);
82 if (fd < 0)
34143b26 83 return error("open(\"%s\"): %s", path, strerror(errno));
df6e1516 84 if (index_fd(ce->sha1, fd, &st, !info_only, NULL) < 0)
34143b26 85 return error("%s: failed to insert into database", path);
8ae0a8c5
KS
86 break;
87 case S_IFLNK:
ffbe1add
KS
88 target = xmalloc(st.st_size+1);
89 if (readlink(path, target, st.st_size+1) != st.st_size) {
34143b26 90 char *errstr = strerror(errno);
ffbe1add 91 free(target);
34143b26
PB
92 return error("readlink(\"%s\"): %s", path,
93 errstr);
ffbe1add 94 }
df6e1516
BL
95 if (info_only) {
96 unsigned char hdr[50];
97 int hdrlen;
98 write_sha1_file_prepare(target, st.st_size, "blob",
99 ce->sha1, hdr, &hdrlen);
100 } else if (write_sha1_file(target, st.st_size, "blob", ce->sha1))
34143b26 101 return error("%s: failed to insert into database", path);
ffbe1add 102 free(target);
8ae0a8c5
KS
103 break;
104 default:
34143b26 105 return error("%s: unsupported file type", path);
8ae0a8c5 106 }
192268c1
JH
107 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
108 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
34143b26
PB
109 if (add_cache_entry(ce, option))
110 return error("%s: cannot add to the index - missing --add option?",
111 path);
112 return 0;
121481ab
LT
113}
114
711cf3a0
LT
115/*
116 * "refresh" does not calculate a new sha1 file or bring the
117 * cache up-to-date for mode/content changes. But what it
118 * _does_ do is to "re-match" the stat information of a file
119 * with the cache, so that you can refresh the cache for a
120 * file that hasn't been changed but where the stat entry is
121 * out of date.
122 *
667bb59b 123 * For example, you'd want to do this after doing a "git-read-tree",
711cf3a0
LT
124 * to link up the stat cache details with the proper files.
125 */
126static struct cache_entry *refresh_entry(struct cache_entry *ce)
127{
128 struct stat st;
129 struct cache_entry *updated;
130 int changed, size;
131
8ae0a8c5 132 if (lstat(ce->name, &st) < 0)
c6e007b0 133 return ERR_PTR(-errno);
711cf3a0 134
5d728c84 135 changed = ce_match_stat(ce, &st);
711cf3a0
LT
136 if (!changed)
137 return ce;
138
b0391890 139 if (ce_modified(ce, &st))
c6e007b0 140 return ERR_PTR(-EINVAL);
711cf3a0
LT
141
142 size = ce_size(ce);
812666c8 143 updated = xmalloc(size);
711cf3a0
LT
144 memcpy(updated, ce, size);
145 fill_stat_cache_info(updated, &st);
146 return updated;
121481ab
LT
147}
148
90535218 149static int refresh_cache(void)
121481ab
LT
150{
151 int i;
90535218 152 int has_errors = 0;
121481ab 153
711cf3a0 154 for (i = 0; i < active_nr; i++) {
1bc992ac
JH
155 struct cache_entry *ce, *new;
156 ce = active_cache[i];
157 if (ce_stage(ce)) {
158 printf("%s: needs merge\n", ce->name);
90535218 159 has_errors = 1;
1bc992ac
JH
160 while ((i < active_nr) &&
161 ! strcmp(active_cache[i]->name, ce->name))
162 i++;
163 i--;
164 continue;
165 }
711cf3a0 166
1bc992ac 167 new = refresh_entry(ce);
c6e007b0 168 if (IS_ERR(new)) {
0ed3715f
LT
169 if (not_new && PTR_ERR(new) == -ENOENT)
170 continue;
171 if (quiet)
172 continue;
173 printf("%s: needs update\n", ce->name);
174 has_errors = 1;
711cf3a0
LT
175 continue;
176 }
ee267527 177 active_cache_changed = 1;
62d046a0
PB
178 /* You can NOT just free active_cache[i] here, since it
179 * might not be necessarily malloc()ed but can also come
180 * from mmap(). */
711cf3a0
LT
181 active_cache[i] = new;
182 }
90535218 183 return has_errors;
e83c5163
LT
184}
185
e83c5163
LT
186/*
187 * We fundamentally don't like some paths: we don't want
320d3a1b
LT
188 * dot or dot-dot anywhere, and for obvious reasons don't
189 * want to recurse into ".git" either.
e83c5163
LT
190 *
191 * Also, we don't want double slashes or slashes at the
aebb2679 192 * end that can make pathnames ambiguous.
e83c5163 193 */
320d3a1b
LT
194static int verify_dotfile(const char *rest)
195{
196 /*
197 * The first character was '.', but that
198 * has already been discarded, we now test
199 * the rest.
200 */
201 switch (*rest) {
202 /* "." is not allowed */
203 case '\0': case '/':
204 return 0;
205
206 /*
207 * ".git" followed by NUL or slash is bad. This
208 * shares the path end test with the ".." case.
209 */
210 case 'g':
211 if (rest[1] != 'i')
212 break;
213 if (rest[2] != 't')
214 break;
215 rest += 2;
216 /* fallthrough */
217 case '.':
218 if (rest[1] == '\0' || rest[1] == '/')
219 return 0;
220 }
221 return 1;
222}
223
6b5ee137 224static int verify_path(const char *path)
e83c5163
LT
225{
226 char c;
227
228 goto inside;
229 for (;;) {
230 if (!c)
231 return 1;
232 if (c == '/') {
233inside:
234 c = *path++;
320d3a1b
LT
235 switch (c) {
236 default:
e83c5163 237 continue;
320d3a1b
LT
238 case '/': case '\0':
239 break;
240 case '.':
241 if (verify_dotfile(path))
242 continue;
243 }
e83c5163
LT
244 return 0;
245 }
246 c = *path++;
247 }
248}
249
6b5ee137 250static int add_cacheinfo(const char *arg1, const char *arg2, const char *arg3)
9945d980 251{
192268c1 252 int size, len, option;
9945d980
LT
253 unsigned int mode;
254 unsigned char sha1[20];
255 struct cache_entry *ce;
256
257 if (sscanf(arg1, "%o", &mode) != 1)
258 return -1;
9945d980
LT
259 if (get_sha1_hex(arg2, sha1))
260 return -1;
9945d980
LT
261 if (!verify_path(arg3))
262 return -1;
9945d980
LT
263
264 len = strlen(arg3);
265 size = cache_entry_size(len);
812666c8 266 ce = xmalloc(size);
9945d980
LT
267 memset(ce, 0, size);
268
269 memcpy(ce->sha1, sha1, 20);
270 memcpy(ce->name, arg3, len);
f5cabd13 271 ce->ce_flags = htons(len);
e4479470 272 ce->ce_mode = create_ce_mode(mode);
192268c1
JH
273 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
274 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
275 return add_cache_entry(ce, option);
9945d980
LT
276}
277
e99d59ff 278static struct cache_file cache_file;
f2a19340 279
6b5ee137 280int main(int argc, const char **argv)
e83c5163 281{
90535218 282 int i, newfd, entries, has_errors = 0;
121481ab 283 int allow_options = 1;
cfb0af1d 284 const char *prefix = setup_git_directory();
bb233d69 285
415e96c8 286 newfd = hold_index_file_for_update(&cache_file, get_index_file());
9614b8dc 287 if (newfd < 0)
2de381f9 288 die("unable to create new cachefile");
9614b8dc 289
e83c5163 290 entries = read_cache();
9614b8dc 291 if (entries < 0)
2de381f9 292 die("cache corrupted");
e83c5163 293
e83c5163 294 for (i = 1 ; i < argc; i++) {
6b5ee137 295 const char *path = argv[i];
121481ab
LT
296
297 if (allow_options && *path == '-') {
298 if (!strcmp(path, "--")) {
299 allow_options = 0;
300 continue;
301 }
0ed3715f
LT
302 if (!strcmp(path, "-q")) {
303 quiet = 1;
304 continue;
305 }
121481ab
LT
306 if (!strcmp(path, "--add")) {
307 allow_add = 1;
308 continue;
309 }
192268c1
JH
310 if (!strcmp(path, "--replace")) {
311 allow_replace = 1;
312 continue;
313 }
121481ab
LT
314 if (!strcmp(path, "--remove")) {
315 allow_remove = 1;
316 continue;
317 }
318 if (!strcmp(path, "--refresh")) {
90535218 319 has_errors |= refresh_cache();
121481ab
LT
320 continue;
321 }
9945d980 322 if (!strcmp(path, "--cacheinfo")) {
b3f94c4b 323 if (i+3 >= argc)
215a7ad1 324 die("git-update-index: --cacheinfo <mode> <sha1> <path>");
b3f94c4b 325 if (add_cacheinfo(argv[i+1], argv[i+2], argv[i+3]))
215a7ad1 326 die("git-update-index: --cacheinfo cannot add %s", argv[i+3]);
9945d980
LT
327 i += 3;
328 continue;
329 }
df6e1516
BL
330 if (!strcmp(path, "--info-only")) {
331 info_only = 1;
332 continue;
333 }
0ff5bf7c 334 if (!strcmp(path, "--force-remove")) {
9b63f501 335 force_remove = 1;
0ff5bf7c
JH
336 continue;
337 }
338
c6e007b0
JB
339 if (!strcmp(path, "--ignore-missing")) {
340 not_new = 1;
341 continue;
342 }
2de381f9 343 die("unknown option %s", path);
121481ab 344 }
cfb0af1d 345 path = prefix_path(prefix, prefix ? strlen(prefix) : 0, path);
e83c5163
LT
346 if (!verify_path(path)) {
347 fprintf(stderr, "Ignoring path %s\n", argv[i]);
348 continue;
349 }
9b63f501
PB
350 if (force_remove) {
351 if (remove_file_from_cache(path))
34143b26 352 die("git-update-index: unable to remove %s", path);
9b63f501
PB
353 continue;
354 }
9614b8dc 355 if (add_file_to_cache(path))
34143b26 356 die("Unable to process file %s", path);
e83c5163 357 }
415e96c8
JH
358 if (write_cache(newfd, active_cache, active_nr) ||
359 commit_index_file(&cache_file))
2de381f9 360 die("Unable to write new cachefile");
9614b8dc 361
c4b83e61 362 return has_errors ? 1 : 0;
e83c5163 363}