2 * This handles recursive filename detection with exclude
3 * files, index knowledge etc..
5 * See Documentation/technical/api-directory-listing.txt
7 * Copyright (C) Linus Torvalds, 2005-2006
8 * Junio Hamano, 2005-2006
13 #include "wildmatch.h"
17 #include "ewah/ewok.h"
20 * Tells read_directory_recursive how a file or directory should be treated.
21 * Values are ordered by significance, e.g. if a directory contains both
22 * excluded and untracked files, it is listed as untracked because
23 * path_untracked > path_excluded.
33 * Support data structure for our opendir/readdir/closedir wrappers
37 struct untracked_cache_dir *untracked;
43 struct untracked_cache_dir *ucd;
46 static enum path_treatment read_directory_recursive(struct dir_struct *dir,
47 const char *path, int len, struct untracked_cache_dir *untracked,
48 int check_only, const struct pathspec *pathspec);
49 static int get_dtype(struct dirent *de, const char *path, int len);
51 int fspathcmp(const char *a, const char *b)
53 return ignore_case ? strcasecmp(a, b) : strcmp(a, b);
56 int fspathncmp(const char *a, const char *b, size_t count)
58 return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count);
61 int git_fnmatch(const struct pathspec_item *item,
62 const char *pattern, const char *string,
66 if (ps_strncmp(item, pattern, string, prefix))
71 if (item->flags & PATHSPEC_ONESTAR) {
72 int pattern_len = strlen(++pattern);
73 int string_len = strlen(string);
74 return string_len < pattern_len ||
75 ps_strcmp(item, pattern,
76 string + string_len - pattern_len);
78 if (item->magic & PATHSPEC_GLOB)
79 return wildmatch(pattern, string,
81 (item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0),
84 /* wildmatch has not learned no FNM_PATHNAME mode yet */
85 return wildmatch(pattern, string,
86 item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0,
90 static int fnmatch_icase_mem(const char *pattern, int patternlen,
91 const char *string, int stringlen,
95 struct strbuf pat_buf = STRBUF_INIT;
96 struct strbuf str_buf = STRBUF_INIT;
97 const char *use_pat = pattern;
98 const char *use_str = string;
100 if (pattern[patternlen]) {
101 strbuf_add(&pat_buf, pattern, patternlen);
102 use_pat = pat_buf.buf;
104 if (string[stringlen]) {
105 strbuf_add(&str_buf, string, stringlen);
106 use_str = str_buf.buf;
110 flags |= WM_CASEFOLD;
111 match_status = wildmatch(use_pat, use_str, flags, NULL);
113 strbuf_release(&pat_buf);
114 strbuf_release(&str_buf);
119 static size_t common_prefix_len(const struct pathspec *pathspec)
125 * ":(icase)path" is treated as a pathspec full of
126 * wildcard. In other words, only prefix is considered common
127 * prefix. If the pathspec is abc/foo abc/bar, running in
128 * subdir xyz, the common prefix is still xyz, not xuz/abc as
131 GUARD_PATHSPEC(pathspec,
139 for (n = 0; n < pathspec->nr; n++) {
140 size_t i = 0, len = 0, item_len;
141 if (pathspec->items[n].magic & PATHSPEC_EXCLUDE)
143 if (pathspec->items[n].magic & PATHSPEC_ICASE)
144 item_len = pathspec->items[n].prefix;
146 item_len = pathspec->items[n].nowildcard_len;
147 while (i < item_len && (n == 0 || i < max)) {
148 char c = pathspec->items[n].match[i];
149 if (c != pathspec->items[0].match[i])
155 if (n == 0 || len < max) {
165 * Returns a copy of the longest leading path common among all
168 char *common_prefix(const struct pathspec *pathspec)
170 unsigned long len = common_prefix_len(pathspec);
172 return len ? xmemdupz(pathspec->items[0].match, len) : NULL;
175 int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec)
181 * Calculate common prefix for the pathspec, and
182 * use that to optimize the directory walk
184 prefix = common_prefix(pathspec);
185 prefix_len = prefix ? strlen(prefix) : 0;
187 /* Read the directory and prune it */
188 read_directory(dir, prefix, prefix_len, pathspec);
194 int within_depth(const char *name, int namelen,
195 int depth, int max_depth)
197 const char *cp = name, *cpe = name + namelen;
203 if (depth > max_depth)
209 #define DO_MATCH_EXCLUDE (1<<0)
210 #define DO_MATCH_DIRECTORY (1<<1)
211 #define DO_MATCH_SUBMODULE (1<<2)
214 * Does 'match' match the given name?
215 * A match is found if
217 * (1) the 'match' string is leading directory of 'name', or
218 * (2) the 'match' string is a wildcard and matches 'name', or
219 * (3) the 'match' string is exactly the same as 'name'.
221 * and the return value tells which case it was.
223 * It returns 0 when there is no match.
225 static int match_pathspec_item(const struct pathspec_item *item, int prefix,
226 const char *name, int namelen, unsigned flags)
228 /* name/namelen has prefix cut off by caller */
229 const char *match = item->match + prefix;
230 int matchlen = item->len - prefix;
233 * The normal call pattern is:
234 * 1. prefix = common_prefix_len(ps);
235 * 2. prune something, or fill_directory
236 * 3. match_pathspec()
238 * 'prefix' at #1 may be shorter than the command's prefix and
239 * it's ok for #2 to match extra files. Those extras will be
242 * Suppose the pathspec is 'foo' and '../bar' running from
243 * subdir 'xyz'. The common prefix at #1 will be empty, thanks
244 * to "../". We may have xyz/foo _and_ XYZ/foo after #2. The
245 * user does not want XYZ/foo, only the "foo" part should be
246 * case-insensitive. We need to filter out XYZ/foo here. In
247 * other words, we do not trust the caller on comparing the
248 * prefix part when :(icase) is involved. We do exact
249 * comparison ourselves.
251 * Normally the caller (common_prefix_len() in fact) does
252 * _exact_ matching on name[-prefix+1..-1] and we do not need
253 * to check that part. Be defensive and check it anyway, in
254 * case common_prefix_len is changed, or a new caller is
255 * introduced that does not use common_prefix_len.
257 * If the penalty turns out too high when prefix is really
258 * long, maybe change it to
259 * strncmp(match, name, item->prefix - prefix)
261 if (item->prefix && (item->magic & PATHSPEC_ICASE) &&
262 strncmp(item->match, name - prefix, item->prefix))
265 /* If the match was just the prefix, we matched */
267 return MATCHED_RECURSIVELY;
269 if (matchlen <= namelen && !ps_strncmp(item, match, name, matchlen)) {
270 if (matchlen == namelen)
271 return MATCHED_EXACTLY;
273 if (match[matchlen-1] == '/' || name[matchlen] == '/')
274 return MATCHED_RECURSIVELY;
275 } else if ((flags & DO_MATCH_DIRECTORY) &&
276 match[matchlen - 1] == '/' &&
277 namelen == matchlen - 1 &&
278 !ps_strncmp(item, match, name, namelen))
279 return MATCHED_EXACTLY;
281 if (item->nowildcard_len < item->len &&
282 !git_fnmatch(item, match, name,
283 item->nowildcard_len - prefix))
284 return MATCHED_FNMATCH;
286 /* Perform checks to see if "name" is a super set of the pathspec */
287 if (flags & DO_MATCH_SUBMODULE) {
288 /* name is a literal prefix of the pathspec */
289 if ((namelen < matchlen) &&
290 (match[namelen] == '/') &&
291 !ps_strncmp(item, match, name, namelen))
292 return MATCHED_RECURSIVELY;
294 /* name" doesn't match up to the first wild character */
295 if (item->nowildcard_len < item->len &&
296 ps_strncmp(item, match, name,
297 item->nowildcard_len - prefix))
301 * Here is where we would perform a wildmatch to check if
302 * "name" can be matched as a directory (or a prefix) against
303 * the pathspec. Since wildmatch doesn't have this capability
304 * at the present we have to punt and say that it is a match,
305 * potentially returning a false positive
306 * The submodules themselves will be able to perform more
307 * accurate matching to determine if the pathspec matches.
309 return MATCHED_RECURSIVELY;
316 * Given a name and a list of pathspecs, returns the nature of the
317 * closest (i.e. most specific) match of the name to any of the
320 * The caller typically calls this multiple times with the same
321 * pathspec and seen[] array but with different name/namelen
322 * (e.g. entries from the index) and is interested in seeing if and
323 * how each pathspec matches all the names it calls this function
324 * with. A mark is left in the seen[] array for each pathspec element
325 * indicating the closest type of match that element achieved, so if
326 * seen[n] remains zero after multiple invocations, that means the nth
327 * pathspec did not match any names, which could indicate that the
328 * user mistyped the nth pathspec.
330 static int do_match_pathspec(const struct pathspec *ps,
331 const char *name, int namelen,
332 int prefix, char *seen,
335 int i, retval = 0, exclude = flags & DO_MATCH_EXCLUDE;
346 if (!ps->recursive ||
347 !(ps->magic & PATHSPEC_MAXDEPTH) ||
349 return MATCHED_RECURSIVELY;
351 if (within_depth(name, namelen, 0, ps->max_depth))
352 return MATCHED_EXACTLY;
360 for (i = ps->nr - 1; i >= 0; i--) {
363 if ((!exclude && ps->items[i].magic & PATHSPEC_EXCLUDE) ||
364 ( exclude && !(ps->items[i].magic & PATHSPEC_EXCLUDE)))
367 if (seen && seen[i] == MATCHED_EXACTLY)
370 * Make exclude patterns optional and never report
371 * "pathspec ':(exclude)foo' matches no files"
373 if (seen && ps->items[i].magic & PATHSPEC_EXCLUDE)
374 seen[i] = MATCHED_FNMATCH;
375 how = match_pathspec_item(ps->items+i, prefix, name,
378 (ps->magic & PATHSPEC_MAXDEPTH) &&
379 ps->max_depth != -1 &&
380 how && how != MATCHED_FNMATCH) {
381 int len = ps->items[i].len;
382 if (name[len] == '/')
384 if (within_depth(name+len, namelen-len, 0, ps->max_depth))
385 how = MATCHED_EXACTLY;
392 if (seen && seen[i] < how)
399 int match_pathspec(const struct pathspec *ps,
400 const char *name, int namelen,
401 int prefix, char *seen, int is_dir)
403 int positive, negative;
404 unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0;
405 positive = do_match_pathspec(ps, name, namelen,
406 prefix, seen, flags);
407 if (!(ps->magic & PATHSPEC_EXCLUDE) || !positive)
409 negative = do_match_pathspec(ps, name, namelen,
411 flags | DO_MATCH_EXCLUDE);
412 return negative ? 0 : positive;
416 * Check if a submodule is a superset of the pathspec
418 int submodule_path_match(const struct pathspec *ps,
419 const char *submodule_name,
422 int matched = do_match_pathspec(ps, submodule_name,
423 strlen(submodule_name),
430 int report_path_error(const char *ps_matched,
431 const struct pathspec *pathspec,
435 * Make sure all pathspec matched; otherwise it is an error.
438 for (num = 0; num < pathspec->nr; num++) {
439 int other, found_dup;
444 * The caller might have fed identical pathspec
445 * twice. Do not barf on such a mistake.
446 * FIXME: parse_pathspec should have eliminated
447 * duplicate pathspec.
449 for (found_dup = other = 0;
450 !found_dup && other < pathspec->nr;
452 if (other == num || !ps_matched[other])
454 if (!strcmp(pathspec->items[other].original,
455 pathspec->items[num].original))
457 * Ok, we have a match already.
464 error("pathspec '%s' did not match any file(s) known to git.",
465 pathspec->items[num].original);
472 * Return the length of the "simple" part of a path match limiter.
474 int simple_length(const char *match)
479 unsigned char c = *match++;
481 if (c == '\0' || is_glob_special(c))
486 int no_wildcard(const char *string)
488 return string[simple_length(string)] == '\0';
491 void parse_exclude_pattern(const char **pattern,
496 const char *p = *pattern;
501 *flags |= EXC_FLAG_NEGATIVE;
505 if (len && p[len - 1] == '/') {
507 *flags |= EXC_FLAG_MUSTBEDIR;
509 for (i = 0; i < len; i++) {
514 *flags |= EXC_FLAG_NODIR;
515 *nowildcardlen = simple_length(p);
517 * we should have excluded the trailing slash from 'p' too,
518 * but that's one more allocation. Instead just make sure
519 * nowildcardlen does not exceed real patternlen
521 if (*nowildcardlen > len)
522 *nowildcardlen = len;
523 if (*p == '*' && no_wildcard(p + 1))
524 *flags |= EXC_FLAG_ENDSWITH;
529 void add_exclude(const char *string, const char *base,
530 int baselen, struct exclude_list *el, int srcpos)
537 parse_exclude_pattern(&string, &patternlen, &flags, &nowildcardlen);
538 if (flags & EXC_FLAG_MUSTBEDIR) {
539 FLEXPTR_ALLOC_MEM(x, pattern, string, patternlen);
541 x = xmalloc(sizeof(*x));
544 x->patternlen = patternlen;
545 x->nowildcardlen = nowildcardlen;
547 x->baselen = baselen;
550 ALLOC_GROW(el->excludes, el->nr + 1, el->alloc);
551 el->excludes[el->nr++] = x;
555 static void *read_skip_worktree_file_from_index(const char *path, size_t *size,
556 struct sha1_stat *sha1_stat)
560 enum object_type type;
564 pos = cache_name_pos(path, len);
567 if (!ce_skip_worktree(active_cache[pos]))
569 data = read_sha1_file(active_cache[pos]->oid.hash, &type, &sz);
570 if (!data || type != OBJ_BLOB) {
576 memset(&sha1_stat->stat, 0, sizeof(sha1_stat->stat));
577 hashcpy(sha1_stat->sha1, active_cache[pos]->oid.hash);
583 * Frees memory within el which was allocated for exclude patterns and
584 * the file buffer. Does not free el itself.
586 void clear_exclude_list(struct exclude_list *el)
590 for (i = 0; i < el->nr; i++)
591 free(el->excludes[i]);
595 memset(el, 0, sizeof(*el));
598 static void trim_trailing_spaces(char *buf)
600 char *p, *last_space = NULL;
602 for (p = buf; *p; p++)
622 * Given a subdirectory name and "dir" of the current directory,
623 * search the subdir in "dir" and return it, or create a new one if it
624 * does not exist in "dir".
626 * If "name" has the trailing slash, it'll be excluded in the search.
628 static struct untracked_cache_dir *lookup_untracked(struct untracked_cache *uc,
629 struct untracked_cache_dir *dir,
630 const char *name, int len)
633 struct untracked_cache_dir *d;
636 if (len && name[len - 1] == '/')
640 while (last > first) {
641 int cmp, next = (last + first) >> 1;
643 cmp = strncmp(name, d->name, len);
644 if (!cmp && strlen(d->name) > len)
656 FLEX_ALLOC_MEM(d, name, name, len);
658 ALLOC_GROW(dir->dirs, dir->dirs_nr + 1, dir->dirs_alloc);
659 memmove(dir->dirs + first + 1, dir->dirs + first,
660 (dir->dirs_nr - first) * sizeof(*dir->dirs));
662 dir->dirs[first] = d;
666 static void do_invalidate_gitignore(struct untracked_cache_dir *dir)
670 dir->untracked_nr = 0;
671 for (i = 0; i < dir->dirs_nr; i++)
672 do_invalidate_gitignore(dir->dirs[i]);
675 static void invalidate_gitignore(struct untracked_cache *uc,
676 struct untracked_cache_dir *dir)
678 uc->gitignore_invalidated++;
679 do_invalidate_gitignore(dir);
682 static void invalidate_directory(struct untracked_cache *uc,
683 struct untracked_cache_dir *dir)
686 uc->dir_invalidated++;
688 dir->untracked_nr = 0;
689 for (i = 0; i < dir->dirs_nr; i++)
690 dir->dirs[i]->recurse = 0;
694 * Given a file with name "fname", read it (either from disk, or from
695 * the index if "check_index" is non-zero), parse it and store the
696 * exclude rules in "el".
698 * If "ss" is not NULL, compute SHA-1 of the exclude file and fill
699 * stat data from disk (only valid if add_excludes returns zero). If
700 * ss_valid is non-zero, "ss" must contain good value as input.
702 static int add_excludes(const char *fname, const char *base, int baselen,
703 struct exclude_list *el, int check_index,
704 struct sha1_stat *sha1_stat)
707 int fd, i, lineno = 1;
711 fd = open(fname, O_RDONLY);
712 if (fd < 0 || fstat(fd, &st) < 0) {
714 warn_on_inaccessible(fname);
718 (buf = read_skip_worktree_file_from_index(fname, &size, sha1_stat)) == NULL)
724 if (buf[size-1] != '\n') {
725 buf = xrealloc(buf, st_add(size, 1));
729 size = xsize_t(st.st_size);
732 fill_stat_data(&sha1_stat->stat, &st);
733 hashcpy(sha1_stat->sha1, EMPTY_BLOB_SHA1_BIN);
734 sha1_stat->valid = 1;
739 buf = xmallocz(size);
740 if (read_in_full(fd, buf, size) != size) {
749 if (sha1_stat->valid &&
750 !match_stat_data_racy(&the_index, &sha1_stat->stat, &st))
751 ; /* no content change, ss->sha1 still good */
752 else if (check_index &&
753 (pos = cache_name_pos(fname, strlen(fname))) >= 0 &&
754 !ce_stage(active_cache[pos]) &&
755 ce_uptodate(active_cache[pos]) &&
756 !would_convert_to_git(fname))
757 hashcpy(sha1_stat->sha1,
758 active_cache[pos]->oid.hash);
760 hash_sha1_file(buf, size, "blob", sha1_stat->sha1);
761 fill_stat_data(&sha1_stat->stat, &st);
762 sha1_stat->valid = 1;
768 if (skip_utf8_bom(&buf, size))
769 size -= buf - el->filebuf;
773 for (i = 0; i < size; i++) {
774 if (buf[i] == '\n') {
775 if (entry != buf + i && entry[0] != '#') {
776 buf[i - (i && buf[i-1] == '\r')] = 0;
777 trim_trailing_spaces(entry);
778 add_exclude(entry, base, baselen, el, lineno);
787 int add_excludes_from_file_to_list(const char *fname, const char *base,
788 int baselen, struct exclude_list *el,
791 return add_excludes(fname, base, baselen, el, check_index, NULL);
794 struct exclude_list *add_exclude_list(struct dir_struct *dir,
795 int group_type, const char *src)
797 struct exclude_list *el;
798 struct exclude_list_group *group;
800 group = &dir->exclude_list_group[group_type];
801 ALLOC_GROW(group->el, group->nr + 1, group->alloc);
802 el = &group->el[group->nr++];
803 memset(el, 0, sizeof(*el));
809 * Used to set up core.excludesfile and .git/info/exclude lists.
811 static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname,
812 struct sha1_stat *sha1_stat)
814 struct exclude_list *el;
816 * catch setup_standard_excludes() that's called before
817 * dir->untracked is assigned. That function behaves
818 * differently when dir->untracked is non-NULL.
821 dir->unmanaged_exclude_files++;
822 el = add_exclude_list(dir, EXC_FILE, fname);
823 if (add_excludes(fname, "", 0, el, 0, sha1_stat) < 0)
824 die("cannot use %s as an exclude file", fname);
827 void add_excludes_from_file(struct dir_struct *dir, const char *fname)
829 dir->unmanaged_exclude_files++; /* see validate_untracked_cache() */
830 add_excludes_from_file_1(dir, fname, NULL);
833 int match_basename(const char *basename, int basenamelen,
834 const char *pattern, int prefix, int patternlen,
837 if (prefix == patternlen) {
838 if (patternlen == basenamelen &&
839 !fspathncmp(pattern, basename, basenamelen))
841 } else if (flags & EXC_FLAG_ENDSWITH) {
842 /* "*literal" matching against "fooliteral" */
843 if (patternlen - 1 <= basenamelen &&
844 !fspathncmp(pattern + 1,
845 basename + basenamelen - (patternlen - 1),
849 if (fnmatch_icase_mem(pattern, patternlen,
850 basename, basenamelen,
857 int match_pathname(const char *pathname, int pathlen,
858 const char *base, int baselen,
859 const char *pattern, int prefix, int patternlen,
866 * match with FNM_PATHNAME; the pattern has base implicitly
869 if (*pattern == '/') {
876 * baselen does not count the trailing slash. base[] may or
877 * may not end with a trailing slash though.
879 if (pathlen < baselen + 1 ||
880 (baselen && pathname[baselen] != '/') ||
881 fspathncmp(pathname, base, baselen))
884 namelen = baselen ? pathlen - baselen - 1 : pathlen;
885 name = pathname + pathlen - namelen;
889 * if the non-wildcard part is longer than the
890 * remaining pathname, surely it cannot match.
892 if (prefix > namelen)
895 if (fspathncmp(pattern, name, prefix))
898 patternlen -= prefix;
903 * If the whole pattern did not have a wildcard,
904 * then our prefix match is all we need; we
905 * do not need to call fnmatch at all.
907 if (!patternlen && !namelen)
911 return fnmatch_icase_mem(pattern, patternlen,
917 * Scan the given exclude list in reverse to see whether pathname
918 * should be ignored. The first match (i.e. the last on the list), if
919 * any, determines the fate. Returns the exclude_list element which
920 * matched, or NULL for undecided.
922 static struct exclude *last_exclude_matching_from_list(const char *pathname,
924 const char *basename,
926 struct exclude_list *el)
928 struct exclude *exc = NULL; /* undecided */
932 return NULL; /* undefined */
934 for (i = el->nr - 1; 0 <= i; i--) {
935 struct exclude *x = el->excludes[i];
936 const char *exclude = x->pattern;
937 int prefix = x->nowildcardlen;
939 if (x->flags & EXC_FLAG_MUSTBEDIR) {
940 if (*dtype == DT_UNKNOWN)
941 *dtype = get_dtype(NULL, pathname, pathlen);
942 if (*dtype != DT_DIR)
946 if (x->flags & EXC_FLAG_NODIR) {
947 if (match_basename(basename,
948 pathlen - (basename - pathname),
949 exclude, prefix, x->patternlen,
957 assert(x->baselen == 0 || x->base[x->baselen - 1] == '/');
958 if (match_pathname(pathname, pathlen,
959 x->base, x->baselen ? x->baselen - 1 : 0,
960 exclude, prefix, x->patternlen, x->flags)) {
969 * Scan the list and let the last match determine the fate.
970 * Return 1 for exclude, 0 for include and -1 for undecided.
972 int is_excluded_from_list(const char *pathname,
973 int pathlen, const char *basename, int *dtype,
974 struct exclude_list *el)
976 struct exclude *exclude;
977 exclude = last_exclude_matching_from_list(pathname, pathlen, basename, dtype, el);
979 return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1;
980 return -1; /* undecided */
983 static struct exclude *last_exclude_matching_from_lists(struct dir_struct *dir,
984 const char *pathname, int pathlen, const char *basename,
988 struct exclude_list_group *group;
989 struct exclude *exclude;
990 for (i = EXC_CMDL; i <= EXC_FILE; i++) {
991 group = &dir->exclude_list_group[i];
992 for (j = group->nr - 1; j >= 0; j--) {
993 exclude = last_exclude_matching_from_list(
994 pathname, pathlen, basename, dtype_p,
1004 * Loads the per-directory exclude list for the substring of base
1005 * which has a char length of baselen.
1007 static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
1009 struct exclude_list_group *group;
1010 struct exclude_list *el;
1011 struct exclude_stack *stk = NULL;
1012 struct untracked_cache_dir *untracked;
1015 group = &dir->exclude_list_group[EXC_DIRS];
1018 * Pop the exclude lists from the EXCL_DIRS exclude_list_group
1019 * which originate from directories not in the prefix of the
1020 * path being checked.
1022 while ((stk = dir->exclude_stack) != NULL) {
1023 if (stk->baselen <= baselen &&
1024 !strncmp(dir->basebuf.buf, base, stk->baselen))
1026 el = &group->el[dir->exclude_stack->exclude_ix];
1027 dir->exclude_stack = stk->prev;
1028 dir->exclude = NULL;
1029 free((char *)el->src); /* see strbuf_detach() below */
1030 clear_exclude_list(el);
1035 /* Skip traversing into sub directories if the parent is excluded */
1040 * Lazy initialization. All call sites currently just
1041 * memset(dir, 0, sizeof(*dir)) before use. Changing all of
1042 * them seems lots of work for little benefit.
1044 if (!dir->basebuf.buf)
1045 strbuf_init(&dir->basebuf, PATH_MAX);
1047 /* Read from the parent directories and push them down. */
1048 current = stk ? stk->baselen : -1;
1049 strbuf_setlen(&dir->basebuf, current < 0 ? 0 : current);
1051 untracked = stk ? stk->ucd : dir->untracked->root;
1055 while (current < baselen) {
1057 struct sha1_stat sha1_stat;
1059 stk = xcalloc(1, sizeof(*stk));
1064 cp = strchr(base + current + 1, '/');
1066 die("oops in prep_exclude");
1069 lookup_untracked(dir->untracked, untracked,
1071 cp - base - current);
1073 stk->prev = dir->exclude_stack;
1074 stk->baselen = cp - base;
1075 stk->exclude_ix = group->nr;
1076 stk->ucd = untracked;
1077 el = add_exclude_list(dir, EXC_DIRS, NULL);
1078 strbuf_add(&dir->basebuf, base + current, stk->baselen - current);
1079 assert(stk->baselen == dir->basebuf.len);
1081 /* Abort if the directory is excluded */
1084 dir->basebuf.buf[stk->baselen - 1] = 0;
1085 dir->exclude = last_exclude_matching_from_lists(dir,
1086 dir->basebuf.buf, stk->baselen - 1,
1087 dir->basebuf.buf + current, &dt);
1088 dir->basebuf.buf[stk->baselen - 1] = '/';
1090 dir->exclude->flags & EXC_FLAG_NEGATIVE)
1091 dir->exclude = NULL;
1093 dir->exclude_stack = stk;
1098 /* Try to read per-directory file */
1099 hashclr(sha1_stat.sha1);
1100 sha1_stat.valid = 0;
1101 if (dir->exclude_per_dir &&
1103 * If we know that no files have been added in
1104 * this directory (i.e. valid_cached_dir() has
1105 * been executed and set untracked->valid) ..
1107 (!untracked || !untracked->valid ||
1109 * .. and .gitignore does not exist before
1110 * (i.e. null exclude_sha1). Then we can skip
1111 * loading .gitignore, which would result in
1114 !is_null_sha1(untracked->exclude_sha1))) {
1116 * dir->basebuf gets reused by the traversal, but we
1117 * need fname to remain unchanged to ensure the src
1118 * member of each struct exclude correctly
1119 * back-references its source file. Other invocations
1120 * of add_exclude_list provide stable strings, so we
1121 * strbuf_detach() and free() here in the caller.
1123 struct strbuf sb = STRBUF_INIT;
1124 strbuf_addbuf(&sb, &dir->basebuf);
1125 strbuf_addstr(&sb, dir->exclude_per_dir);
1126 el->src = strbuf_detach(&sb, NULL);
1127 add_excludes(el->src, el->src, stk->baselen, el, 1,
1128 untracked ? &sha1_stat : NULL);
1131 * NEEDSWORK: when untracked cache is enabled, prep_exclude()
1132 * will first be called in valid_cached_dir() then maybe many
1133 * times more in last_exclude_matching(). When the cache is
1134 * used, last_exclude_matching() will not be called and
1135 * reading .gitignore content will be a waste.
1137 * So when it's called by valid_cached_dir() and we can get
1138 * .gitignore SHA-1 from the index (i.e. .gitignore is not
1139 * modified on work tree), we could delay reading the
1140 * .gitignore content until we absolutely need it in
1141 * last_exclude_matching(). Be careful about ignore rule
1142 * order, though, if you do that.
1145 hashcmp(sha1_stat.sha1, untracked->exclude_sha1)) {
1146 invalidate_gitignore(dir->untracked, untracked);
1147 hashcpy(untracked->exclude_sha1, sha1_stat.sha1);
1149 dir->exclude_stack = stk;
1150 current = stk->baselen;
1152 strbuf_setlen(&dir->basebuf, baselen);
1156 * Loads the exclude lists for the directory containing pathname, then
1157 * scans all exclude lists to determine whether pathname is excluded.
1158 * Returns the exclude_list element which matched, or NULL for
1161 struct exclude *last_exclude_matching(struct dir_struct *dir,
1162 const char *pathname,
1165 int pathlen = strlen(pathname);
1166 const char *basename = strrchr(pathname, '/');
1167 basename = (basename) ? basename+1 : pathname;
1169 prep_exclude(dir, pathname, basename-pathname);
1172 return dir->exclude;
1174 return last_exclude_matching_from_lists(dir, pathname, pathlen,
1179 * Loads the exclude lists for the directory containing pathname, then
1180 * scans all exclude lists to determine whether pathname is excluded.
1181 * Returns 1 if true, otherwise 0.
1183 int is_excluded(struct dir_struct *dir, const char *pathname, int *dtype_p)
1185 struct exclude *exclude =
1186 last_exclude_matching(dir, pathname, dtype_p);
1188 return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1;
1192 static struct dir_entry *dir_entry_new(const char *pathname, int len)
1194 struct dir_entry *ent;
1196 FLEX_ALLOC_MEM(ent, name, pathname, len);
1201 static struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len)
1203 if (cache_file_exists(pathname, len, ignore_case))
1206 ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc);
1207 return dir->entries[dir->nr++] = dir_entry_new(pathname, len);
1210 struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len)
1212 if (!cache_name_is_other(pathname, len))
1215 ALLOC_GROW(dir->ignored, dir->ignored_nr+1, dir->ignored_alloc);
1216 return dir->ignored[dir->ignored_nr++] = dir_entry_new(pathname, len);
1220 index_nonexistent = 0,
1226 * Do not use the alphabetically sorted index to look up
1227 * the directory name; instead, use the case insensitive
1230 static enum exist_status directory_exists_in_index_icase(const char *dirname, int len)
1232 struct cache_entry *ce;
1234 if (cache_dir_exists(dirname, len))
1235 return index_directory;
1237 ce = cache_file_exists(dirname, len, ignore_case);
1238 if (ce && S_ISGITLINK(ce->ce_mode))
1239 return index_gitdir;
1241 return index_nonexistent;
1245 * The index sorts alphabetically by entry name, which
1246 * means that a gitlink sorts as '\0' at the end, while
1247 * a directory (which is defined not as an entry, but as
1248 * the files it contains) will sort with the '/' at the
1251 static enum exist_status directory_exists_in_index(const char *dirname, int len)
1256 return directory_exists_in_index_icase(dirname, len);
1258 pos = cache_name_pos(dirname, len);
1261 while (pos < active_nr) {
1262 const struct cache_entry *ce = active_cache[pos++];
1263 unsigned char endchar;
1265 if (strncmp(ce->name, dirname, len))
1267 endchar = ce->name[len];
1271 return index_directory;
1272 if (!endchar && S_ISGITLINK(ce->ce_mode))
1273 return index_gitdir;
1275 return index_nonexistent;
1279 * When we find a directory when traversing the filesystem, we
1280 * have three distinct cases:
1283 * - see it as a directory
1286 * and which one we choose depends on a combination of existing
1287 * git index contents and the flags passed into the directory
1288 * traversal routine.
1290 * Case 1: If we *already* have entries in the index under that
1291 * directory name, we always recurse into the directory to see
1294 * Case 2: If we *already* have that directory name as a gitlink,
1295 * we always continue to see it as a gitlink, regardless of whether
1296 * there is an actual git directory there or not (it might not
1297 * be checked out as a subproject!)
1299 * Case 3: if we didn't have it in the index previously, we
1300 * have a few sub-cases:
1302 * (a) if "show_other_directories" is true, we show it as
1303 * just a directory, unless "hide_empty_directories" is
1304 * also true, in which case we need to check if it contains any
1305 * untracked and / or ignored files.
1306 * (b) if it looks like a git directory, and we don't have
1307 * 'no_gitlinks' set we treat it as a gitlink, and show it
1309 * (c) otherwise, we recurse into it.
1311 static enum path_treatment treat_directory(struct dir_struct *dir,
1312 struct untracked_cache_dir *untracked,
1313 const char *dirname, int len, int baselen, int exclude,
1314 const struct pathspec *pathspec)
1316 /* The "len-1" is to strip the final '/' */
1317 switch (directory_exists_in_index(dirname, len-1)) {
1318 case index_directory:
1319 return path_recurse;
1324 case index_nonexistent:
1325 if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES)
1327 if (!(dir->flags & DIR_NO_GITLINKS)) {
1328 unsigned char sha1[20];
1329 if (resolve_gitlink_ref(dirname, "HEAD", sha1) == 0)
1330 return path_untracked;
1332 return path_recurse;
1335 /* This is the "show_other_directories" case */
1337 if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))
1338 return exclude ? path_excluded : path_untracked;
1340 untracked = lookup_untracked(dir->untracked, untracked,
1341 dirname + baselen, len - baselen);
1342 return read_directory_recursive(dir, dirname, len,
1343 untracked, 1, pathspec);
1347 * This is an inexact early pruning of any recursive directory
1348 * reading - if the path cannot possibly be in the pathspec,
1349 * return true, and we'll skip it early.
1351 static int simplify_away(const char *path, int pathlen,
1352 const struct pathspec *pathspec)
1356 if (!pathspec || !pathspec->nr)
1359 GUARD_PATHSPEC(pathspec,
1367 for (i = 0; i < pathspec->nr; i++) {
1368 const struct pathspec_item *item = &pathspec->items[i];
1369 int len = item->nowildcard_len;
1373 if (!ps_strncmp(item, item->match, path, len))
1381 * This function tells us whether an excluded path matches a
1382 * list of "interesting" pathspecs. That is, whether a path matched
1383 * by any of the pathspecs could possibly be ignored by excluding
1384 * the specified path. This can happen if:
1386 * 1. the path is mentioned explicitly in the pathspec
1388 * 2. the path is a directory prefix of some element in the
1391 static int exclude_matches_pathspec(const char *path, int pathlen,
1392 const struct pathspec *pathspec)
1396 if (!pathspec || !pathspec->nr)
1399 GUARD_PATHSPEC(pathspec,
1407 for (i = 0; i < pathspec->nr; i++) {
1408 const struct pathspec_item *item = &pathspec->items[i];
1409 int len = item->nowildcard_len;
1411 if (len == pathlen &&
1412 !ps_strncmp(item, item->match, path, pathlen))
1414 if (len > pathlen &&
1415 item->match[pathlen] == '/' &&
1416 !ps_strncmp(item, item->match, path, pathlen))
1422 static int get_index_dtype(const char *path, int len)
1425 const struct cache_entry *ce;
1427 ce = cache_file_exists(path, len, 0);
1429 if (!ce_uptodate(ce))
1431 if (S_ISGITLINK(ce->ce_mode))
1434 * Nobody actually cares about the
1435 * difference between DT_LNK and DT_REG
1440 /* Try to look it up as a directory */
1441 pos = cache_name_pos(path, len);
1445 while (pos < active_nr) {
1446 ce = active_cache[pos++];
1447 if (strncmp(ce->name, path, len))
1449 if (ce->name[len] > '/')
1451 if (ce->name[len] < '/')
1453 if (!ce_uptodate(ce))
1454 break; /* continue? */
1460 static int get_dtype(struct dirent *de, const char *path, int len)
1462 int dtype = de ? DTYPE(de) : DT_UNKNOWN;
1465 if (dtype != DT_UNKNOWN)
1467 dtype = get_index_dtype(path, len);
1468 if (dtype != DT_UNKNOWN)
1470 if (lstat(path, &st))
1472 if (S_ISREG(st.st_mode))
1474 if (S_ISDIR(st.st_mode))
1476 if (S_ISLNK(st.st_mode))
1481 static enum path_treatment treat_one_path(struct dir_struct *dir,
1482 struct untracked_cache_dir *untracked,
1483 struct strbuf *path,
1485 const struct pathspec *pathspec,
1486 int dtype, struct dirent *de)
1489 int has_path_in_index = !!cache_file_exists(path->buf, path->len, ignore_case);
1491 if (dtype == DT_UNKNOWN)
1492 dtype = get_dtype(de, path->buf, path->len);
1494 /* Always exclude indexed files */
1495 if (dtype != DT_DIR && has_path_in_index)
1499 * When we are looking at a directory P in the working tree,
1500 * there are three cases:
1502 * (1) P exists in the index. Everything inside the directory P in
1503 * the working tree needs to go when P is checked out from the
1506 * (2) P does not exist in the index, but there is P/Q in the index.
1507 * We know P will stay a directory when we check out the contents
1508 * of the index, but we do not know yet if there is a directory
1509 * P/Q in the working tree to be killed, so we need to recurse.
1511 * (3) P does not exist in the index, and there is no P/Q in the index
1512 * to require P to be a directory, either. Only in this case, we
1513 * know that everything inside P will not be killed without
1516 if ((dir->flags & DIR_COLLECT_KILLED_ONLY) &&
1517 (dtype == DT_DIR) &&
1518 !has_path_in_index &&
1519 (directory_exists_in_index(path->buf, path->len) == index_nonexistent))
1522 exclude = is_excluded(dir, path->buf, &dtype);
1525 * Excluded? If we don't explicitly want to show
1526 * ignored files, ignore it
1528 if (exclude && !(dir->flags & (DIR_SHOW_IGNORED|DIR_SHOW_IGNORED_TOO)))
1529 return path_excluded;
1535 strbuf_addch(path, '/');
1536 return treat_directory(dir, untracked, path->buf, path->len,
1537 baselen, exclude, pathspec);
1540 return exclude ? path_excluded : path_untracked;
1544 static enum path_treatment treat_path_fast(struct dir_struct *dir,
1545 struct untracked_cache_dir *untracked,
1546 struct cached_dir *cdir,
1547 struct strbuf *path,
1549 const struct pathspec *pathspec)
1551 strbuf_setlen(path, baselen);
1553 strbuf_addstr(path, cdir->file);
1554 return path_untracked;
1556 strbuf_addstr(path, cdir->ucd->name);
1557 /* treat_one_path() does this before it calls treat_directory() */
1558 strbuf_complete(path, '/');
1559 if (cdir->ucd->check_only)
1561 * check_only is set as a result of treat_directory() getting
1562 * to its bottom. Verify again the same set of directories
1563 * with check_only set.
1565 return read_directory_recursive(dir, path->buf, path->len,
1566 cdir->ucd, 1, pathspec);
1568 * We get path_recurse in the first run when
1569 * directory_exists_in_index() returns index_nonexistent. We
1570 * are sure that new changes in the index does not impact the
1571 * outcome. Return now.
1573 return path_recurse;
1576 static enum path_treatment treat_path(struct dir_struct *dir,
1577 struct untracked_cache_dir *untracked,
1578 struct cached_dir *cdir,
1579 struct strbuf *path,
1581 const struct pathspec *pathspec)
1584 struct dirent *de = cdir->de;
1587 return treat_path_fast(dir, untracked, cdir, path,
1589 if (is_dot_or_dotdot(de->d_name) || !strcmp(de->d_name, ".git"))
1591 strbuf_setlen(path, baselen);
1592 strbuf_addstr(path, de->d_name);
1593 if (simplify_away(path->buf, path->len, pathspec))
1597 return treat_one_path(dir, untracked, path, baselen, pathspec, dtype, de);
1600 static void add_untracked(struct untracked_cache_dir *dir, const char *name)
1604 ALLOC_GROW(dir->untracked, dir->untracked_nr + 1,
1605 dir->untracked_alloc);
1606 dir->untracked[dir->untracked_nr++] = xstrdup(name);
1609 static int valid_cached_dir(struct dir_struct *dir,
1610 struct untracked_cache_dir *untracked,
1611 struct strbuf *path,
1619 if (stat(path->len ? path->buf : ".", &st)) {
1620 invalidate_directory(dir->untracked, untracked);
1621 memset(&untracked->stat_data, 0, sizeof(untracked->stat_data));
1624 if (!untracked->valid ||
1625 match_stat_data_racy(&the_index, &untracked->stat_data, &st)) {
1626 if (untracked->valid)
1627 invalidate_directory(dir->untracked, untracked);
1628 fill_stat_data(&untracked->stat_data, &st);
1632 if (untracked->check_only != !!check_only) {
1633 invalidate_directory(dir->untracked, untracked);
1638 * prep_exclude will be called eventually on this directory,
1639 * but it's called much later in last_exclude_matching(). We
1640 * need it now to determine the validity of the cache for this
1641 * path. The next calls will be nearly no-op, the way
1642 * prep_exclude() is designed.
1644 if (path->len && path->buf[path->len - 1] != '/') {
1645 strbuf_addch(path, '/');
1646 prep_exclude(dir, path->buf, path->len);
1647 strbuf_setlen(path, path->len - 1);
1649 prep_exclude(dir, path->buf, path->len);
1651 /* hopefully prep_exclude() haven't invalidated this entry... */
1652 return untracked->valid;
1655 static int open_cached_dir(struct cached_dir *cdir,
1656 struct dir_struct *dir,
1657 struct untracked_cache_dir *untracked,
1658 struct strbuf *path,
1661 memset(cdir, 0, sizeof(*cdir));
1662 cdir->untracked = untracked;
1663 if (valid_cached_dir(dir, untracked, path, check_only))
1665 cdir->fdir = opendir(path->len ? path->buf : ".");
1667 dir->untracked->dir_opened++;
1673 static int read_cached_dir(struct cached_dir *cdir)
1676 cdir->de = readdir(cdir->fdir);
1681 while (cdir->nr_dirs < cdir->untracked->dirs_nr) {
1682 struct untracked_cache_dir *d = cdir->untracked->dirs[cdir->nr_dirs];
1692 if (cdir->nr_files < cdir->untracked->untracked_nr) {
1693 struct untracked_cache_dir *d = cdir->untracked;
1694 cdir->file = d->untracked[cdir->nr_files++];
1700 static void close_cached_dir(struct cached_dir *cdir)
1703 closedir(cdir->fdir);
1705 * We have gone through this directory and found no untracked
1706 * entries. Mark it valid.
1708 if (cdir->untracked) {
1709 cdir->untracked->valid = 1;
1710 cdir->untracked->recurse = 1;
1715 * Read a directory tree. We currently ignore anything but
1716 * directories, regular files and symlinks. That's because git
1717 * doesn't handle them at all yet. Maybe that will change some
1720 * Also, we ignore the name ".git" (even if it is not a directory).
1721 * That likely will not change.
1723 * Returns the most significant path_treatment value encountered in the scan.
1725 static enum path_treatment read_directory_recursive(struct dir_struct *dir,
1726 const char *base, int baselen,
1727 struct untracked_cache_dir *untracked, int check_only,
1728 const struct pathspec *pathspec)
1730 struct cached_dir cdir;
1731 enum path_treatment state, subdir_state, dir_state = path_none;
1732 struct strbuf path = STRBUF_INIT;
1734 strbuf_add(&path, base, baselen);
1736 if (open_cached_dir(&cdir, dir, untracked, &path, check_only))
1740 untracked->check_only = !!check_only;
1742 while (!read_cached_dir(&cdir)) {
1743 /* check how the file or directory should be treated */
1744 state = treat_path(dir, untracked, &cdir, &path,
1747 if (state > dir_state)
1750 /* recurse into subdir if instructed by treat_path */
1751 if (state == path_recurse) {
1752 struct untracked_cache_dir *ud;
1753 ud = lookup_untracked(dir->untracked, untracked,
1755 path.len - baselen);
1757 read_directory_recursive(dir, path.buf,
1759 check_only, pathspec);
1760 if (subdir_state > dir_state)
1761 dir_state = subdir_state;
1765 /* abort early if maximum state has been reached */
1766 if (dir_state == path_untracked) {
1768 add_untracked(untracked, path.buf + baselen);
1771 /* skip the dir_add_* part */
1775 /* add the path to the appropriate result list */
1778 if (dir->flags & DIR_SHOW_IGNORED)
1779 dir_add_name(dir, path.buf, path.len);
1780 else if ((dir->flags & DIR_SHOW_IGNORED_TOO) ||
1781 ((dir->flags & DIR_COLLECT_IGNORED) &&
1782 exclude_matches_pathspec(path.buf, path.len,
1784 dir_add_ignored(dir, path.buf, path.len);
1787 case path_untracked:
1788 if (dir->flags & DIR_SHOW_IGNORED)
1790 dir_add_name(dir, path.buf, path.len);
1792 add_untracked(untracked, path.buf + baselen);
1799 close_cached_dir(&cdir);
1801 strbuf_release(&path);
1806 static int cmp_name(const void *p1, const void *p2)
1808 const struct dir_entry *e1 = *(const struct dir_entry **)p1;
1809 const struct dir_entry *e2 = *(const struct dir_entry **)p2;
1811 return name_compare(e1->name, e1->len, e2->name, e2->len);
1814 static int treat_leading_path(struct dir_struct *dir,
1815 const char *path, int len,
1816 const struct pathspec *pathspec)
1818 struct strbuf sb = STRBUF_INIT;
1819 int baselen, rc = 0;
1821 int old_flags = dir->flags;
1823 while (len && path[len - 1] == '/')
1828 dir->flags &= ~DIR_SHOW_OTHER_DIRECTORIES;
1830 cp = path + baselen + !!baselen;
1831 cp = memchr(cp, '/', path + len - cp);
1835 baselen = cp - path;
1836 strbuf_setlen(&sb, 0);
1837 strbuf_add(&sb, path, baselen);
1838 if (!is_directory(sb.buf))
1840 if (simplify_away(sb.buf, sb.len, pathspec))
1842 if (treat_one_path(dir, NULL, &sb, baselen, pathspec,
1843 DT_DIR, NULL) == path_none)
1844 break; /* do not recurse into it */
1845 if (len <= baselen) {
1847 break; /* finished checking */
1850 strbuf_release(&sb);
1851 dir->flags = old_flags;
1855 static const char *get_ident_string(void)
1857 static struct strbuf sb = STRBUF_INIT;
1862 if (uname(&uts) < 0)
1863 die_errno(_("failed to get kernel name and information"));
1864 strbuf_addf(&sb, "Location %s, system %s", get_git_work_tree(),
1869 static int ident_in_untracked(const struct untracked_cache *uc)
1872 * Previous git versions may have saved many NUL separated
1873 * strings in the "ident" field, but it is insane to manage
1874 * many locations, so just take care of the first one.
1877 return !strcmp(uc->ident.buf, get_ident_string());
1880 static void set_untracked_ident(struct untracked_cache *uc)
1882 strbuf_reset(&uc->ident);
1883 strbuf_addstr(&uc->ident, get_ident_string());
1886 * This strbuf used to contain a list of NUL separated
1887 * strings, so save NUL too for backward compatibility.
1889 strbuf_addch(&uc->ident, 0);
1892 static void new_untracked_cache(struct index_state *istate)
1894 struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
1895 strbuf_init(&uc->ident, 100);
1896 uc->exclude_per_dir = ".gitignore";
1897 /* should be the same flags used by git-status */
1898 uc->dir_flags = DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
1899 set_untracked_ident(uc);
1900 istate->untracked = uc;
1901 istate->cache_changed |= UNTRACKED_CHANGED;
1904 void add_untracked_cache(struct index_state *istate)
1906 if (!istate->untracked) {
1907 new_untracked_cache(istate);
1909 if (!ident_in_untracked(istate->untracked)) {
1910 free_untracked_cache(istate->untracked);
1911 new_untracked_cache(istate);
1916 void remove_untracked_cache(struct index_state *istate)
1918 if (istate->untracked) {
1919 free_untracked_cache(istate->untracked);
1920 istate->untracked = NULL;
1921 istate->cache_changed |= UNTRACKED_CHANGED;
1925 static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *dir,
1927 const struct pathspec *pathspec)
1929 struct untracked_cache_dir *root;
1931 if (!dir->untracked || getenv("GIT_DISABLE_UNTRACKED_CACHE"))
1935 * We only support $GIT_DIR/info/exclude and core.excludesfile
1936 * as the global ignore rule files. Any other additions
1937 * (e.g. from command line) invalidate the cache. This
1938 * condition also catches running setup_standard_excludes()
1939 * before setting dir->untracked!
1941 if (dir->unmanaged_exclude_files)
1945 * Optimize for the main use case only: whole-tree git
1946 * status. More work involved in treat_leading_path() if we
1947 * use cache on just a subset of the worktree. pathspec
1948 * support could make the matter even worse.
1950 if (base_len || (pathspec && pathspec->nr))
1953 /* Different set of flags may produce different results */
1954 if (dir->flags != dir->untracked->dir_flags ||
1956 * See treat_directory(), case index_nonexistent. Without
1957 * this flag, we may need to also cache .git file content
1958 * for the resolve_gitlink_ref() call, which we don't.
1960 !(dir->flags & DIR_SHOW_OTHER_DIRECTORIES) ||
1961 /* We don't support collecting ignore files */
1962 (dir->flags & (DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO |
1963 DIR_COLLECT_IGNORED)))
1967 * If we use .gitignore in the cache and now you change it to
1968 * .gitexclude, everything will go wrong.
1970 if (dir->exclude_per_dir != dir->untracked->exclude_per_dir &&
1971 strcmp(dir->exclude_per_dir, dir->untracked->exclude_per_dir))
1975 * EXC_CMDL is not considered in the cache. If people set it,
1978 if (dir->exclude_list_group[EXC_CMDL].nr)
1981 if (!ident_in_untracked(dir->untracked)) {
1982 warning(_("Untracked cache is disabled on this system or location."));
1986 if (!dir->untracked->root) {
1987 const int len = sizeof(*dir->untracked->root);
1988 dir->untracked->root = xmalloc(len);
1989 memset(dir->untracked->root, 0, len);
1992 /* Validate $GIT_DIR/info/exclude and core.excludesfile */
1993 root = dir->untracked->root;
1994 if (hashcmp(dir->ss_info_exclude.sha1,
1995 dir->untracked->ss_info_exclude.sha1)) {
1996 invalidate_gitignore(dir->untracked, root);
1997 dir->untracked->ss_info_exclude = dir->ss_info_exclude;
1999 if (hashcmp(dir->ss_excludes_file.sha1,
2000 dir->untracked->ss_excludes_file.sha1)) {
2001 invalidate_gitignore(dir->untracked, root);
2002 dir->untracked->ss_excludes_file = dir->ss_excludes_file;
2005 /* Make sure this directory is not dropped out at saving phase */
2010 int read_directory(struct dir_struct *dir, const char *path,
2011 int len, const struct pathspec *pathspec)
2013 struct untracked_cache_dir *untracked;
2015 if (has_symlink_leading_path(path, len))
2018 untracked = validate_untracked_cache(dir, len, pathspec);
2021 * make sure untracked cache code path is disabled,
2022 * e.g. prep_exclude()
2024 dir->untracked = NULL;
2025 if (!len || treat_leading_path(dir, path, len, pathspec))
2026 read_directory_recursive(dir, path, len, untracked, 0, pathspec);
2027 QSORT(dir->entries, dir->nr, cmp_name);
2028 QSORT(dir->ignored, dir->ignored_nr, cmp_name);
2029 if (dir->untracked) {
2030 static struct trace_key trace_untracked_stats = TRACE_KEY_INIT(UNTRACKED_STATS);
2031 trace_printf_key(&trace_untracked_stats,
2032 "node creation: %u\n"
2033 "gitignore invalidation: %u\n"
2034 "directory invalidation: %u\n"
2036 dir->untracked->dir_created,
2037 dir->untracked->gitignore_invalidated,
2038 dir->untracked->dir_invalidated,
2039 dir->untracked->dir_opened);
2040 if (dir->untracked == the_index.untracked &&
2041 (dir->untracked->dir_opened ||
2042 dir->untracked->gitignore_invalidated ||
2043 dir->untracked->dir_invalidated))
2044 the_index.cache_changed |= UNTRACKED_CHANGED;
2045 if (dir->untracked != the_index.untracked) {
2046 free(dir->untracked);
2047 dir->untracked = NULL;
2053 int file_exists(const char *f)
2056 return lstat(f, &sb) == 0;
2059 static int cmp_icase(char a, char b)
2064 return toupper(a) - toupper(b);
2069 * Given two normalized paths (a trailing slash is ok), if subdir is
2070 * outside dir, return -1. Otherwise return the offset in subdir that
2071 * can be used as relative path to dir.
2073 int dir_inside_of(const char *subdir, const char *dir)
2077 assert(dir && subdir && *dir && *subdir);
2079 while (*dir && *subdir && !cmp_icase(*dir, *subdir)) {
2085 /* hel[p]/me vs hel[l]/yeah */
2086 if (*dir && *subdir)
2090 return !*dir ? offset : -1; /* same dir */
2092 /* foo/[b]ar vs foo/[] */
2093 if (is_dir_sep(dir[-1]))
2094 return is_dir_sep(subdir[-1]) ? offset : -1;
2096 /* foo[/]bar vs foo[] */
2097 return is_dir_sep(*subdir) ? offset + 1 : -1;
2100 int is_inside_dir(const char *dir)
2109 rc = (dir_inside_of(cwd, dir) >= 0);
2114 int is_empty_dir(const char *path)
2116 DIR *dir = opendir(path);
2123 while ((e = readdir(dir)) != NULL)
2124 if (!is_dot_or_dotdot(e->d_name)) {
2133 static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
2137 int ret = 0, original_len = path->len, len, kept_down = 0;
2138 int only_empty = (flag & REMOVE_DIR_EMPTY_ONLY);
2139 int keep_toplevel = (flag & REMOVE_DIR_KEEP_TOPLEVEL);
2140 unsigned char submodule_head[20];
2142 if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
2143 !resolve_gitlink_ref(path->buf, "HEAD", submodule_head)) {
2144 /* Do not descend and nuke a nested git work tree. */
2150 flag &= ~REMOVE_DIR_KEEP_TOPLEVEL;
2151 dir = opendir(path->buf);
2153 if (errno == ENOENT)
2154 return keep_toplevel ? -1 : 0;
2155 else if (errno == EACCES && !keep_toplevel)
2157 * An empty dir could be removable even if it
2160 return rmdir(path->buf);
2164 strbuf_complete(path, '/');
2167 while ((e = readdir(dir)) != NULL) {
2169 if (is_dot_or_dotdot(e->d_name))
2172 strbuf_setlen(path, len);
2173 strbuf_addstr(path, e->d_name);
2174 if (lstat(path->buf, &st)) {
2175 if (errno == ENOENT)
2177 * file disappeared, which is what we
2182 } else if (S_ISDIR(st.st_mode)) {
2183 if (!remove_dir_recurse(path, flag, &kept_down))
2184 continue; /* happy */
2185 } else if (!only_empty &&
2186 (!unlink(path->buf) || errno == ENOENT)) {
2187 continue; /* happy, too */
2190 /* path too long, stat fails, or non-directory still exists */
2196 strbuf_setlen(path, original_len);
2197 if (!ret && !keep_toplevel && !kept_down)
2198 ret = (!rmdir(path->buf) || errno == ENOENT) ? 0 : -1;
2201 * report the uplevel that it is not an error that we
2202 * did not rmdir() our directory.
2208 int remove_dir_recursively(struct strbuf *path, int flag)
2210 return remove_dir_recurse(path, flag, NULL);
2213 static GIT_PATH_FUNC(git_path_info_exclude, "info/exclude")
2215 void setup_standard_excludes(struct dir_struct *dir)
2217 dir->exclude_per_dir = ".gitignore";
2219 /* core.excludefile defaulting to $XDG_HOME/git/ignore */
2221 excludes_file = xdg_config_home("ignore");
2222 if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))
2223 add_excludes_from_file_1(dir, excludes_file,
2224 dir->untracked ? &dir->ss_excludes_file : NULL);
2226 /* per repository user preference */
2227 if (startup_info->have_repository) {
2228 const char *path = git_path_info_exclude();
2229 if (!access_or_warn(path, R_OK, 0))
2230 add_excludes_from_file_1(dir, path,
2231 dir->untracked ? &dir->ss_info_exclude : NULL);
2235 int remove_path(const char *name)
2239 if (unlink(name) && errno != ENOENT && errno != ENOTDIR)
2242 slash = strrchr(name, '/');
2244 char *dirs = xstrdup(name);
2245 slash = dirs + (slash - name);
2248 } while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/')));
2255 * Frees memory within dir which was allocated for exclude lists and
2256 * the exclude_stack. Does not free dir itself.
2258 void clear_directory(struct dir_struct *dir)
2261 struct exclude_list_group *group;
2262 struct exclude_list *el;
2263 struct exclude_stack *stk;
2265 for (i = EXC_CMDL; i <= EXC_FILE; i++) {
2266 group = &dir->exclude_list_group[i];
2267 for (j = 0; j < group->nr; j++) {
2270 free((char *)el->src);
2271 clear_exclude_list(el);
2276 stk = dir->exclude_stack;
2278 struct exclude_stack *prev = stk->prev;
2282 strbuf_release(&dir->basebuf);
2285 struct ondisk_untracked_cache {
2286 struct stat_data info_exclude_stat;
2287 struct stat_data excludes_file_stat;
2289 unsigned char info_exclude_sha1[20];
2290 unsigned char excludes_file_sha1[20];
2291 char exclude_per_dir[FLEX_ARRAY];
2294 #define ouc_size(len) (offsetof(struct ondisk_untracked_cache, exclude_per_dir) + len + 1)
2297 int index; /* number of written untracked_cache_dir */
2298 struct ewah_bitmap *check_only; /* from untracked_cache_dir */
2299 struct ewah_bitmap *valid; /* from untracked_cache_dir */
2300 struct ewah_bitmap *sha1_valid; /* set if exclude_sha1 is not null */
2302 struct strbuf sb_stat;
2303 struct strbuf sb_sha1;
2306 static void stat_data_to_disk(struct stat_data *to, const struct stat_data *from)
2308 to->sd_ctime.sec = htonl(from->sd_ctime.sec);
2309 to->sd_ctime.nsec = htonl(from->sd_ctime.nsec);
2310 to->sd_mtime.sec = htonl(from->sd_mtime.sec);
2311 to->sd_mtime.nsec = htonl(from->sd_mtime.nsec);
2312 to->sd_dev = htonl(from->sd_dev);
2313 to->sd_ino = htonl(from->sd_ino);
2314 to->sd_uid = htonl(from->sd_uid);
2315 to->sd_gid = htonl(from->sd_gid);
2316 to->sd_size = htonl(from->sd_size);
2319 static void write_one_dir(struct untracked_cache_dir *untracked,
2320 struct write_data *wd)
2322 struct stat_data stat_data;
2323 struct strbuf *out = &wd->out;
2324 unsigned char intbuf[16];
2325 unsigned int intlen, value;
2326 int i = wd->index++;
2329 * untracked_nr should be reset whenever valid is clear, but
2332 if (!untracked->valid) {
2333 untracked->untracked_nr = 0;
2334 untracked->check_only = 0;
2337 if (untracked->check_only)
2338 ewah_set(wd->check_only, i);
2339 if (untracked->valid) {
2340 ewah_set(wd->valid, i);
2341 stat_data_to_disk(&stat_data, &untracked->stat_data);
2342 strbuf_add(&wd->sb_stat, &stat_data, sizeof(stat_data));
2344 if (!is_null_sha1(untracked->exclude_sha1)) {
2345 ewah_set(wd->sha1_valid, i);
2346 strbuf_add(&wd->sb_sha1, untracked->exclude_sha1, 20);
2349 intlen = encode_varint(untracked->untracked_nr, intbuf);
2350 strbuf_add(out, intbuf, intlen);
2352 /* skip non-recurse directories */
2353 for (i = 0, value = 0; i < untracked->dirs_nr; i++)
2354 if (untracked->dirs[i]->recurse)
2356 intlen = encode_varint(value, intbuf);
2357 strbuf_add(out, intbuf, intlen);
2359 strbuf_add(out, untracked->name, strlen(untracked->name) + 1);
2361 for (i = 0; i < untracked->untracked_nr; i++)
2362 strbuf_add(out, untracked->untracked[i],
2363 strlen(untracked->untracked[i]) + 1);
2365 for (i = 0; i < untracked->dirs_nr; i++)
2366 if (untracked->dirs[i]->recurse)
2367 write_one_dir(untracked->dirs[i], wd);
2370 void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked)
2372 struct ondisk_untracked_cache *ouc;
2373 struct write_data wd;
2374 unsigned char varbuf[16];
2376 size_t len = strlen(untracked->exclude_per_dir);
2378 FLEX_ALLOC_MEM(ouc, exclude_per_dir, untracked->exclude_per_dir, len);
2379 stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclude.stat);
2380 stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_file.stat);
2381 hashcpy(ouc->info_exclude_sha1, untracked->ss_info_exclude.sha1);
2382 hashcpy(ouc->excludes_file_sha1, untracked->ss_excludes_file.sha1);
2383 ouc->dir_flags = htonl(untracked->dir_flags);
2385 varint_len = encode_varint(untracked->ident.len, varbuf);
2386 strbuf_add(out, varbuf, varint_len);
2387 strbuf_addbuf(out, &untracked->ident);
2389 strbuf_add(out, ouc, ouc_size(len));
2393 if (!untracked->root) {
2394 varint_len = encode_varint(0, varbuf);
2395 strbuf_add(out, varbuf, varint_len);
2400 wd.check_only = ewah_new();
2401 wd.valid = ewah_new();
2402 wd.sha1_valid = ewah_new();
2403 strbuf_init(&wd.out, 1024);
2404 strbuf_init(&wd.sb_stat, 1024);
2405 strbuf_init(&wd.sb_sha1, 1024);
2406 write_one_dir(untracked->root, &wd);
2408 varint_len = encode_varint(wd.index, varbuf);
2409 strbuf_add(out, varbuf, varint_len);
2410 strbuf_addbuf(out, &wd.out);
2411 ewah_serialize_strbuf(wd.valid, out);
2412 ewah_serialize_strbuf(wd.check_only, out);
2413 ewah_serialize_strbuf(wd.sha1_valid, out);
2414 strbuf_addbuf(out, &wd.sb_stat);
2415 strbuf_addbuf(out, &wd.sb_sha1);
2416 strbuf_addch(out, '\0'); /* safe guard for string lists */
2418 ewah_free(wd.valid);
2419 ewah_free(wd.check_only);
2420 ewah_free(wd.sha1_valid);
2421 strbuf_release(&wd.out);
2422 strbuf_release(&wd.sb_stat);
2423 strbuf_release(&wd.sb_sha1);
2426 static void free_untracked(struct untracked_cache_dir *ucd)
2431 for (i = 0; i < ucd->dirs_nr; i++)
2432 free_untracked(ucd->dirs[i]);
2433 for (i = 0; i < ucd->untracked_nr; i++)
2434 free(ucd->untracked[i]);
2435 free(ucd->untracked);
2440 void free_untracked_cache(struct untracked_cache *uc)
2443 free_untracked(uc->root);
2449 struct untracked_cache_dir **ucd;
2450 struct ewah_bitmap *check_only;
2451 struct ewah_bitmap *valid;
2452 struct ewah_bitmap *sha1_valid;
2453 const unsigned char *data;
2454 const unsigned char *end;
2457 static void stat_data_from_disk(struct stat_data *to, const struct stat_data *from)
2459 to->sd_ctime.sec = get_be32(&from->sd_ctime.sec);
2460 to->sd_ctime.nsec = get_be32(&from->sd_ctime.nsec);
2461 to->sd_mtime.sec = get_be32(&from->sd_mtime.sec);
2462 to->sd_mtime.nsec = get_be32(&from->sd_mtime.nsec);
2463 to->sd_dev = get_be32(&from->sd_dev);
2464 to->sd_ino = get_be32(&from->sd_ino);
2465 to->sd_uid = get_be32(&from->sd_uid);
2466 to->sd_gid = get_be32(&from->sd_gid);
2467 to->sd_size = get_be32(&from->sd_size);
2470 static int read_one_dir(struct untracked_cache_dir **untracked_,
2471 struct read_data *rd)
2473 struct untracked_cache_dir ud, *untracked;
2474 const unsigned char *next, *data = rd->data, *end = rd->end;
2478 memset(&ud, 0, sizeof(ud));
2481 value = decode_varint(&next);
2485 ud.untracked_alloc = value;
2486 ud.untracked_nr = value;
2487 if (ud.untracked_nr)
2488 ALLOC_ARRAY(ud.untracked, ud.untracked_nr);
2492 ud.dirs_alloc = ud.dirs_nr = decode_varint(&next);
2495 ALLOC_ARRAY(ud.dirs, ud.dirs_nr);
2498 len = strlen((const char *)data);
2499 next = data + len + 1;
2502 *untracked_ = untracked = xmalloc(st_add(sizeof(*untracked), len));
2503 memcpy(untracked, &ud, sizeof(ud));
2504 memcpy(untracked->name, data, len + 1);
2507 for (i = 0; i < untracked->untracked_nr; i++) {
2508 len = strlen((const char *)data);
2509 next = data + len + 1;
2512 untracked->untracked[i] = xstrdup((const char*)data);
2516 rd->ucd[rd->index++] = untracked;
2519 for (i = 0; i < untracked->dirs_nr; i++) {
2520 len = read_one_dir(untracked->dirs + i, rd);
2527 static void set_check_only(size_t pos, void *cb)
2529 struct read_data *rd = cb;
2530 struct untracked_cache_dir *ud = rd->ucd[pos];
2534 static void read_stat(size_t pos, void *cb)
2536 struct read_data *rd = cb;
2537 struct untracked_cache_dir *ud = rd->ucd[pos];
2538 if (rd->data + sizeof(struct stat_data) > rd->end) {
2539 rd->data = rd->end + 1;
2542 stat_data_from_disk(&ud->stat_data, (struct stat_data *)rd->data);
2543 rd->data += sizeof(struct stat_data);
2547 static void read_sha1(size_t pos, void *cb)
2549 struct read_data *rd = cb;
2550 struct untracked_cache_dir *ud = rd->ucd[pos];
2551 if (rd->data + 20 > rd->end) {
2552 rd->data = rd->end + 1;
2555 hashcpy(ud->exclude_sha1, rd->data);
2559 static void load_sha1_stat(struct sha1_stat *sha1_stat,
2560 const struct stat_data *stat,
2561 const unsigned char *sha1)
2563 stat_data_from_disk(&sha1_stat->stat, stat);
2564 hashcpy(sha1_stat->sha1, sha1);
2565 sha1_stat->valid = 1;
2568 struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz)
2570 const struct ondisk_untracked_cache *ouc;
2571 struct untracked_cache *uc;
2572 struct read_data rd;
2573 const unsigned char *next = data, *end = (const unsigned char *)data + sz;
2577 if (sz <= 1 || end[-1] != '\0')
2581 ident_len = decode_varint(&next);
2582 if (next + ident_len > end)
2584 ident = (const char *)next;
2587 ouc = (const struct ondisk_untracked_cache *)next;
2588 if (next + ouc_size(0) > end)
2591 uc = xcalloc(1, sizeof(*uc));
2592 strbuf_init(&uc->ident, ident_len);
2593 strbuf_add(&uc->ident, ident, ident_len);
2594 load_sha1_stat(&uc->ss_info_exclude, &ouc->info_exclude_stat,
2595 ouc->info_exclude_sha1);
2596 load_sha1_stat(&uc->ss_excludes_file, &ouc->excludes_file_stat,
2597 ouc->excludes_file_sha1);
2598 uc->dir_flags = get_be32(&ouc->dir_flags);
2599 uc->exclude_per_dir = xstrdup(ouc->exclude_per_dir);
2600 /* NUL after exclude_per_dir is covered by sizeof(*ouc) */
2601 next += ouc_size(strlen(ouc->exclude_per_dir));
2605 len = decode_varint(&next);
2606 if (next > end || len == 0)
2609 rd.valid = ewah_new();
2610 rd.check_only = ewah_new();
2611 rd.sha1_valid = ewah_new();
2615 ALLOC_ARRAY(rd.ucd, len);
2617 if (read_one_dir(&uc->root, &rd) || rd.index != len)
2621 len = ewah_read_mmap(rd.valid, next, end - next);
2626 len = ewah_read_mmap(rd.check_only, next, end - next);
2631 len = ewah_read_mmap(rd.sha1_valid, next, end - next);
2635 ewah_each_bit(rd.check_only, set_check_only, &rd);
2636 rd.data = next + len;
2637 ewah_each_bit(rd.valid, read_stat, &rd);
2638 ewah_each_bit(rd.sha1_valid, read_sha1, &rd);
2643 ewah_free(rd.valid);
2644 ewah_free(rd.check_only);
2645 ewah_free(rd.sha1_valid);
2648 free_untracked_cache(uc);
2654 static void invalidate_one_directory(struct untracked_cache *uc,
2655 struct untracked_cache_dir *ucd)
2657 uc->dir_invalidated++;
2659 ucd->untracked_nr = 0;
2663 * Normally when an entry is added or removed from a directory,
2664 * invalidating that directory is enough. No need to touch its
2665 * ancestors. When a directory is shown as "foo/bar/" in git-status
2666 * however, deleting or adding an entry may have cascading effect.
2668 * Say the "foo/bar/file" has become untracked, we need to tell the
2669 * untracked_cache_dir of "foo" that "bar/" is not an untracked
2670 * directory any more (because "bar" is managed by foo as an untracked
2673 * Similarly, if "foo/bar/file" moves from untracked to tracked and it
2674 * was the last untracked entry in the entire "foo", we should show
2675 * "foo/" instead. Which means we have to invalidate past "bar" up to
2678 * This function traverses all directories from root to leaf. If there
2679 * is a chance of one of the above cases happening, we invalidate back
2680 * to root. Otherwise we just invalidate the leaf. There may be a more
2681 * sophisticated way than checking for SHOW_OTHER_DIRECTORIES to
2682 * detect these cases and avoid unnecessary invalidation, for example,
2683 * checking for the untracked entry named "bar/" in "foo", but for now
2684 * stick to something safe and simple.
2686 static int invalidate_one_component(struct untracked_cache *uc,
2687 struct untracked_cache_dir *dir,
2688 const char *path, int len)
2690 const char *rest = strchr(path, '/');
2693 int component_len = rest - path;
2694 struct untracked_cache_dir *d =
2695 lookup_untracked(uc, dir, path, component_len);
2697 invalidate_one_component(uc, d, rest + 1,
2698 len - (component_len + 1));
2700 invalidate_one_directory(uc, dir);
2704 invalidate_one_directory(uc, dir);
2705 return uc->dir_flags & DIR_SHOW_OTHER_DIRECTORIES;
2708 void untracked_cache_invalidate_path(struct index_state *istate,
2711 if (!istate->untracked || !istate->untracked->root)
2713 invalidate_one_component(istate->untracked, istate->untracked->root,
2714 path, strlen(path));
2717 void untracked_cache_remove_from_index(struct index_state *istate,
2720 untracked_cache_invalidate_path(istate, path);
2723 void untracked_cache_add_to_index(struct index_state *istate,
2726 untracked_cache_invalidate_path(istate, path);
2729 /* Update gitfile and core.worktree setting to connect work tree and git dir */
2730 void connect_work_tree_and_git_dir(const char *work_tree_, const char *git_dir_)
2732 struct strbuf file_name = STRBUF_INIT;
2733 struct strbuf rel_path = STRBUF_INIT;
2734 char *git_dir = real_pathdup(git_dir_);
2735 char *work_tree = real_pathdup(work_tree_);
2737 /* Update gitfile */
2738 strbuf_addf(&file_name, "%s/.git", work_tree);
2739 write_file(file_name.buf, "gitdir: %s",
2740 relative_path(git_dir, work_tree, &rel_path));
2742 /* Update core.worktree setting */
2743 strbuf_reset(&file_name);
2744 strbuf_addf(&file_name, "%s/config", git_dir);
2745 git_config_set_in_file(file_name.buf, "core.worktree",
2746 relative_path(work_tree, git_dir, &rel_path));
2748 strbuf_release(&file_name);
2749 strbuf_release(&rel_path);
2755 * Migrate the git directory of the given path from old_git_dir to new_git_dir.
2757 void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_git_dir)
2759 if (rename(old_git_dir, new_git_dir) < 0)
2760 die_errno(_("could not migrate git directory from '%s' to '%s'"),
2761 old_git_dir, new_git_dir);
2763 connect_work_tree_and_git_dir(path, new_git_dir);