Code

merge-recursive: move the global obuf to struct merge_options
[git.git] / builtin-update-index.c
1 /*
2  * GIT - The information manager from hell
3  *
4  * Copyright (C) Linus Torvalds, 2005
5  */
6 #include "cache.h"
7 #include "quote.h"
8 #include "cache-tree.h"
9 #include "tree-walk.h"
10 #include "builtin.h"
11 #include "refs.h"
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
17  * like "git-update-index *" and suddenly having all the object
18  * files be revision controlled.
19  */
20 static int allow_add;
21 static int allow_remove;
22 static int allow_replace;
23 static int info_only;
24 static int force_remove;
25 static int verbose;
26 static int mark_valid_only;
27 #define MARK_VALID 1
28 #define UNMARK_VALID 2
30 static void report(const char *fmt, ...)
31 {
32         va_list vp;
34         if (!verbose)
35                 return;
37         va_start(vp, fmt);
38         vprintf(fmt, vp);
39         putchar('\n');
40         va_end(vp);
41 }
43 static 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 |= CE_VALID;
51                         break;
52                 case UNMARK_VALID:
53                         active_cache[pos]->ce_flags &= ~CE_VALID;
54                         break;
55                 }
56                 cache_tree_invalidate_path(active_cache_tree, path);
57                 active_cache_changed = 1;
58                 return 0;
59         }
60         return -1;
61 }
63 static int remove_one_path(const char *path)
64 {
65         if (!allow_remove)
66                 return error("%s: does not exist and --remove not passed", path);
67         if (remove_file_from_cache(path))
68                 return error("%s: cannot remove from the index", path);
69         return 0;
70 }
72 /*
73  * Handle a path that couldn't be lstat'ed. It's either:
74  *  - missing file (ENOENT or ENOTDIR). That's ok if we're
75  *    supposed to be removing it and the removal actually
76  *    succeeds.
77  *  - permission error. That's never ok.
78  */
79 static int process_lstat_error(const char *path, int err)
80 {
81         if (err == ENOENT || err == ENOTDIR)
82                 return remove_one_path(path);
83         return error("lstat(\"%s\"): %s", path, strerror(errno));
84 }
86 static int add_one_path(struct cache_entry *old, const char *path, int len, struct stat *st)
87 {
88         int option, size;
89         struct cache_entry *ce;
91         /* Was the old index entry already up-to-date? */
92         if (old && !ce_stage(old) && !ce_match_stat(old, st, 0))
93                 return 0;
95         size = cache_entry_size(len);
96         ce = xcalloc(1, size);
97         memcpy(ce->name, path, len);
98         ce->ce_flags = len;
99         fill_stat_cache_info(ce, st);
100         ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
102         if (index_path(ce->sha1, path, st, !info_only))
103                 return -1;
104         option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
105         option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
106         if (add_cache_entry(ce, option))
107                 return error("%s: cannot add to the index - missing --add option?", path);
108         return 0;
111 /*
112  * Handle a path that was a directory. Four cases:
113  *
114  *  - it's already a gitlink in the index, and we keep it that
115  *    way, and update it if we can (if we cannot find the HEAD,
116  *    we're going to keep it unchanged in the index!)
117  *
118  *  - it's a *file* in the index, in which case it should be
119  *    removed as a file if removal is allowed, since it doesn't
120  *    exist as such any more. If removal isn't allowed, it's
121  *    an error.
122  *
123  *    (NOTE! This is old and arguably fairly strange behaviour.
124  *    We might want to make this an error unconditionally, and
125  *    use "--force-remove" if you actually want to force removal).
126  *
127  *  - it used to exist as a subdirectory (ie multiple files with
128  *    this particular prefix) in the index, in which case it's wrong
129  *    to try to update it as a directory.
130  *
131  *  - it doesn't exist at all in the index, but it is a valid
132  *    git directory, and it should be *added* as a gitlink.
133  */
134 static int process_directory(const char *path, int len, struct stat *st)
136         unsigned char sha1[20];
137         int pos = cache_name_pos(path, len);
139         /* Exact match: file or existing gitlink */
140         if (pos >= 0) {
141                 struct cache_entry *ce = active_cache[pos];
142                 if (S_ISGITLINK(ce->ce_mode)) {
144                         /* Do nothing to the index if there is no HEAD! */
145                         if (resolve_gitlink_ref(path, "HEAD", sha1) < 0)
146                                 return 0;
148                         return add_one_path(ce, path, len, st);
149                 }
150                 /* Should this be an unconditional error? */
151                 return remove_one_path(path);
152         }
154         /* Inexact match: is there perhaps a subdirectory match? */
155         pos = -pos-1;
156         while (pos < active_nr) {
157                 struct cache_entry *ce = active_cache[pos++];
159                 if (strncmp(ce->name, path, len))
160                         break;
161                 if (ce->name[len] > '/')
162                         break;
163                 if (ce->name[len] < '/')
164                         continue;
166                 /* Subdirectory match - error out */
167                 return error("%s: is a directory - add individual files instead", path);
168         }
170         /* No match - should we add it as a gitlink? */
171         if (!resolve_gitlink_ref(path, "HEAD", sha1))
172                 return add_one_path(NULL, path, len, st);
174         /* Error out. */
175         return error("%s: is a directory - add files inside instead", path);
178 /*
179  * Process a regular file
180  */
181 static int process_file(const char *path, int len, struct stat *st)
183         int pos = cache_name_pos(path, len);
184         struct cache_entry *ce = pos < 0 ? NULL : active_cache[pos];
186         if (ce && S_ISGITLINK(ce->ce_mode))
187                 return error("%s is already a gitlink, not replacing", path);
189         return add_one_path(ce, path, len, st);
192 static int process_path(const char *path)
194         int len;
195         struct stat st;
197         len = strlen(path);
198         if (has_symlink_leading_path(len, path))
199                 return error("'%s' is beyond a symbolic link", path);
201         /*
202          * First things first: get the stat information, to decide
203          * what to do about the pathname!
204          */
205         if (lstat(path, &st) < 0)
206                 return process_lstat_error(path, errno);
208         if (S_ISDIR(st.st_mode))
209                 return process_directory(path, len, &st);
211         return process_file(path, len, &st);
214 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
215                          const char *path, int stage)
217         int size, len, option;
218         struct cache_entry *ce;
220         if (!verify_path(path))
221                 return -1;
223         len = strlen(path);
224         size = cache_entry_size(len);
225         ce = xcalloc(1, size);
227         hashcpy(ce->sha1, sha1);
228         memcpy(ce->name, path, len);
229         ce->ce_flags = create_ce_flags(len, stage);
230         ce->ce_mode = create_ce_mode(mode);
231         if (assume_unchanged)
232                 ce->ce_flags |= CE_VALID;
233         option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
234         option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
235         if (add_cache_entry(ce, option))
236                 return error("%s: cannot add to the index - missing --add option?",
237                              path);
238         report("add '%s'", path);
239         return 0;
242 static void chmod_path(int flip, const char *path)
244         int pos;
245         struct cache_entry *ce;
246         unsigned int mode;
248         pos = cache_name_pos(path, strlen(path));
249         if (pos < 0)
250                 goto fail;
251         ce = active_cache[pos];
252         mode = ce->ce_mode;
253         if (!S_ISREG(mode))
254                 goto fail;
255         switch (flip) {
256         case '+':
257                 ce->ce_mode |= 0111; break;
258         case '-':
259                 ce->ce_mode &= ~0111; break;
260         default:
261                 goto fail;
262         }
263         cache_tree_invalidate_path(active_cache_tree, path);
264         active_cache_changed = 1;
265         report("chmod %cx '%s'", flip, path);
266         return;
267  fail:
268         die("git-update-index: cannot chmod %cx '%s'", flip, path);
271 static void update_one(const char *path, const char *prefix, int prefix_length)
273         const char *p = prefix_path(prefix, prefix_length, path);
274         if (!verify_path(p)) {
275                 fprintf(stderr, "Ignoring path %s\n", path);
276                 goto free_return;
277         }
278         if (mark_valid_only) {
279                 if (mark_valid(p))
280                         die("Unable to mark file %s", path);
281                 goto free_return;
282         }
284         if (force_remove) {
285                 if (remove_file_from_cache(p))
286                         die("git-update-index: unable to remove %s", path);
287                 report("remove '%s'", path);
288                 goto free_return;
289         }
290         if (process_path(p))
291                 die("Unable to process path %s", path);
292         report("add '%s'", path);
293  free_return:
294         if (p < path || p > path + strlen(path))
295                 free((char*)p);
298 static void read_index_info(int line_termination)
300         struct strbuf buf;
301         struct strbuf uq;
303         strbuf_init(&buf, 0);
304         strbuf_init(&uq, 0);
305         while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
306                 char *ptr, *tab;
307                 char *path_name;
308                 unsigned char sha1[20];
309                 unsigned int mode;
310                 unsigned long ul;
311                 int stage;
313                 /* This reads lines formatted in one of three formats:
314                  *
315                  * (1) mode         SP sha1          TAB path
316                  * The first format is what "git-apply --index-info"
317                  * reports, and used to reconstruct a partial tree
318                  * that is used for phony merge base tree when falling
319                  * back on 3-way merge.
320                  *
321                  * (2) mode SP type SP sha1          TAB path
322                  * The second format is to stuff git-ls-tree output
323                  * into the index file.
324                  *
325                  * (3) mode         SP sha1 SP stage TAB path
326                  * This format is to put higher order stages into the
327                  * index file and matches git-ls-files --stage output.
328                  */
329                 errno = 0;
330                 ul = strtoul(buf.buf, &ptr, 8);
331                 if (ptr == buf.buf || *ptr != ' '
332                     || errno || (unsigned int) ul != ul)
333                         goto bad_line;
334                 mode = ul;
336                 tab = strchr(ptr, '\t');
337                 if (!tab || tab - ptr < 41)
338                         goto bad_line;
340                 if (tab[-2] == ' ' && '0' <= tab[-1] && tab[-1] <= '3') {
341                         stage = tab[-1] - '0';
342                         ptr = tab + 1; /* point at the head of path */
343                         tab = tab - 2; /* point at tail of sha1 */
344                 }
345                 else {
346                         stage = 0;
347                         ptr = tab + 1; /* point at the head of path */
348                 }
350                 if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
351                         goto bad_line;
353                 path_name = ptr;
354                 if (line_termination && path_name[0] == '"') {
355                         strbuf_reset(&uq);
356                         if (unquote_c_style(&uq, path_name, NULL)) {
357                                 die("git-update-index: bad quoting of path name");
358                         }
359                         path_name = uq.buf;
360                 }
362                 if (!verify_path(path_name)) {
363                         fprintf(stderr, "Ignoring path %s\n", path_name);
364                         continue;
365                 }
367                 if (!mode) {
368                         /* mode == 0 means there is no such path -- remove */
369                         if (remove_file_from_cache(path_name))
370                                 die("git-update-index: unable to remove %s",
371                                     ptr);
372                 }
373                 else {
374                         /* mode ' ' sha1 '\t' name
375                          * ptr[-1] points at tab,
376                          * ptr[-41] is at the beginning of sha1
377                          */
378                         ptr[-42] = ptr[-1] = 0;
379                         if (add_cacheinfo(mode, sha1, path_name, stage))
380                                 die("git-update-index: unable to update %s",
381                                     path_name);
382                 }
383                 continue;
385         bad_line:
386                 die("malformed index info %s", buf.buf);
387         }
388         strbuf_release(&buf);
389         strbuf_release(&uq);
392 static const char update_index_usage[] =
393 "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 | -g] [--ignore-missing] [-z] [--verbose] [--] <file>...";
395 static unsigned char head_sha1[20];
396 static unsigned char merge_head_sha1[20];
398 static struct cache_entry *read_one_ent(const char *which,
399                                         unsigned char *ent, const char *path,
400                                         int namelen, int stage)
402         unsigned mode;
403         unsigned char sha1[20];
404         int size;
405         struct cache_entry *ce;
407         if (get_tree_entry(ent, path, sha1, &mode)) {
408                 if (which)
409                         error("%s: not in %s branch.", path, which);
410                 return NULL;
411         }
412         if (mode == S_IFDIR) {
413                 if (which)
414                         error("%s: not a blob in %s branch.", path, which);
415                 return NULL;
416         }
417         size = cache_entry_size(namelen);
418         ce = xcalloc(1, size);
420         hashcpy(ce->sha1, sha1);
421         memcpy(ce->name, path, namelen);
422         ce->ce_flags = create_ce_flags(namelen, stage);
423         ce->ce_mode = create_ce_mode(mode);
424         return ce;
427 static int unresolve_one(const char *path)
429         int namelen = strlen(path);
430         int pos;
431         int ret = 0;
432         struct cache_entry *ce_2 = NULL, *ce_3 = NULL;
434         /* See if there is such entry in the index. */
435         pos = cache_name_pos(path, namelen);
436         if (pos < 0) {
437                 /* If there isn't, either it is unmerged, or
438                  * resolved as "removed" by mistake.  We do not
439                  * want to do anything in the former case.
440                  */
441                 pos = -pos-1;
442                 if (pos < active_nr) {
443                         struct cache_entry *ce = active_cache[pos];
444                         if (ce_namelen(ce) == namelen &&
445                             !memcmp(ce->name, path, namelen)) {
446                                 fprintf(stderr,
447                                         "%s: skipping still unmerged path.\n",
448                                         path);
449                                 goto free_return;
450                         }
451                 }
452         }
454         /* Grab blobs from given path from HEAD and MERGE_HEAD,
455          * stuff HEAD version in stage #2,
456          * stuff MERGE_HEAD version in stage #3.
457          */
458         ce_2 = read_one_ent("our", head_sha1, path, namelen, 2);
459         ce_3 = read_one_ent("their", merge_head_sha1, path, namelen, 3);
461         if (!ce_2 || !ce_3) {
462                 ret = -1;
463                 goto free_return;
464         }
465         if (!hashcmp(ce_2->sha1, ce_3->sha1) &&
466             ce_2->ce_mode == ce_3->ce_mode) {
467                 fprintf(stderr, "%s: identical in both, skipping.\n",
468                         path);
469                 goto free_return;
470         }
472         remove_file_from_cache(path);
473         if (add_cache_entry(ce_2, ADD_CACHE_OK_TO_ADD)) {
474                 error("%s: cannot add our version to the index.", path);
475                 ret = -1;
476                 goto free_return;
477         }
478         if (!add_cache_entry(ce_3, ADD_CACHE_OK_TO_ADD))
479                 return 0;
480         error("%s: cannot add their version to the index.", path);
481         ret = -1;
482  free_return:
483         free(ce_2);
484         free(ce_3);
485         return ret;
488 static void read_head_pointers(void)
490         if (read_ref("HEAD", head_sha1))
491                 die("No HEAD -- no initial commit yet?\n");
492         if (read_ref("MERGE_HEAD", merge_head_sha1)) {
493                 fprintf(stderr, "Not in the middle of a merge.\n");
494                 exit(0);
495         }
498 static int do_unresolve(int ac, const char **av,
499                         const char *prefix, int prefix_length)
501         int i;
502         int err = 0;
504         /* Read HEAD and MERGE_HEAD; if MERGE_HEAD does not exist, we
505          * are not doing a merge, so exit with success status.
506          */
507         read_head_pointers();
509         for (i = 1; i < ac; i++) {
510                 const char *arg = av[i];
511                 const char *p = prefix_path(prefix, prefix_length, arg);
512                 err |= unresolve_one(p);
513                 if (p < arg || p > arg + strlen(arg))
514                         free((char*)p);
515         }
516         return err;
519 static int do_reupdate(int ac, const char **av,
520                        const char *prefix, int prefix_length)
522         /* Read HEAD and run update-index on paths that are
523          * merged and already different between index and HEAD.
524          */
525         int pos;
526         int has_head = 1;
527         const char **pathspec = get_pathspec(prefix, av + 1);
529         if (read_ref("HEAD", head_sha1))
530                 /* If there is no HEAD, that means it is an initial
531                  * commit.  Update everything in the index.
532                  */
533                 has_head = 0;
534  redo:
535         for (pos = 0; pos < active_nr; pos++) {
536                 struct cache_entry *ce = active_cache[pos];
537                 struct cache_entry *old = NULL;
538                 int save_nr;
540                 if (ce_stage(ce) || !ce_path_match(ce, pathspec))
541                         continue;
542                 if (has_head)
543                         old = read_one_ent(NULL, head_sha1,
544                                            ce->name, ce_namelen(ce), 0);
545                 if (old && ce->ce_mode == old->ce_mode &&
546                     !hashcmp(ce->sha1, old->sha1)) {
547                         free(old);
548                         continue; /* unchanged */
549                 }
550                 /* Be careful.  The working tree may not have the
551                  * path anymore, in which case, under 'allow_remove',
552                  * or worse yet 'allow_replace', active_nr may decrease.
553                  */
554                 save_nr = active_nr;
555                 update_one(ce->name + prefix_length, prefix, prefix_length);
556                 if (save_nr != active_nr)
557                         goto redo;
558         }
559         return 0;
562 int cmd_update_index(int argc, const char **argv, const char *prefix)
564         int i, newfd, entries, has_errors = 0, line_termination = '\n';
565         int allow_options = 1;
566         int read_from_stdin = 0;
567         int prefix_length = prefix ? strlen(prefix) : 0;
568         char set_executable_bit = 0;
569         unsigned int refresh_flags = 0;
570         int lock_error = 0;
571         struct lock_file *lock_file;
573         git_config(git_default_config, NULL);
575         /* We can't free this memory, it becomes part of a linked list parsed atexit() */
576         lock_file = xcalloc(1, sizeof(struct lock_file));
578         newfd = hold_locked_index(lock_file, 0);
579         if (newfd < 0)
580                 lock_error = errno;
582         entries = read_cache();
583         if (entries < 0)
584                 die("cache corrupted");
586         for (i = 1 ; i < argc; i++) {
587                 const char *path = argv[i];
588                 const char *p;
590                 if (allow_options && *path == '-') {
591                         if (!strcmp(path, "--")) {
592                                 allow_options = 0;
593                                 continue;
594                         }
595                         if (!strcmp(path, "-q")) {
596                                 refresh_flags |= REFRESH_QUIET;
597                                 continue;
598                         }
599                         if (!strcmp(path, "--ignore-submodules")) {
600                                 refresh_flags |= REFRESH_IGNORE_SUBMODULES;
601                                 continue;
602                         }
603                         if (!strcmp(path, "--add")) {
604                                 allow_add = 1;
605                                 continue;
606                         }
607                         if (!strcmp(path, "--replace")) {
608                                 allow_replace = 1;
609                                 continue;
610                         }
611                         if (!strcmp(path, "--remove")) {
612                                 allow_remove = 1;
613                                 continue;
614                         }
615                         if (!strcmp(path, "--unmerged")) {
616                                 refresh_flags |= REFRESH_UNMERGED;
617                                 continue;
618                         }
619                         if (!strcmp(path, "--refresh")) {
620                                 has_errors |= refresh_cache(refresh_flags);
621                                 continue;
622                         }
623                         if (!strcmp(path, "--really-refresh")) {
624                                 has_errors |= refresh_cache(REFRESH_REALLY | refresh_flags);
625                                 continue;
626                         }
627                         if (!strcmp(path, "--cacheinfo")) {
628                                 unsigned char sha1[20];
629                                 unsigned int mode;
631                                 if (i+3 >= argc)
632                                         die("git-update-index: --cacheinfo <mode> <sha1> <path>");
634                                 if (strtoul_ui(argv[i+1], 8, &mode) ||
635                                     get_sha1_hex(argv[i+2], sha1) ||
636                                     add_cacheinfo(mode, sha1, argv[i+3], 0))
637                                         die("git-update-index: --cacheinfo"
638                                             " cannot add %s", argv[i+3]);
639                                 i += 3;
640                                 continue;
641                         }
642                         if (!strcmp(path, "--chmod=-x") ||
643                             !strcmp(path, "--chmod=+x")) {
644                                 if (argc <= i+1)
645                                         die("git-update-index: %s <path>", path);
646                                 set_executable_bit = path[8];
647                                 continue;
648                         }
649                         if (!strcmp(path, "--assume-unchanged")) {
650                                 mark_valid_only = MARK_VALID;
651                                 continue;
652                         }
653                         if (!strcmp(path, "--no-assume-unchanged")) {
654                                 mark_valid_only = UNMARK_VALID;
655                                 continue;
656                         }
657                         if (!strcmp(path, "--info-only")) {
658                                 info_only = 1;
659                                 continue;
660                         }
661                         if (!strcmp(path, "--force-remove")) {
662                                 force_remove = 1;
663                                 continue;
664                         }
665                         if (!strcmp(path, "-z")) {
666                                 line_termination = 0;
667                                 continue;
668                         }
669                         if (!strcmp(path, "--stdin")) {
670                                 if (i != argc - 1)
671                                         die("--stdin must be at the end");
672                                 read_from_stdin = 1;
673                                 break;
674                         }
675                         if (!strcmp(path, "--index-info")) {
676                                 if (i != argc - 1)
677                                         die("--index-info must be at the end");
678                                 allow_add = allow_replace = allow_remove = 1;
679                                 read_index_info(line_termination);
680                                 break;
681                         }
682                         if (!strcmp(path, "--unresolve")) {
683                                 has_errors = do_unresolve(argc - i, argv + i,
684                                                           prefix, prefix_length);
685                                 if (has_errors)
686                                         active_cache_changed = 0;
687                                 goto finish;
688                         }
689                         if (!strcmp(path, "--again") || !strcmp(path, "-g")) {
690                                 has_errors = do_reupdate(argc - i, argv + i,
691                                                          prefix, prefix_length);
692                                 if (has_errors)
693                                         active_cache_changed = 0;
694                                 goto finish;
695                         }
696                         if (!strcmp(path, "--ignore-missing")) {
697                                 refresh_flags |= REFRESH_IGNORE_MISSING;
698                                 continue;
699                         }
700                         if (!strcmp(path, "--verbose")) {
701                                 verbose = 1;
702                                 continue;
703                         }
704                         if (!strcmp(path, "-h") || !strcmp(path, "--help"))
705                                 usage(update_index_usage);
706                         die("unknown option %s", path);
707                 }
708                 p = prefix_path(prefix, prefix_length, path);
709                 update_one(p, NULL, 0);
710                 if (set_executable_bit)
711                         chmod_path(set_executable_bit, p);
712                 if (p < path || p > path + strlen(path))
713                         free((char*)p);
714         }
715         if (read_from_stdin) {
716                 struct strbuf buf, nbuf;
718                 strbuf_init(&buf, 0);
719                 strbuf_init(&nbuf, 0);
720                 while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
721                         const char *p;
722                         if (line_termination && buf.buf[0] == '"') {
723                                 strbuf_reset(&nbuf);
724                                 if (unquote_c_style(&nbuf, buf.buf, NULL))
725                                         die("line is badly quoted");
726                                 strbuf_swap(&buf, &nbuf);
727                         }
728                         p = prefix_path(prefix, prefix_length, buf.buf);
729                         update_one(p, NULL, 0);
730                         if (set_executable_bit)
731                                 chmod_path(set_executable_bit, p);
732                         if (p < buf.buf || p > buf.buf + buf.len)
733                                 free((char *)p);
734                 }
735                 strbuf_release(&nbuf);
736                 strbuf_release(&buf);
737         }
739  finish:
740         if (active_cache_changed) {
741                 if (newfd < 0) {
742                         if (refresh_flags & REFRESH_QUIET)
743                                 exit(128);
744                         die("unable to create '%s.lock': %s",
745                             get_index_file(), strerror(lock_error));
746                 }
747                 if (write_cache(newfd, active_cache, active_nr) ||
748                     commit_locked_index(lock_file))
749                         die("Unable to write new index file");
750         }
752         rollback_lock_file(lock_file);
754         return has_errors ? 1 : 0;