remove unnecessary initializations
[git/git.git] / builtin-update-index.c
CommitLineData
8bc9a0c7
LT
1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
e83c5163 6#include "cache.h"
ee1bec3d 7#include "strbuf.h"
973d6a20 8#include "quote.h"
a6e5642f 9#include "cache-tree.h"
2bd452d3 10#include "tree-walk.h"
fefe81c9 11#include "builtin.h"
e83c5163 12
121481ab
LT
13/*
14 * Default to not allowing changes to the list of files. The
15 * tool doesn't actually care, but this makes it harder to add
16 * files to the revision control by mistake by doing something
215a7ad1 17 * like "git-update-index *" and suddenly having all the object
121481ab
LT
18 * files be revision controlled.
19 */
caf4f582
JH
20static int allow_add;
21static int allow_remove;
22static int allow_replace;
caf4f582 23static int info_only;
9b63f501 24static int force_remove;
caf4f582 25static int verbose;
96f1e58f 26static int mark_valid_only;
5f73076c
JH
27#define MARK_VALID 1
28#define UNMARK_VALID 2
29
caf4f582
JH
30static void report(const char *fmt, ...)
31{
32 va_list vp;
33
34 if (!verbose)
35 return;
36
37 va_start(vp, fmt);
38 vprintf(fmt, vp);
39 putchar('\n');
40 va_end(vp);
41}
42
5f73076c
JH
43static int mark_valid(const char *path)
44{
45 int namelen = strlen(path);
46 int pos = cache_name_pos(path, namelen);
47 if (0 <= pos) {
48 switch (mark_valid_only) {
49 case MARK_VALID:
50 active_cache[pos]->ce_flags |= htons(CE_VALID);
51 break;
52 case UNMARK_VALID:
53 active_cache[pos]->ce_flags &= ~htons(CE_VALID);
54 break;
55 }
a6e5642f 56 cache_tree_invalidate_path(active_cache_tree, path);
5f73076c
JH
57 active_cache_changed = 1;
58 return 0;
59 }
60 return -1;
61}
62
6b5ee137 63static int add_file_to_cache(const char *path)
e83c5163 64{
4c5abf42 65 int size, namelen, option, status;
e83c5163
LT
66 struct cache_entry *ce;
67 struct stat st;
e83c5163 68
4c5abf42 69 status = lstat(path, &st);
a6e5642f
JH
70
71 /* We probably want to do this in remove_file_from_cache() and
72 * add_cache_entry() instead...
73 */
74 cache_tree_invalidate_path(active_cache_tree, path);
75
4c5abf42
JH
76 if (status < 0 || S_ISDIR(st.st_mode)) {
77 /* When we used to have "path" and now we want to add
78 * "path/file", we need a way to remove "path" before
79 * being able to add "path/file". However,
215a7ad1 80 * "git-update-index --remove path" would not work.
4c5abf42
JH
81 * --force-remove can be used but this is more user
82 * friendly, especially since we can do the opposite
83 * case just fine without --force-remove.
84 */
85 if (status == 0 || (errno == ENOENT || errno == ENOTDIR)) {
34143b26
PB
86 if (allow_remove) {
87 if (remove_file_from_cache(path))
88 return error("%s: cannot remove from the index",
89 path);
90 else
91 return 0;
92 } else if (status < 0) {
93 return error("%s: does not exist and --remove not passed",
94 path);
95 }
121481ab 96 }
89bc8c78 97 if (0 == status)
34143b26
PB
98 return error("%s: is a directory - add files inside instead",
99 path);
89bc8c78
AW
100 else
101 return error("lstat(\"%s\"): %s", path,
102 strerror(errno));
e83c5163 103 }
3e09cdfd 104
e83c5163
LT
105 namelen = strlen(path);
106 size = cache_entry_size(namelen);
90321c10 107 ce = xcalloc(1, size);
e83c5163 108 memcpy(ce->name, path, namelen);
5f73076c 109 ce->ce_flags = htons(namelen);
711cf3a0 110 fill_stat_cache_info(ce, &st);
3e09cdfd 111
e4479470 112 ce->ce_mode = create_ce_mode(st.st_mode);
3e09cdfd
JH
113 if (!trust_executable_bit) {
114 /* If there is an existing entry, pick the mode bits
115 * from it.
116 */
117 int pos = cache_name_pos(path, namelen);
118 if (0 <= pos)
119 ce->ce_mode = active_cache[pos]->ce_mode;
120 }
ec1fcc16
JH
121
122 if (index_path(ce->sha1, path, &st, !info_only))
123 return -1;
192268c1
JH
124 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
125 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
34143b26
PB
126 if (add_cache_entry(ce, option))
127 return error("%s: cannot add to the index - missing --add option?",
128 path);
129 return 0;
121481ab
LT
130}
131
d23748a6
JH
132static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
133 const char *path, int stage)
9945d980 134{
192268c1 135 int size, len, option;
9945d980
LT
136 struct cache_entry *ce;
137
d23748a6 138 if (!verify_path(path))
9945d980 139 return -1;
9945d980 140
d23748a6 141 len = strlen(path);
9945d980 142 size = cache_entry_size(len);
90321c10 143 ce = xcalloc(1, size);
9945d980
LT
144
145 memcpy(ce->sha1, sha1, 20);
d23748a6
JH
146 memcpy(ce->name, path, len);
147 ce->ce_flags = create_ce_flags(len, stage);
e4479470 148 ce->ce_mode = create_ce_mode(mode);
5f73076c
JH
149 if (assume_unchanged)
150 ce->ce_flags |= htons(CE_VALID);
192268c1
JH
151 option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
152 option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
caf4f582
JH
153 if (add_cache_entry(ce, option))
154 return error("%s: cannot add to the index - missing --add option?",
d23748a6
JH
155 path);
156 report("add '%s'", path);
a6e5642f 157 cache_tree_invalidate_path(active_cache_tree, path);
caf4f582 158 return 0;
9945d980
LT
159}
160
227bdb18 161static void chmod_path(int flip, const char *path)
3e09cdfd
JH
162{
163 int pos;
164 struct cache_entry *ce;
165 unsigned int mode;
f2a19340 166
3e09cdfd
JH
167 pos = cache_name_pos(path, strlen(path));
168 if (pos < 0)
227bdb18 169 goto fail;
3e09cdfd
JH
170 ce = active_cache[pos];
171 mode = ntohl(ce->ce_mode);
172 if (!S_ISREG(mode))
227bdb18 173 goto fail;
3e09cdfd
JH
174 switch (flip) {
175 case '+':
176 ce->ce_mode |= htonl(0111); break;
177 case '-':
178 ce->ce_mode &= htonl(~0111); break;
179 default:
227bdb18 180 goto fail;
3e09cdfd 181 }
a6e5642f 182 cache_tree_invalidate_path(active_cache_tree, path);
3e09cdfd 183 active_cache_changed = 1;
227bdb18
AR
184 report("chmod %cx '%s'", flip, path);
185 return;
186 fail:
187 die("git-update-index: cannot chmod %cx '%s'", flip, path);
3e09cdfd
JH
188}
189
ee1bec3d
JH
190static void update_one(const char *path, const char *prefix, int prefix_length)
191{
192 const char *p = prefix_path(prefix, prefix_length, path);
193 if (!verify_path(p)) {
194 fprintf(stderr, "Ignoring path %s\n", path);
fb69a760 195 goto free_return;
ee1bec3d 196 }
5f73076c
JH
197 if (mark_valid_only) {
198 if (mark_valid(p))
199 die("Unable to mark file %s", path);
fb69a760 200 goto free_return;
5f73076c 201 }
a6e5642f 202 cache_tree_invalidate_path(active_cache_tree, path);
5f73076c 203
ee1bec3d
JH
204 if (force_remove) {
205 if (remove_file_from_cache(p))
206 die("git-update-index: unable to remove %s", path);
caf4f582 207 report("remove '%s'", path);
fb69a760 208 goto free_return;
ee1bec3d
JH
209 }
210 if (add_file_to_cache(p))
211 die("Unable to process file %s", path);
caf4f582 212 report("add '%s'", path);
fb69a760 213 free_return:
0cc9e70c 214 if (p < path || p > path + strlen(path))
fb69a760 215 free((char*)p);
ee1bec3d
JH
216}
217
d4dbf36d
JH
218static void read_index_info(int line_termination)
219{
220 struct strbuf buf;
221 strbuf_init(&buf);
222 while (1) {
9c20a470 223 char *ptr, *tab;
973d6a20 224 char *path_name;
d4dbf36d
JH
225 unsigned char sha1[20];
226 unsigned int mode;
d23748a6
JH
227 int stage;
228
229 /* This reads lines formatted in one of three formats:
230 *
231 * (1) mode SP sha1 TAB path
232 * The first format is what "git-apply --index-info"
233 * reports, and used to reconstruct a partial tree
234 * that is used for phony merge base tree when falling
235 * back on 3-way merge.
236 *
237 * (2) mode SP type SP sha1 TAB path
238 * The second format is to stuff git-ls-tree output
239 * into the index file.
fefe81c9 240 *
d23748a6
JH
241 * (3) mode SP sha1 SP stage TAB path
242 * This format is to put higher order stages into the
243 * index file and matches git-ls-files --stage output.
244 */
d4dbf36d
JH
245 read_line(&buf, stdin, line_termination);
246 if (buf.eof)
247 break;
248
249 mode = strtoul(buf.buf, &ptr, 8);
9c20a470 250 if (ptr == buf.buf || *ptr != ' ')
d4dbf36d
JH
251 goto bad_line;
252
9c20a470
JH
253 tab = strchr(ptr, '\t');
254 if (!tab || tab - ptr < 41)
255 goto bad_line;
d23748a6 256
2d497115 257 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
d23748a6
JH
258 stage = tab[-1] - '0';
259 ptr = tab + 1; /* point at the head of path */
260 tab = tab - 2; /* point at tail of sha1 */
261 }
262 else {
263 stage = 0;
264 ptr = tab + 1; /* point at the head of path */
265 }
266
9c20a470
JH
267 if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
268 goto bad_line;
973d6a20
JH
269
270 if (line_termination && ptr[0] == '"')
271 path_name = unquote_c_style(ptr, NULL);
272 else
273 path_name = ptr;
274
275 if (!verify_path(path_name)) {
276 fprintf(stderr, "Ignoring path %s\n", path_name);
277 if (path_name != ptr)
278 free(path_name);
d4dbf36d
JH
279 continue;
280 }
a6e5642f 281 cache_tree_invalidate_path(active_cache_tree, path_name);
d4dbf36d
JH
282
283 if (!mode) {
284 /* mode == 0 means there is no such path -- remove */
973d6a20 285 if (remove_file_from_cache(path_name))
d4dbf36d
JH
286 die("git-update-index: unable to remove %s",
287 ptr);
288 }
289 else {
290 /* mode ' ' sha1 '\t' name
291 * ptr[-1] points at tab,
292 * ptr[-41] is at the beginning of sha1
293 */
294 ptr[-42] = ptr[-1] = 0;
d23748a6 295 if (add_cacheinfo(mode, sha1, path_name, stage))
d4dbf36d 296 die("git-update-index: unable to update %s",
973d6a20 297 path_name);
d4dbf36d 298 }
973d6a20
JH
299 if (path_name != ptr)
300 free(path_name);
d4dbf36d
JH
301 continue;
302
303 bad_line:
304 die("malformed index info %s", buf.buf);
305 }
306}
307
f6ab5bb2 308static const char update_index_usage[] =
83e77a25 309"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again] [--ignore-missing] [-z] [--verbose] [--] <file>...";
f6ab5bb2 310
2bd452d3
JH
311static unsigned char head_sha1[20];
312static unsigned char merge_head_sha1[20];
313
314static struct cache_entry *read_one_ent(const char *which,
315 unsigned char *ent, const char *path,
316 int namelen, int stage)
317{
318 unsigned mode;
319 unsigned char sha1[20];
320 int size;
321 struct cache_entry *ce;
322
323 if (get_tree_entry(ent, path, sha1, &mode)) {
83e77a25
JH
324 if (which)
325 error("%s: not in %s branch.", path, which);
2bd452d3
JH
326 return NULL;
327 }
328 if (mode == S_IFDIR) {
83e77a25
JH
329 if (which)
330 error("%s: not a blob in %s branch.", path, which);
2bd452d3
JH
331 return NULL;
332 }
333 size = cache_entry_size(namelen);
334 ce = xcalloc(1, size);
335
336 memcpy(ce->sha1, sha1, 20);
337 memcpy(ce->name, path, namelen);
338 ce->ce_flags = create_ce_flags(namelen, stage);
339 ce->ce_mode = create_ce_mode(mode);
340 return ce;
341}
342
343static int unresolve_one(const char *path)
344{
345 int namelen = strlen(path);
346 int pos;
347 int ret = 0;
348 struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
349
350 /* See if there is such entry in the index. */
351 pos = cache_name_pos(path, namelen);
352 if (pos < 0) {
353 /* If there isn't, either it is unmerged, or
354 * resolved as "removed" by mistake. We do not
355 * want to do anything in the former case.
356 */
357 pos = -pos-1;
358 if (pos < active_nr) {
359 struct cache_entry *ce = active_cache[pos];
360 if (ce_namelen(ce) == namelen &&
361 !memcmp(ce->name, path, namelen)) {
362 fprintf(stderr,
363 "%s: skipping still unmerged path.\n",
364 path);
365 goto free_return;
366 }
367 }
368 }
369
370 /* Grab blobs from given path from HEAD and MERGE_HEAD,
371 * stuff HEAD version in stage #2,
372 * stuff MERGE_HEAD version in stage #3.
373 */
374 ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
375 ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
376
377 if (!ce_2 || !ce_3) {
378 ret = -1;
379 goto free_return;
380 }
381 if (!memcmp(ce_2->sha1, ce_3->sha1, 20) &&
382 ce_2->ce_mode == ce_3->ce_mode) {
383 fprintf(stderr, "%s: identical in both, skipping.\n",
384 path);
385 goto free_return;
386 }
387
497c3213 388 cache_tree_invalidate_path(active_cache_tree, path);
2bd452d3
JH
389 remove_file_from_cache(path);
390 if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
391 error("%s: cannot add our version to the index.", path);
392 ret = -1;
393 goto free_return;
394 }
395 if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
396 return 0;
397 error("%s: cannot add their version to the index.", path);
398 ret = -1;
399 free_return:
400 free(ce_2);
401 free(ce_3);
402 return ret;
403}
404
405static void read_head_pointers(void)
406{
407 if (read_ref(git_path("HEAD"), head_sha1))
408 die("No HEAD -- no initial commit yet?\n");
409 if (read_ref(git_path("MERGE_HEAD"), merge_head_sha1)) {
410 fprintf(stderr, "Not in the middle of a merge.\n");
411 exit(0);
412 }
413}
414
09895c1f
JH
415static int do_unresolve(int ac, const char **av,
416 const char *prefix, int prefix_length)
2bd452d3
JH
417{
418 int i;
419 int err = 0;
420
421 /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
422 * are not doing a merge, so exit with success status.
423 */
424 read_head_pointers();
425
426 for (i = 1; i < ac; i++) {
427 const char *arg = av[i];
09895c1f
JH
428 const char *p = prefix_path(prefix, prefix_length, arg);
429 err |= unresolve_one(p);
0cc9e70c 430 if (p < arg || p > arg + strlen(arg))
09895c1f 431 free((char*)p);
2bd452d3
JH
432 }
433 return err;
434}
435
83e77a25
JH
436static int do_reupdate(int ac, const char **av,
437 const char *prefix, int prefix_length)
438{
439 /* Read HEAD and run update-index on paths that are
440 * merged and already different between index and HEAD.
441 */
442 int pos;
443 int has_head = 1;
0cc9e70c 444 const char **pathspec = get_pathspec(prefix, av + 1);
83e77a25
JH
445
446 if (read_ref(git_path("HEAD"), head_sha1))
447 /* If there is no HEAD, that means it is an initial
448 * commit. Update everything in the index.
449 */
450 has_head = 0;
451 redo:
452 for (pos = 0; pos < active_nr; pos++) {
453 struct cache_entry *ce = active_cache[pos];
454 struct cache_entry *old = NULL;
455 int save_nr;
22293b9c
JH
456
457 if (ce_stage(ce) || !ce_path_match(ce, pathspec))
83e77a25
JH
458 continue;
459 if (has_head)
460 old = read_one_ent(NULL, head_sha1,
461 ce->name, ce_namelen(ce), 0);
462 if (old && ce->ce_mode == old->ce_mode &&
463 !memcmp(ce->sha1, old->sha1, 20)) {
464 free(old);
465 continue; /* unchanged */
466 }
467 /* Be careful. The working tree may not have the
468 * path anymore, in which case, under 'allow_remove',
469 * or worse yet 'allow_replace', active_nr may decrease.
470 */
471 save_nr = active_nr;
472 update_one(ce->name + prefix_length, prefix, prefix_length);
473 if (save_nr != active_nr)
474 goto redo;
475 }
476 return 0;
477}
478
a633fca0 479int cmd_update_index(int argc, const char **argv, const char *prefix)
e83c5163 480{
ee1bec3d 481 int i, newfd, entries, has_errors = 0, line_termination = '\n';
121481ab 482 int allow_options = 1;
ee1bec3d 483 int read_from_stdin = 0;
ee1bec3d 484 int prefix_length = prefix ? strlen(prefix) : 0;
227bdb18 485 char set_executable_bit = 0;
405e5b2f 486 unsigned int refresh_flags = 0;
fefe81c9 487 struct lock_file *lock_file;
bb233d69 488
3e09cdfd
JH
489 git_config(git_default_config);
490
fefe81c9 491 /* We can't free this memory, it becomes part of a linked list parsed atexit() */
928e47e3 492 lock_file = xcalloc(1, sizeof(struct lock_file));
fefe81c9 493
40aaae88 494 newfd = hold_lock_file_for_update(lock_file, get_index_file(), 1);
9614b8dc 495
e83c5163 496 entries = read_cache();
9614b8dc 497 if (entries < 0)
2de381f9 498 die("cache corrupted");
e83c5163 499
e83c5163 500 for (i = 1 ; i < argc; i++) {
6b5ee137 501 const char *path = argv[i];
121481ab
LT
502
503 if (allow_options && *path == '-') {
504 if (!strcmp(path, "--")) {
505 allow_options = 0;
506 continue;
507 }
0ed3715f 508 if (!strcmp(path, "-q")) {
405e5b2f 509 refresh_flags |= REFRESH_QUIET;
0ed3715f
LT
510 continue;
511 }
121481ab
LT
512 if (!strcmp(path, "--add")) {
513 allow_add = 1;
514 continue;
515 }
192268c1
JH
516 if (!strcmp(path, "--replace")) {
517 allow_replace = 1;
518 continue;
519 }
121481ab
LT
520 if (!strcmp(path, "--remove")) {
521 allow_remove = 1;
522 continue;
523 }
5d1a5c02 524 if (!strcmp(path, "--unmerged")) {
405e5b2f 525 refresh_flags |= REFRESH_UNMERGED;
5d1a5c02
LT
526 continue;
527 }
121481ab 528 if (!strcmp(path, "--refresh")) {
405e5b2f 529 has_errors |= refresh_cache(refresh_flags);
5f73076c
JH
530 continue;
531 }
532 if (!strcmp(path, "--really-refresh")) {
405e5b2f 533 has_errors |= refresh_cache(REFRESH_REALLY | refresh_flags);
121481ab
LT
534 continue;
535 }
9945d980 536 if (!strcmp(path, "--cacheinfo")) {
d23748a6
JH
537 unsigned char sha1[20];
538 unsigned int mode;
539
b3f94c4b 540 if (i+3 >= argc)
215a7ad1 541 die("git-update-index: --cacheinfo <mode> <sha1> <path>");
d23748a6
JH
542
543 if ((sscanf(argv[i+1], "%o", &mode) != 1) ||
544 get_sha1_hex(argv[i+2], sha1) ||
545 add_cacheinfo(mode, sha1, argv[i+3], 0))
546 die("git-update-index: --cacheinfo"
547 " cannot add %s", argv[i+3]);
9945d980
LT
548 i += 3;
549 continue;
550 }
3e09cdfd
JH
551 if (!strcmp(path, "--chmod=-x") ||
552 !strcmp(path, "--chmod=+x")) {
553 if (argc <= i+1)
554 die("git-update-index: %s <path>", path);
227bdb18 555 set_executable_bit = path[8];
3e09cdfd
JH
556 continue;
557 }
5f73076c
JH
558 if (!strcmp(path, "--assume-unchanged")) {
559 mark_valid_only = MARK_VALID;
560 continue;
561 }
562 if (!strcmp(path, "--no-assume-unchanged")) {
563 mark_valid_only = UNMARK_VALID;
564 continue;
565 }
df6e1516
BL
566 if (!strcmp(path, "--info-only")) {
567 info_only = 1;
568 continue;
569 }
0ff5bf7c 570 if (!strcmp(path, "--force-remove")) {
9b63f501 571 force_remove = 1;
0ff5bf7c
JH
572 continue;
573 }
ee1bec3d
JH
574 if (!strcmp(path, "-z")) {
575 line_termination = 0;
576 continue;
577 }
578 if (!strcmp(path, "--stdin")) {
579 if (i != argc - 1)
580 die("--stdin must be at the end");
581 read_from_stdin = 1;
582 break;
583 }
d4dbf36d 584 if (!strcmp(path, "--index-info")) {
a41c175d
SP
585 if (i != argc - 1)
586 die("--index-info must be at the end");
d4dbf36d
JH
587 allow_add = allow_replace = allow_remove = 1;
588 read_index_info(line_termination);
a41c175d 589 break;
d4dbf36d 590 }
2bd452d3 591 if (!strcmp(path, "--unresolve")) {
09895c1f
JH
592 has_errors = do_unresolve(argc - i, argv + i,
593 prefix, prefix_length);
2bd452d3
JH
594 if (has_errors)
595 active_cache_changed = 0;
596 goto finish;
597 }
83e77a25
JH
598 if (!strcmp(path, "--again")) {
599 has_errors = do_reupdate(argc - i, argv + i,
600 prefix, prefix_length);
601 if (has_errors)
602 active_cache_changed = 0;
603 goto finish;
604 }
c6e007b0 605 if (!strcmp(path, "--ignore-missing")) {
405e5b2f 606 refresh_flags |= REFRESH_IGNORE_MISSING;
c6e007b0
JB
607 continue;
608 }
caf4f582
JH
609 if (!strcmp(path, "--verbose")) {
610 verbose = 1;
611 continue;
612 }
f6ab5bb2
PB
613 if (!strcmp(path, "-h") || !strcmp(path, "--help"))
614 usage(update_index_usage);
2de381f9 615 die("unknown option %s", path);
121481ab 616 }
ee1bec3d 617 update_one(path, prefix, prefix_length);
227bdb18
AR
618 if (set_executable_bit)
619 chmod_path(set_executable_bit, path);
ee1bec3d
JH
620 }
621 if (read_from_stdin) {
622 struct strbuf buf;
623 strbuf_init(&buf);
624 while (1) {
a94d9948 625 char *path_name;
fb69a760 626 const char *p;
ee1bec3d
JH
627 read_line(&buf, stdin, line_termination);
628 if (buf.eof)
629 break;
a94d9948
JH
630 if (line_termination && buf.buf[0] == '"')
631 path_name = unquote_c_style(buf.buf, NULL);
632 else
633 path_name = buf.buf;
fb69a760
JH
634 p = prefix_path(prefix, prefix_length, path_name);
635 update_one(p, NULL, 0);
636 if (set_executable_bit)
227bdb18 637 chmod_path(set_executable_bit, p);
0cc9e70c 638 if (p < path_name || p > path_name + strlen(path_name))
fb69a760 639 free((char*) p);
a94d9948
JH
640 if (path_name != buf.buf)
641 free(path_name);
9b63f501 642 }
e83c5163 643 }
2bd452d3
JH
644
645 finish:
5cd5ace7
LT
646 if (active_cache_changed) {
647 if (write_cache(newfd, active_cache, active_nr) ||
6244b249 648 close(newfd) || commit_lock_file(lock_file))
021b6e45 649 die("Unable to write new index file");
5cd5ace7 650 }
9614b8dc 651
fefe81c9
LS
652 rollback_lock_file(lock_file);
653
c4b83e61 654 return has_errors ? 1 : 0;
e83c5163 655}