2 * This handles recursive filename detection with exclude
3 * files, index knowledge etc..
5 * Copyright (C) Linus Torvalds, 2005-2006
6 * Junio Hamano, 2005-2006
11 #include "object-store.h"
14 #include "wildmatch.h"
18 #include "ewah/ewok.h"
19 #include "fsmonitor.h"
20 #include "submodule-config.h"
23 * Tells read_directory_recursive how a file or directory should be treated.
24 * Values are ordered by significance, e.g. if a directory contains both
25 * excluded and untracked files, it is listed as untracked because
26 * path_untracked > path_excluded.
36 * Support data structure for our opendir/readdir/closedir wrappers
40 struct untracked_cache_dir *untracked;
47 struct untracked_cache_dir *ucd;
50 static enum path_treatment read_directory_recursive(struct dir_struct *dir,
51 struct index_state *istate, const char *path, int len,
52 struct untracked_cache_dir *untracked,
53 int check_only, int stop_at_first_file, const struct pathspec *pathspec);
54 static int resolve_dtype(int dtype, struct index_state *istate,
55 const char *path, int len);
57 void dir_init(struct dir_struct *dir)
59 memset(dir, 0, sizeof(*dir));
62 int count_slashes(const char *s)
71 int fspathcmp(const char *a, const char *b)
73 return ignore_case ? strcasecmp(a, b) : strcmp(a, b);
76 int fspathncmp(const char *a, const char *b, size_t count)
78 return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count);
81 int git_fnmatch(const struct pathspec_item *item,
82 const char *pattern, const char *string,
86 if (ps_strncmp(item, pattern, string, prefix))
91 if (item->flags & PATHSPEC_ONESTAR) {
92 int pattern_len = strlen(++pattern);
93 int string_len = strlen(string);
94 return string_len < pattern_len ||
95 ps_strcmp(item, pattern,
96 string + string_len - pattern_len);
98 if (item->magic & PATHSPEC_GLOB)
99 return wildmatch(pattern, string,
101 (item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0));
103 /* wildmatch has not learned no FNM_PATHNAME mode yet */
104 return wildmatch(pattern, string,
105 item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0);
108 static int fnmatch_icase_mem(const char *pattern, int patternlen,
109 const char *string, int stringlen,
113 struct strbuf pat_buf = STRBUF_INIT;
114 struct strbuf str_buf = STRBUF_INIT;
115 const char *use_pat = pattern;
116 const char *use_str = string;
118 if (pattern[patternlen]) {
119 strbuf_add(&pat_buf, pattern, patternlen);
120 use_pat = pat_buf.buf;
122 if (string[stringlen]) {
123 strbuf_add(&str_buf, string, stringlen);
124 use_str = str_buf.buf;
128 flags |= WM_CASEFOLD;
129 match_status = wildmatch(use_pat, use_str, flags);
131 strbuf_release(&pat_buf);
132 strbuf_release(&str_buf);
137 static size_t common_prefix_len(const struct pathspec *pathspec)
143 * ":(icase)path" is treated as a pathspec full of
144 * wildcard. In other words, only prefix is considered common
145 * prefix. If the pathspec is abc/foo abc/bar, running in
146 * subdir xyz, the common prefix is still xyz, not xyz/abc as
149 GUARD_PATHSPEC(pathspec,
158 for (n = 0; n < pathspec->nr; n++) {
159 size_t i = 0, len = 0, item_len;
160 if (pathspec->items[n].magic & PATHSPEC_EXCLUDE)
162 if (pathspec->items[n].magic & PATHSPEC_ICASE)
163 item_len = pathspec->items[n].prefix;
165 item_len = pathspec->items[n].nowildcard_len;
166 while (i < item_len && (n == 0 || i < max)) {
167 char c = pathspec->items[n].match[i];
168 if (c != pathspec->items[0].match[i])
174 if (n == 0 || len < max) {
184 * Returns a copy of the longest leading path common among all
187 char *common_prefix(const struct pathspec *pathspec)
189 unsigned long len = common_prefix_len(pathspec);
191 return len ? xmemdupz(pathspec->items[0].match, len) : NULL;
194 int fill_directory(struct dir_struct *dir,
195 struct index_state *istate,
196 const struct pathspec *pathspec)
201 unsigned exclusive_flags = DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO;
202 if ((dir->flags & exclusive_flags) == exclusive_flags)
203 BUG("DIR_SHOW_IGNORED and DIR_SHOW_IGNORED_TOO are exclusive");
206 * Calculate common prefix for the pathspec, and
207 * use that to optimize the directory walk
209 prefix_len = common_prefix_len(pathspec);
210 prefix = prefix_len ? pathspec->items[0].match : "";
212 /* Read the directory and prune it */
213 read_directory(dir, istate, prefix, prefix_len, pathspec);
218 int within_depth(const char *name, int namelen,
219 int depth, int max_depth)
221 const char *cp = name, *cpe = name + namelen;
227 if (depth > max_depth)
234 * Read the contents of the blob with the given OID into a buffer.
235 * Append a trailing LF to the end if the last line doesn't have one.
238 * -1 when the OID is invalid or unknown or does not refer to a blob.
239 * 0 when the blob is empty.
240 * 1 along with { data, size } of the (possibly augmented) buffer
243 * Optionally updates the given oid_stat with the given OID (when valid).
245 static int do_read_blob(const struct object_id *oid, struct oid_stat *oid_stat,
246 size_t *size_out, char **data_out)
248 enum object_type type;
255 data = read_object_file(oid, &type, &sz);
256 if (!data || type != OBJ_BLOB) {
262 memset(&oid_stat->stat, 0, sizeof(oid_stat->stat));
263 oidcpy(&oid_stat->oid, oid);
271 if (data[sz - 1] != '\n') {
272 data = xrealloc(data, st_add(sz, 1));
276 *size_out = xsize_t(sz);
282 #define DO_MATCH_EXCLUDE (1<<0)
283 #define DO_MATCH_DIRECTORY (1<<1)
284 #define DO_MATCH_LEADING_PATHSPEC (1<<2)
287 * Does the given pathspec match the given name? A match is found if
289 * (1) the pathspec string is leading directory of 'name' ("RECURSIVELY"), or
290 * (2) the pathspec string has a leading part matching 'name' ("LEADING"), or
291 * (3) the pathspec string is a wildcard and matches 'name' ("WILDCARD"), or
292 * (4) the pathspec string is exactly the same as 'name' ("EXACT").
294 * Return value tells which case it was (1-4), or 0 when there is no match.
296 * It may be instructive to look at a small table of concrete examples
297 * to understand the differences between 1, 2, and 4:
300 * | a/b | a/b/ | a/b/c
301 * ------+-----------+-----------+------------
302 * a/b | EXACT | EXACT[1] | LEADING[2]
303 * Names a/b/ | RECURSIVE | EXACT | LEADING[2]
304 * a/b/c | RECURSIVE | RECURSIVE | EXACT
306 * [1] Only if DO_MATCH_DIRECTORY is passed; otherwise, this is NOT a match.
307 * [2] Only if DO_MATCH_LEADING_PATHSPEC is passed; otherwise, not a match.
309 static int match_pathspec_item(struct index_state *istate,
310 const struct pathspec_item *item, int prefix,
311 const char *name, int namelen, unsigned flags)
313 /* name/namelen has prefix cut off by caller */
314 const char *match = item->match + prefix;
315 int matchlen = item->len - prefix;
318 * The normal call pattern is:
319 * 1. prefix = common_prefix_len(ps);
320 * 2. prune something, or fill_directory
321 * 3. match_pathspec()
323 * 'prefix' at #1 may be shorter than the command's prefix and
324 * it's ok for #2 to match extra files. Those extras will be
327 * Suppose the pathspec is 'foo' and '../bar' running from
328 * subdir 'xyz'. The common prefix at #1 will be empty, thanks
329 * to "../". We may have xyz/foo _and_ XYZ/foo after #2. The
330 * user does not want XYZ/foo, only the "foo" part should be
331 * case-insensitive. We need to filter out XYZ/foo here. In
332 * other words, we do not trust the caller on comparing the
333 * prefix part when :(icase) is involved. We do exact
334 * comparison ourselves.
336 * Normally the caller (common_prefix_len() in fact) does
337 * _exact_ matching on name[-prefix+1..-1] and we do not need
338 * to check that part. Be defensive and check it anyway, in
339 * case common_prefix_len is changed, or a new caller is
340 * introduced that does not use common_prefix_len.
342 * If the penalty turns out too high when prefix is really
343 * long, maybe change it to
344 * strncmp(match, name, item->prefix - prefix)
346 if (item->prefix && (item->magic & PATHSPEC_ICASE) &&
347 strncmp(item->match, name - prefix, item->prefix))
350 if (item->attr_match_nr &&
351 !match_pathspec_attrs(istate, name, namelen, item))
354 /* If the match was just the prefix, we matched */
356 return MATCHED_RECURSIVELY;
358 if (matchlen <= namelen && !ps_strncmp(item, match, name, matchlen)) {
359 if (matchlen == namelen)
360 return MATCHED_EXACTLY;
362 if (match[matchlen-1] == '/' || name[matchlen] == '/')
363 return MATCHED_RECURSIVELY;
364 } else if ((flags & DO_MATCH_DIRECTORY) &&
365 match[matchlen - 1] == '/' &&
366 namelen == matchlen - 1 &&
367 !ps_strncmp(item, match, name, namelen))
368 return MATCHED_EXACTLY;
370 if (item->nowildcard_len < item->len &&
371 !git_fnmatch(item, match, name,
372 item->nowildcard_len - prefix))
373 return MATCHED_FNMATCH;
375 /* Perform checks to see if "name" is a leading string of the pathspec */
376 if ( (flags & DO_MATCH_LEADING_PATHSPEC) &&
377 !(flags & DO_MATCH_EXCLUDE)) {
378 /* name is a literal prefix of the pathspec */
379 int offset = name[namelen-1] == '/' ? 1 : 0;
380 if ((namelen < matchlen) &&
381 (match[namelen-offset] == '/') &&
382 !ps_strncmp(item, match, name, namelen))
383 return MATCHED_RECURSIVELY_LEADING_PATHSPEC;
385 /* name doesn't match up to the first wild character */
386 if (item->nowildcard_len < item->len &&
387 ps_strncmp(item, match, name,
388 item->nowildcard_len - prefix))
392 * name has no wildcard, and it didn't match as a leading
393 * pathspec so return.
395 if (item->nowildcard_len == item->len)
399 * Here is where we would perform a wildmatch to check if
400 * "name" can be matched as a directory (or a prefix) against
401 * the pathspec. Since wildmatch doesn't have this capability
402 * at the present we have to punt and say that it is a match,
403 * potentially returning a false positive
404 * The submodules themselves will be able to perform more
405 * accurate matching to determine if the pathspec matches.
407 return MATCHED_RECURSIVELY_LEADING_PATHSPEC;
414 * do_match_pathspec() is meant to ONLY be called by
415 * match_pathspec_with_flags(); calling it directly risks pathspecs
416 * like ':!unwanted_path' being ignored.
418 * Given a name and a list of pathspecs, returns the nature of the
419 * closest (i.e. most specific) match of the name to any of the
422 * The caller typically calls this multiple times with the same
423 * pathspec and seen[] array but with different name/namelen
424 * (e.g. entries from the index) and is interested in seeing if and
425 * how each pathspec matches all the names it calls this function
426 * with. A mark is left in the seen[] array for each pathspec element
427 * indicating the closest type of match that element achieved, so if
428 * seen[n] remains zero after multiple invocations, that means the nth
429 * pathspec did not match any names, which could indicate that the
430 * user mistyped the nth pathspec.
432 static int do_match_pathspec(struct index_state *istate,
433 const struct pathspec *ps,
434 const char *name, int namelen,
435 int prefix, char *seen,
438 int i, retval = 0, exclude = flags & DO_MATCH_EXCLUDE;
450 if (!ps->recursive ||
451 !(ps->magic & PATHSPEC_MAXDEPTH) ||
453 return MATCHED_RECURSIVELY;
455 if (within_depth(name, namelen, 0, ps->max_depth))
456 return MATCHED_EXACTLY;
464 for (i = ps->nr - 1; i >= 0; i--) {
467 if ((!exclude && ps->items[i].magic & PATHSPEC_EXCLUDE) ||
468 ( exclude && !(ps->items[i].magic & PATHSPEC_EXCLUDE)))
471 if (seen && seen[i] == MATCHED_EXACTLY)
474 * Make exclude patterns optional and never report
475 * "pathspec ':(exclude)foo' matches no files"
477 if (seen && ps->items[i].magic & PATHSPEC_EXCLUDE)
478 seen[i] = MATCHED_FNMATCH;
479 how = match_pathspec_item(istate, ps->items+i, prefix, name,
482 (ps->magic & PATHSPEC_MAXDEPTH) &&
483 ps->max_depth != -1 &&
484 how && how != MATCHED_FNMATCH) {
485 int len = ps->items[i].len;
486 if (name[len] == '/')
488 if (within_depth(name+len, namelen-len, 0, ps->max_depth))
489 how = MATCHED_EXACTLY;
496 if (seen && seen[i] < how)
503 static int match_pathspec_with_flags(struct index_state *istate,
504 const struct pathspec *ps,
505 const char *name, int namelen,
506 int prefix, char *seen, unsigned flags)
508 int positive, negative;
509 positive = do_match_pathspec(istate, ps, name, namelen,
510 prefix, seen, flags);
511 if (!(ps->magic & PATHSPEC_EXCLUDE) || !positive)
513 negative = do_match_pathspec(istate, ps, name, namelen,
515 flags | DO_MATCH_EXCLUDE);
516 return negative ? 0 : positive;
519 int match_pathspec(struct index_state *istate,
520 const struct pathspec *ps,
521 const char *name, int namelen,
522 int prefix, char *seen, int is_dir)
524 unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0;
525 return match_pathspec_with_flags(istate, ps, name, namelen,
526 prefix, seen, flags);
530 * Check if a submodule is a superset of the pathspec
532 int submodule_path_match(struct index_state *istate,
533 const struct pathspec *ps,
534 const char *submodule_name,
537 int matched = match_pathspec_with_flags(istate, ps, submodule_name,
538 strlen(submodule_name),
541 DO_MATCH_LEADING_PATHSPEC);
545 int report_path_error(const char *ps_matched,
546 const struct pathspec *pathspec)
549 * Make sure all pathspec matched; otherwise it is an error.
552 for (num = 0; num < pathspec->nr; num++) {
553 int other, found_dup;
558 * The caller might have fed identical pathspec
559 * twice. Do not barf on such a mistake.
560 * FIXME: parse_pathspec should have eliminated
561 * duplicate pathspec.
563 for (found_dup = other = 0;
564 !found_dup && other < pathspec->nr;
566 if (other == num || !ps_matched[other])
568 if (!strcmp(pathspec->items[other].original,
569 pathspec->items[num].original))
571 * Ok, we have a match already.
578 error(_("pathspec '%s' did not match any file(s) known to git"),
579 pathspec->items[num].original);
586 * Return the length of the "simple" part of a path match limiter.
588 int simple_length(const char *match)
593 unsigned char c = *match++;
595 if (c == '\0' || is_glob_special(c))
600 int no_wildcard(const char *string)
602 return string[simple_length(string)] == '\0';
605 void parse_path_pattern(const char **pattern,
610 const char *p = *pattern;
615 *flags |= PATTERN_FLAG_NEGATIVE;
619 if (len && p[len - 1] == '/') {
621 *flags |= PATTERN_FLAG_MUSTBEDIR;
623 for (i = 0; i < len; i++) {
628 *flags |= PATTERN_FLAG_NODIR;
629 *nowildcardlen = simple_length(p);
631 * we should have excluded the trailing slash from 'p' too,
632 * but that's one more allocation. Instead just make sure
633 * nowildcardlen does not exceed real patternlen
635 if (*nowildcardlen > len)
636 *nowildcardlen = len;
637 if (*p == '*' && no_wildcard(p + 1))
638 *flags |= PATTERN_FLAG_ENDSWITH;
643 int pl_hashmap_cmp(const void *unused_cmp_data,
644 const struct hashmap_entry *a,
645 const struct hashmap_entry *b,
648 const struct pattern_entry *ee1 =
649 container_of(a, struct pattern_entry, ent);
650 const struct pattern_entry *ee2 =
651 container_of(b, struct pattern_entry, ent);
653 size_t min_len = ee1->patternlen <= ee2->patternlen
658 return strncasecmp(ee1->pattern, ee2->pattern, min_len);
659 return strncmp(ee1->pattern, ee2->pattern, min_len);
662 static char *dup_and_filter_pattern(const char *pattern)
666 char *result = xstrdup(pattern);
672 /* skip escape characters (once) */
692 static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern *given)
694 struct pattern_entry *translated;
697 const char *prev, *cur, *next;
699 if (!pl->use_cone_patterns)
702 if (given->flags & PATTERN_FLAG_NEGATIVE &&
703 given->flags & PATTERN_FLAG_MUSTBEDIR &&
704 !strcmp(given->pattern, "/*")) {
709 if (!given->flags && !strcmp(given->pattern, "/*")) {
714 if (given->patternlen < 2 ||
715 *given->pattern == '*' ||
716 strstr(given->pattern, "**")) {
717 /* Not a cone pattern. */
718 warning(_("unrecognized pattern: '%s'"), given->pattern);
722 prev = given->pattern;
723 cur = given->pattern + 1;
724 next = given->pattern + 2;
727 /* Watch for glob characters '*', '\', '[', '?' */
728 if (!is_glob_special(*cur))
731 /* But only if *prev != '\\' */
735 /* But allow the initial '\' */
737 is_glob_special(*next))
740 /* But a trailing '/' then '*' is fine */
746 /* Not a cone pattern. */
747 warning(_("unrecognized pattern: '%s'"), given->pattern);
756 if (given->patternlen > 2 &&
757 !strcmp(given->pattern + given->patternlen - 2, "/*")) {
758 if (!(given->flags & PATTERN_FLAG_NEGATIVE)) {
759 /* Not a cone pattern. */
760 warning(_("unrecognized pattern: '%s'"), given->pattern);
764 truncated = dup_and_filter_pattern(given->pattern);
766 translated = xmalloc(sizeof(struct pattern_entry));
767 translated->pattern = truncated;
768 translated->patternlen = given->patternlen - 2;
769 hashmap_entry_init(&translated->ent,
771 strihash(translated->pattern) :
772 strhash(translated->pattern));
774 if (!hashmap_get_entry(&pl->recursive_hashmap,
775 translated, ent, NULL)) {
776 /* We did not see the "parent" included */
777 warning(_("unrecognized negative pattern: '%s'"),
784 hashmap_add(&pl->parent_hashmap, &translated->ent);
785 hashmap_remove(&pl->recursive_hashmap, &translated->ent, &data);
790 if (given->flags & PATTERN_FLAG_NEGATIVE) {
791 warning(_("unrecognized negative pattern: '%s'"),
796 translated = xmalloc(sizeof(struct pattern_entry));
798 translated->pattern = dup_and_filter_pattern(given->pattern);
799 translated->patternlen = given->patternlen;
800 hashmap_entry_init(&translated->ent,
802 strihash(translated->pattern) :
803 strhash(translated->pattern));
805 hashmap_add(&pl->recursive_hashmap, &translated->ent);
807 if (hashmap_get_entry(&pl->parent_hashmap, translated, ent, NULL)) {
808 /* we already included this at the parent level */
809 warning(_("your sparse-checkout file may have issues: pattern '%s' is repeated"),
811 hashmap_remove(&pl->parent_hashmap, &translated->ent, &data);
819 warning(_("disabling cone pattern matching"));
820 hashmap_clear_and_free(&pl->parent_hashmap, struct pattern_entry, ent);
821 hashmap_clear_and_free(&pl->recursive_hashmap, struct pattern_entry, ent);
822 pl->use_cone_patterns = 0;
825 static int hashmap_contains_path(struct hashmap *map,
826 struct strbuf *pattern)
828 struct pattern_entry p;
830 /* Check straight mapping */
831 p.pattern = pattern->buf;
832 p.patternlen = pattern->len;
833 hashmap_entry_init(&p.ent,
835 strihash(p.pattern) :
837 return !!hashmap_get_entry(map, &p, ent, NULL);
840 int hashmap_contains_parent(struct hashmap *map,
842 struct strbuf *buffer)
846 strbuf_setlen(buffer, 0);
849 strbuf_addch(buffer, '/');
851 strbuf_addstr(buffer, path);
853 slash_pos = strrchr(buffer->buf, '/');
855 while (slash_pos > buffer->buf) {
856 strbuf_setlen(buffer, slash_pos - buffer->buf);
858 if (hashmap_contains_path(map, buffer))
861 slash_pos = strrchr(buffer->buf, '/');
867 void add_pattern(const char *string, const char *base,
868 int baselen, struct pattern_list *pl, int srcpos)
870 struct path_pattern *pattern;
875 parse_path_pattern(&string, &patternlen, &flags, &nowildcardlen);
876 if (flags & PATTERN_FLAG_MUSTBEDIR) {
877 FLEXPTR_ALLOC_MEM(pattern, pattern, string, patternlen);
879 pattern = xmalloc(sizeof(*pattern));
880 pattern->pattern = string;
882 pattern->patternlen = patternlen;
883 pattern->nowildcardlen = nowildcardlen;
884 pattern->base = base;
885 pattern->baselen = baselen;
886 pattern->flags = flags;
887 pattern->srcpos = srcpos;
888 ALLOC_GROW(pl->patterns, pl->nr + 1, pl->alloc);
889 pl->patterns[pl->nr++] = pattern;
892 add_pattern_to_hashsets(pl, pattern);
895 static int read_skip_worktree_file_from_index(struct index_state *istate,
897 size_t *size_out, char **data_out,
898 struct oid_stat *oid_stat)
903 pos = index_name_pos(istate, path, len);
906 if (!ce_skip_worktree(istate->cache[pos]))
909 return do_read_blob(&istate->cache[pos]->oid, oid_stat, size_out, data_out);
913 * Frees memory within pl which was allocated for exclude patterns and
914 * the file buffer. Does not free pl itself.
916 void clear_pattern_list(struct pattern_list *pl)
920 for (i = 0; i < pl->nr; i++)
921 free(pl->patterns[i]);
924 hashmap_clear_and_free(&pl->recursive_hashmap, struct pattern_entry, ent);
925 hashmap_clear_and_free(&pl->parent_hashmap, struct pattern_entry, ent);
927 memset(pl, 0, sizeof(*pl));
930 static void trim_trailing_spaces(char *buf)
932 char *p, *last_space = NULL;
934 for (p = buf; *p; p++)
954 * Given a subdirectory name and "dir" of the current directory,
955 * search the subdir in "dir" and return it, or create a new one if it
956 * does not exist in "dir".
958 * If "name" has the trailing slash, it'll be excluded in the search.
960 static struct untracked_cache_dir *lookup_untracked(struct untracked_cache *uc,
961 struct untracked_cache_dir *dir,
962 const char *name, int len)
965 struct untracked_cache_dir *d;
968 if (len && name[len - 1] == '/')
972 while (last > first) {
973 int cmp, next = first + ((last - first) >> 1);
975 cmp = strncmp(name, d->name, len);
976 if (!cmp && strlen(d->name) > len)
988 FLEX_ALLOC_MEM(d, name, name, len);
990 ALLOC_GROW(dir->dirs, dir->dirs_nr + 1, dir->dirs_alloc);
991 MOVE_ARRAY(dir->dirs + first + 1, dir->dirs + first,
992 dir->dirs_nr - first);
994 dir->dirs[first] = d;
998 static void do_invalidate_gitignore(struct untracked_cache_dir *dir)
1002 dir->untracked_nr = 0;
1003 for (i = 0; i < dir->dirs_nr; i++)
1004 do_invalidate_gitignore(dir->dirs[i]);
1007 static void invalidate_gitignore(struct untracked_cache *uc,
1008 struct untracked_cache_dir *dir)
1010 uc->gitignore_invalidated++;
1011 do_invalidate_gitignore(dir);
1014 static void invalidate_directory(struct untracked_cache *uc,
1015 struct untracked_cache_dir *dir)
1020 * Invalidation increment here is just roughly correct. If
1021 * untracked_nr or any of dirs[].recurse is non-zero, we
1022 * should increment dir_invalidated too. But that's more
1026 uc->dir_invalidated++;
1029 dir->untracked_nr = 0;
1030 for (i = 0; i < dir->dirs_nr; i++)
1031 dir->dirs[i]->recurse = 0;
1034 static int add_patterns_from_buffer(char *buf, size_t size,
1035 const char *base, int baselen,
1036 struct pattern_list *pl);
1038 /* Flags for add_patterns() */
1039 #define PATTERN_NOFOLLOW (1<<0)
1042 * Given a file with name "fname", read it (either from disk, or from
1043 * an index if 'istate' is non-null), parse it and store the
1044 * exclude rules in "pl".
1046 * If "oid_stat" is not NULL, compute oid of the exclude file and fill
1047 * stat data from disk (only valid if add_patterns returns zero). If
1048 * oid_stat.valid is non-zero, "oid_stat" must contain good value as input.
1050 static int add_patterns(const char *fname, const char *base, int baselen,
1051 struct pattern_list *pl, struct index_state *istate,
1052 unsigned flags, struct oid_stat *oid_stat)
1060 if (flags & PATTERN_NOFOLLOW)
1061 fd = open_nofollow(fname, O_RDONLY);
1063 fd = open(fname, O_RDONLY);
1065 if (fd < 0 || fstat(fd, &st) < 0) {
1067 warn_on_fopen_errors(fname);
1072 r = read_skip_worktree_file_from_index(istate, fname,
1078 size = xsize_t(st.st_size);
1081 fill_stat_data(&oid_stat->stat, &st);
1082 oidcpy(&oid_stat->oid, the_hash_algo->empty_blob);
1083 oid_stat->valid = 1;
1088 buf = xmallocz(size);
1089 if (read_in_full(fd, buf, size) != size) {
1098 if (oid_stat->valid &&
1099 !match_stat_data_racy(istate, &oid_stat->stat, &st))
1100 ; /* no content change, oid_stat->oid still good */
1102 (pos = index_name_pos(istate, fname, strlen(fname))) >= 0 &&
1103 !ce_stage(istate->cache[pos]) &&
1104 ce_uptodate(istate->cache[pos]) &&
1105 !would_convert_to_git(istate, fname))
1106 oidcpy(&oid_stat->oid,
1107 &istate->cache[pos]->oid);
1109 hash_object_file(the_hash_algo, buf, size,
1110 "blob", &oid_stat->oid);
1111 fill_stat_data(&oid_stat->stat, &st);
1112 oid_stat->valid = 1;
1116 add_patterns_from_buffer(buf, size, base, baselen, pl);
1120 static int add_patterns_from_buffer(char *buf, size_t size,
1121 const char *base, int baselen,
1122 struct pattern_list *pl)
1127 hashmap_init(&pl->recursive_hashmap, pl_hashmap_cmp, NULL, 0);
1128 hashmap_init(&pl->parent_hashmap, pl_hashmap_cmp, NULL, 0);
1132 if (skip_utf8_bom(&buf, size))
1133 size -= buf - pl->filebuf;
1137 for (i = 0; i < size; i++) {
1138 if (buf[i] == '\n') {
1139 if (entry != buf + i && entry[0] != '#') {
1140 buf[i - (i && buf[i-1] == '\r')] = 0;
1141 trim_trailing_spaces(entry);
1142 add_pattern(entry, base, baselen, pl, lineno);
1145 entry = buf + i + 1;
1151 int add_patterns_from_file_to_list(const char *fname, const char *base,
1152 int baselen, struct pattern_list *pl,
1153 struct index_state *istate,
1156 return add_patterns(fname, base, baselen, pl, istate, flags, NULL);
1159 int add_patterns_from_blob_to_list(
1160 struct object_id *oid,
1161 const char *base, int baselen,
1162 struct pattern_list *pl)
1168 r = do_read_blob(oid, NULL, &size, &buf);
1172 add_patterns_from_buffer(buf, size, base, baselen, pl);
1176 struct pattern_list *add_pattern_list(struct dir_struct *dir,
1177 int group_type, const char *src)
1179 struct pattern_list *pl;
1180 struct exclude_list_group *group;
1182 group = &dir->exclude_list_group[group_type];
1183 ALLOC_GROW(group->pl, group->nr + 1, group->alloc);
1184 pl = &group->pl[group->nr++];
1185 memset(pl, 0, sizeof(*pl));
1191 * Used to set up core.excludesfile and .git/info/exclude lists.
1193 static void add_patterns_from_file_1(struct dir_struct *dir, const char *fname,
1194 struct oid_stat *oid_stat)
1196 struct pattern_list *pl;
1198 * catch setup_standard_excludes() that's called before
1199 * dir->untracked is assigned. That function behaves
1200 * differently when dir->untracked is non-NULL.
1202 if (!dir->untracked)
1203 dir->unmanaged_exclude_files++;
1204 pl = add_pattern_list(dir, EXC_FILE, fname);
1205 if (add_patterns(fname, "", 0, pl, NULL, 0, oid_stat) < 0)
1206 die(_("cannot use %s as an exclude file"), fname);
1209 void add_patterns_from_file(struct dir_struct *dir, const char *fname)
1211 dir->unmanaged_exclude_files++; /* see validate_untracked_cache() */
1212 add_patterns_from_file_1(dir, fname, NULL);
1215 int match_basename(const char *basename, int basenamelen,
1216 const char *pattern, int prefix, int patternlen,
1219 if (prefix == patternlen) {
1220 if (patternlen == basenamelen &&
1221 !fspathncmp(pattern, basename, basenamelen))
1223 } else if (flags & PATTERN_FLAG_ENDSWITH) {
1224 /* "*literal" matching against "fooliteral" */
1225 if (patternlen - 1 <= basenamelen &&
1226 !fspathncmp(pattern + 1,
1227 basename + basenamelen - (patternlen - 1),
1231 if (fnmatch_icase_mem(pattern, patternlen,
1232 basename, basenamelen,
1239 int match_pathname(const char *pathname, int pathlen,
1240 const char *base, int baselen,
1241 const char *pattern, int prefix, int patternlen,
1248 * match with FNM_PATHNAME; the pattern has base implicitly
1251 if (*pattern == '/') {
1258 * baselen does not count the trailing slash. base[] may or
1259 * may not end with a trailing slash though.
1261 if (pathlen < baselen + 1 ||
1262 (baselen && pathname[baselen] != '/') ||
1263 fspathncmp(pathname, base, baselen))
1266 namelen = baselen ? pathlen - baselen - 1 : pathlen;
1267 name = pathname + pathlen - namelen;
1271 * if the non-wildcard part is longer than the
1272 * remaining pathname, surely it cannot match.
1274 if (prefix > namelen)
1277 if (fspathncmp(pattern, name, prefix))
1280 patternlen -= prefix;
1285 * If the whole pattern did not have a wildcard,
1286 * then our prefix match is all we need; we
1287 * do not need to call fnmatch at all.
1289 if (!patternlen && !namelen)
1293 return fnmatch_icase_mem(pattern, patternlen,
1299 * Scan the given exclude list in reverse to see whether pathname
1300 * should be ignored. The first match (i.e. the last on the list), if
1301 * any, determines the fate. Returns the exclude_list element which
1302 * matched, or NULL for undecided.
1304 static struct path_pattern *last_matching_pattern_from_list(const char *pathname,
1306 const char *basename,
1308 struct pattern_list *pl,
1309 struct index_state *istate)
1311 struct path_pattern *res = NULL; /* undecided */
1315 return NULL; /* undefined */
1317 for (i = pl->nr - 1; 0 <= i; i--) {
1318 struct path_pattern *pattern = pl->patterns[i];
1319 const char *exclude = pattern->pattern;
1320 int prefix = pattern->nowildcardlen;
1322 if (pattern->flags & PATTERN_FLAG_MUSTBEDIR) {
1323 *dtype = resolve_dtype(*dtype, istate, pathname, pathlen);
1324 if (*dtype != DT_DIR)
1328 if (pattern->flags & PATTERN_FLAG_NODIR) {
1329 if (match_basename(basename,
1330 pathlen - (basename - pathname),
1331 exclude, prefix, pattern->patternlen,
1339 assert(pattern->baselen == 0 ||
1340 pattern->base[pattern->baselen - 1] == '/');
1341 if (match_pathname(pathname, pathlen,
1343 pattern->baselen ? pattern->baselen - 1 : 0,
1344 exclude, prefix, pattern->patternlen,
1354 * Scan the list of patterns to determine if the ordered list
1355 * of patterns matches on 'pathname'.
1357 * Return 1 for a match, 0 for not matched and -1 for undecided.
1359 enum pattern_match_result path_matches_pattern_list(
1360 const char *pathname, int pathlen,
1361 const char *basename, int *dtype,
1362 struct pattern_list *pl,
1363 struct index_state *istate)
1365 struct path_pattern *pattern;
1366 struct strbuf parent_pathname = STRBUF_INIT;
1367 int result = NOT_MATCHED;
1368 const char *slash_pos;
1370 if (!pl->use_cone_patterns) {
1371 pattern = last_matching_pattern_from_list(pathname, pathlen, basename,
1374 if (pattern->flags & PATTERN_FLAG_NEGATIVE)
1386 strbuf_addch(&parent_pathname, '/');
1387 strbuf_add(&parent_pathname, pathname, pathlen);
1390 * Directory entries are matched if and only if a file
1391 * contained immediately within them is matched. For the
1392 * case of a directory entry, modify the path to create
1393 * a fake filename within this directory, allowing us to
1394 * use the file-base matching logic in an equivalent way.
1396 if (parent_pathname.len > 0 &&
1397 parent_pathname.buf[parent_pathname.len - 1] == '/')
1398 strbuf_add(&parent_pathname, "-", 1);
1400 if (hashmap_contains_path(&pl->recursive_hashmap,
1401 &parent_pathname)) {
1402 result = MATCHED_RECURSIVE;
1406 slash_pos = strrchr(parent_pathname.buf, '/');
1408 if (slash_pos == parent_pathname.buf) {
1409 /* include every file in root */
1414 strbuf_setlen(&parent_pathname, slash_pos - parent_pathname.buf);
1416 if (hashmap_contains_path(&pl->parent_hashmap, &parent_pathname)) {
1421 if (hashmap_contains_parent(&pl->recursive_hashmap,
1424 result = MATCHED_RECURSIVE;
1427 strbuf_release(&parent_pathname);
1431 static struct path_pattern *last_matching_pattern_from_lists(
1432 struct dir_struct *dir, struct index_state *istate,
1433 const char *pathname, int pathlen,
1434 const char *basename, int *dtype_p)
1437 struct exclude_list_group *group;
1438 struct path_pattern *pattern;
1439 for (i = EXC_CMDL; i <= EXC_FILE; i++) {
1440 group = &dir->exclude_list_group[i];
1441 for (j = group->nr - 1; j >= 0; j--) {
1442 pattern = last_matching_pattern_from_list(
1443 pathname, pathlen, basename, dtype_p,
1444 &group->pl[j], istate);
1453 * Loads the per-directory exclude list for the substring of base
1454 * which has a char length of baselen.
1456 static void prep_exclude(struct dir_struct *dir,
1457 struct index_state *istate,
1458 const char *base, int baselen)
1460 struct exclude_list_group *group;
1461 struct pattern_list *pl;
1462 struct exclude_stack *stk = NULL;
1463 struct untracked_cache_dir *untracked;
1466 group = &dir->exclude_list_group[EXC_DIRS];
1469 * Pop the exclude lists from the EXCL_DIRS exclude_list_group
1470 * which originate from directories not in the prefix of the
1471 * path being checked.
1473 while ((stk = dir->exclude_stack) != NULL) {
1474 if (stk->baselen <= baselen &&
1475 !strncmp(dir->basebuf.buf, base, stk->baselen))
1477 pl = &group->pl[dir->exclude_stack->exclude_ix];
1478 dir->exclude_stack = stk->prev;
1479 dir->pattern = NULL;
1480 free((char *)pl->src); /* see strbuf_detach() below */
1481 clear_pattern_list(pl);
1486 /* Skip traversing into sub directories if the parent is excluded */
1491 * Lazy initialization. All call sites currently just
1492 * memset(dir, 0, sizeof(*dir)) before use. Changing all of
1493 * them seems lots of work for little benefit.
1495 if (!dir->basebuf.buf)
1496 strbuf_init(&dir->basebuf, PATH_MAX);
1498 /* Read from the parent directories and push them down. */
1499 current = stk ? stk->baselen : -1;
1500 strbuf_setlen(&dir->basebuf, current < 0 ? 0 : current);
1502 untracked = stk ? stk->ucd : dir->untracked->root;
1506 while (current < baselen) {
1508 struct oid_stat oid_stat;
1510 CALLOC_ARRAY(stk, 1);
1515 cp = strchr(base + current + 1, '/');
1517 die("oops in prep_exclude");
1520 lookup_untracked(dir->untracked, untracked,
1522 cp - base - current);
1524 stk->prev = dir->exclude_stack;
1525 stk->baselen = cp - base;
1526 stk->exclude_ix = group->nr;
1527 stk->ucd = untracked;
1528 pl = add_pattern_list(dir, EXC_DIRS, NULL);
1529 strbuf_add(&dir->basebuf, base + current, stk->baselen - current);
1530 assert(stk->baselen == dir->basebuf.len);
1532 /* Abort if the directory is excluded */
1535 dir->basebuf.buf[stk->baselen - 1] = 0;
1536 dir->pattern = last_matching_pattern_from_lists(dir,
1538 dir->basebuf.buf, stk->baselen - 1,
1539 dir->basebuf.buf + current, &dt);
1540 dir->basebuf.buf[stk->baselen - 1] = '/';
1542 dir->pattern->flags & PATTERN_FLAG_NEGATIVE)
1543 dir->pattern = NULL;
1545 dir->exclude_stack = stk;
1550 /* Try to read per-directory file */
1551 oidclr(&oid_stat.oid);
1553 if (dir->exclude_per_dir &&
1555 * If we know that no files have been added in
1556 * this directory (i.e. valid_cached_dir() has
1557 * been executed and set untracked->valid) ..
1559 (!untracked || !untracked->valid ||
1561 * .. and .gitignore does not exist before
1562 * (i.e. null exclude_oid). Then we can skip
1563 * loading .gitignore, which would result in
1566 !is_null_oid(&untracked->exclude_oid))) {
1568 * dir->basebuf gets reused by the traversal, but we
1569 * need fname to remain unchanged to ensure the src
1570 * member of each struct path_pattern correctly
1571 * back-references its source file. Other invocations
1572 * of add_pattern_list provide stable strings, so we
1573 * strbuf_detach() and free() here in the caller.
1575 struct strbuf sb = STRBUF_INIT;
1576 strbuf_addbuf(&sb, &dir->basebuf);
1577 strbuf_addstr(&sb, dir->exclude_per_dir);
1578 pl->src = strbuf_detach(&sb, NULL);
1579 add_patterns(pl->src, pl->src, stk->baselen, pl, istate,
1581 untracked ? &oid_stat : NULL);
1584 * NEEDSWORK: when untracked cache is enabled, prep_exclude()
1585 * will first be called in valid_cached_dir() then maybe many
1586 * times more in last_matching_pattern(). When the cache is
1587 * used, last_matching_pattern() will not be called and
1588 * reading .gitignore content will be a waste.
1590 * So when it's called by valid_cached_dir() and we can get
1591 * .gitignore SHA-1 from the index (i.e. .gitignore is not
1592 * modified on work tree), we could delay reading the
1593 * .gitignore content until we absolutely need it in
1594 * last_matching_pattern(). Be careful about ignore rule
1595 * order, though, if you do that.
1598 !oideq(&oid_stat.oid, &untracked->exclude_oid)) {
1599 invalidate_gitignore(dir->untracked, untracked);
1600 oidcpy(&untracked->exclude_oid, &oid_stat.oid);
1602 dir->exclude_stack = stk;
1603 current = stk->baselen;
1605 strbuf_setlen(&dir->basebuf, baselen);
1609 * Loads the exclude lists for the directory containing pathname, then
1610 * scans all exclude lists to determine whether pathname is excluded.
1611 * Returns the exclude_list element which matched, or NULL for
1614 struct path_pattern *last_matching_pattern(struct dir_struct *dir,
1615 struct index_state *istate,
1616 const char *pathname,
1619 int pathlen = strlen(pathname);
1620 const char *basename = strrchr(pathname, '/');
1621 basename = (basename) ? basename+1 : pathname;
1623 prep_exclude(dir, istate, pathname, basename-pathname);
1626 return dir->pattern;
1628 return last_matching_pattern_from_lists(dir, istate, pathname, pathlen,
1633 * Loads the exclude lists for the directory containing pathname, then
1634 * scans all exclude lists to determine whether pathname is excluded.
1635 * Returns 1 if true, otherwise 0.
1637 int is_excluded(struct dir_struct *dir, struct index_state *istate,
1638 const char *pathname, int *dtype_p)
1640 struct path_pattern *pattern =
1641 last_matching_pattern(dir, istate, pathname, dtype_p);
1643 return pattern->flags & PATTERN_FLAG_NEGATIVE ? 0 : 1;
1647 static struct dir_entry *dir_entry_new(const char *pathname, int len)
1649 struct dir_entry *ent;
1651 FLEX_ALLOC_MEM(ent, name, pathname, len);
1656 static struct dir_entry *dir_add_name(struct dir_struct *dir,
1657 struct index_state *istate,
1658 const char *pathname, int len)
1660 if (index_file_exists(istate, pathname, len, ignore_case))
1663 ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc);
1664 return dir->entries[dir->nr++] = dir_entry_new(pathname, len);
1667 struct dir_entry *dir_add_ignored(struct dir_struct *dir,
1668 struct index_state *istate,
1669 const char *pathname, int len)
1671 if (!index_name_is_other(istate, pathname, len))
1674 ALLOC_GROW(dir->ignored, dir->ignored_nr+1, dir->ignored_alloc);
1675 return dir->ignored[dir->ignored_nr++] = dir_entry_new(pathname, len);
1679 index_nonexistent = 0,
1685 * Do not use the alphabetically sorted index to look up
1686 * the directory name; instead, use the case insensitive
1689 static enum exist_status directory_exists_in_index_icase(struct index_state *istate,
1690 const char *dirname, int len)
1692 struct cache_entry *ce;
1694 if (index_dir_exists(istate, dirname, len))
1695 return index_directory;
1697 ce = index_file_exists(istate, dirname, len, ignore_case);
1698 if (ce && S_ISGITLINK(ce->ce_mode))
1699 return index_gitdir;
1701 return index_nonexistent;
1705 * The index sorts alphabetically by entry name, which
1706 * means that a gitlink sorts as '\0' at the end, while
1707 * a directory (which is defined not as an entry, but as
1708 * the files it contains) will sort with the '/' at the
1711 static enum exist_status directory_exists_in_index(struct index_state *istate,
1712 const char *dirname, int len)
1717 return directory_exists_in_index_icase(istate, dirname, len);
1719 pos = index_name_pos(istate, dirname, len);
1722 while (pos < istate->cache_nr) {
1723 const struct cache_entry *ce = istate->cache[pos++];
1724 unsigned char endchar;
1726 if (strncmp(ce->name, dirname, len))
1728 endchar = ce->name[len];
1732 return index_directory;
1733 if (!endchar && S_ISGITLINK(ce->ce_mode))
1734 return index_gitdir;
1736 return index_nonexistent;
1740 * When we find a directory when traversing the filesystem, we
1741 * have three distinct cases:
1744 * - see it as a directory
1747 * and which one we choose depends on a combination of existing
1748 * git index contents and the flags passed into the directory
1749 * traversal routine.
1751 * Case 1: If we *already* have entries in the index under that
1752 * directory name, we always recurse into the directory to see
1755 * Case 2: If we *already* have that directory name as a gitlink,
1756 * we always continue to see it as a gitlink, regardless of whether
1757 * there is an actual git directory there or not (it might not
1758 * be checked out as a subproject!)
1760 * Case 3: if we didn't have it in the index previously, we
1761 * have a few sub-cases:
1763 * (a) if "show_other_directories" is true, we show it as
1764 * just a directory, unless "hide_empty_directories" is
1765 * also true, in which case we need to check if it contains any
1766 * untracked and / or ignored files.
1767 * (b) if it looks like a git directory, and we don't have
1768 * 'no_gitlinks' set we treat it as a gitlink, and show it
1770 * (c) otherwise, we recurse into it.
1772 static enum path_treatment treat_directory(struct dir_struct *dir,
1773 struct index_state *istate,
1774 struct untracked_cache_dir *untracked,
1775 const char *dirname, int len, int baselen, int excluded,
1776 const struct pathspec *pathspec)
1779 * WARNING: From this function, you can return path_recurse or you
1780 * can call read_directory_recursive() (or neither), but
1781 * you CAN'T DO BOTH.
1783 enum path_treatment state;
1784 int matches_how = 0;
1785 int nested_repo = 0, check_only, stop_early;
1786 int old_ignored_nr, old_untracked_nr;
1787 /* The "len-1" is to strip the final '/' */
1788 enum exist_status status = directory_exists_in_index(istate, dirname, len-1);
1790 if (status == index_directory)
1791 return path_recurse;
1792 if (status == index_gitdir)
1794 if (status != index_nonexistent)
1795 BUG("Unhandled value for directory_exists_in_index: %d\n", status);
1798 * We don't want to descend into paths that don't match the necessary
1799 * patterns. Clearly, if we don't have a pathspec, then we can't check
1800 * for matching patterns. Also, if (excluded) then we know we matched
1801 * the exclusion patterns so as an optimization we can skip checking
1802 * for matching patterns.
1804 if (pathspec && !excluded) {
1805 matches_how = match_pathspec_with_flags(istate, pathspec,
1809 DO_MATCH_LEADING_PATHSPEC);
1815 if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
1816 !(dir->flags & DIR_NO_GITLINKS)) {
1817 struct strbuf sb = STRBUF_INIT;
1818 strbuf_addstr(&sb, dirname);
1819 nested_repo = is_nonbare_repository_dir(&sb);
1820 strbuf_release(&sb);
1823 if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
1824 (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC))
1826 return excluded ? path_excluded : path_untracked;
1829 if (!(dir->flags & DIR_SHOW_OTHER_DIRECTORIES)) {
1831 (dir->flags & DIR_SHOW_IGNORED_TOO) &&
1832 (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) {
1835 * This is an excluded directory and we are
1836 * showing ignored paths that match an exclude
1837 * pattern. (e.g. show directory as ignored
1838 * only if it matches an exclude pattern).
1839 * This path will either be 'path_excluded`
1840 * (if we are showing empty directories or if
1841 * the directory is not empty), or will be
1842 * 'path_none' (empty directory, and we are
1843 * not showing empty directories).
1845 if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))
1846 return path_excluded;
1848 if (read_directory_recursive(dir, istate, dirname, len,
1849 untracked, 1, 1, pathspec) == path_excluded)
1850 return path_excluded;
1854 return path_recurse;
1857 /* This is the "show_other_directories" case */
1860 * If we have a pathspec which could match something _below_ this
1861 * directory (e.g. when checking 'subdir/' having a pathspec like
1862 * 'subdir/some/deep/path/file' or 'subdir/widget-*.c'), then we
1865 if (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC)
1866 return path_recurse;
1869 * Other than the path_recurse case immediately above, we only need
1870 * to recurse into untracked/ignored directories if either of the
1871 * following bits is set:
1872 * - DIR_SHOW_IGNORED_TOO (because then we need to determine if
1873 * there are ignored entries below)
1874 * - DIR_HIDE_EMPTY_DIRECTORIES (because we have to determine if
1875 * the directory is empty)
1877 if (!(dir->flags & (DIR_SHOW_IGNORED_TOO | DIR_HIDE_EMPTY_DIRECTORIES)))
1878 return excluded ? path_excluded : path_untracked;
1881 * ...and even if DIR_SHOW_IGNORED_TOO is set, we can still avoid
1882 * recursing into ignored directories if the path is excluded and
1883 * DIR_SHOW_IGNORED_TOO_MODE_MATCHING is also set.
1886 (dir->flags & DIR_SHOW_IGNORED_TOO) &&
1887 (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING))
1888 return path_excluded;
1891 * Even if we don't want to know all the paths under an untracked or
1892 * ignored directory, we may still need to go into the directory to
1893 * determine if it is empty (because with DIR_HIDE_EMPTY_DIRECTORIES,
1894 * an empty directory should be path_none instead of path_excluded or
1897 check_only = ((dir->flags & DIR_HIDE_EMPTY_DIRECTORIES) &&
1898 !(dir->flags & DIR_SHOW_IGNORED_TOO));
1901 * However, there's another optimization possible as a subset of
1902 * check_only, based on the cases we have to consider:
1903 * A) Directory matches no exclude patterns:
1904 * * Directory is empty => path_none
1905 * * Directory has an untracked file under it => path_untracked
1906 * * Directory has only ignored files under it => path_excluded
1907 * B) Directory matches an exclude pattern:
1908 * * Directory is empty => path_none
1909 * * Directory has an untracked file under it => path_excluded
1910 * * Directory has only ignored files under it => path_excluded
1911 * In case A, we can exit as soon as we've found an untracked
1912 * file but otherwise have to walk all files. In case B, though,
1913 * we can stop at the first file we find under the directory.
1915 stop_early = check_only && excluded;
1918 * If /every/ file within an untracked directory is ignored, then
1919 * we want to treat the directory as ignored (for e.g. status
1920 * --porcelain), without listing the individual ignored files
1921 * underneath. To do so, we'll save the current ignored_nr, and
1922 * pop all the ones added after it if it turns out the entire
1923 * directory is ignored. Also, when DIR_SHOW_IGNORED_TOO and
1924 * !DIR_KEEP_UNTRACKED_CONTENTS then we don't want to show
1925 * untracked paths so will need to pop all those off the last
1926 * after we traverse.
1928 old_ignored_nr = dir->ignored_nr;
1929 old_untracked_nr = dir->nr;
1931 /* Actually recurse into dirname now, we'll fixup the state later. */
1932 untracked = lookup_untracked(dir->untracked, untracked,
1933 dirname + baselen, len - baselen);
1934 state = read_directory_recursive(dir, istate, dirname, len, untracked,
1935 check_only, stop_early, pathspec);
1937 /* There are a variety of reasons we may need to fixup the state... */
1938 if (state == path_excluded) {
1939 /* state == path_excluded implies all paths under
1940 * dirname were ignored...
1942 * if running e.g. `git status --porcelain --ignored=matching`,
1943 * then we want to see the subpaths that are ignored.
1945 * if running e.g. just `git status --porcelain`, then
1946 * we just want the directory itself to be listed as ignored
1947 * and not the individual paths underneath.
1949 int want_ignored_subpaths =
1950 ((dir->flags & DIR_SHOW_IGNORED_TOO) &&
1951 (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING));
1953 if (want_ignored_subpaths) {
1955 * with --ignored=matching, we want the subpaths
1956 * INSTEAD of the directory itself.
1961 for (i = old_ignored_nr + 1; i<dir->ignored_nr; ++i)
1962 FREE_AND_NULL(dir->ignored[i]);
1963 dir->ignored_nr = old_ignored_nr;
1968 * We may need to ignore some of the untracked paths we found while
1969 * traversing subdirectories.
1971 if ((dir->flags & DIR_SHOW_IGNORED_TOO) &&
1972 !(dir->flags & DIR_KEEP_UNTRACKED_CONTENTS)) {
1974 for (i = old_untracked_nr + 1; i<dir->nr; ++i)
1975 FREE_AND_NULL(dir->entries[i]);
1976 dir->nr = old_untracked_nr;
1980 * If there is nothing under the current directory and we are not
1981 * hiding empty directories, then we need to report on the
1982 * untracked or ignored status of the directory itself.
1984 if (state == path_none && !(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))
1985 state = excluded ? path_excluded : path_untracked;
1991 * This is an inexact early pruning of any recursive directory
1992 * reading - if the path cannot possibly be in the pathspec,
1993 * return true, and we'll skip it early.
1995 static int simplify_away(const char *path, int pathlen,
1996 const struct pathspec *pathspec)
2000 if (!pathspec || !pathspec->nr)
2003 GUARD_PATHSPEC(pathspec,
2012 for (i = 0; i < pathspec->nr; i++) {
2013 const struct pathspec_item *item = &pathspec->items[i];
2014 int len = item->nowildcard_len;
2018 if (!ps_strncmp(item, item->match, path, len))
2026 * This function tells us whether an excluded path matches a
2027 * list of "interesting" pathspecs. That is, whether a path matched
2028 * by any of the pathspecs could possibly be ignored by excluding
2029 * the specified path. This can happen if:
2031 * 1. the path is mentioned explicitly in the pathspec
2033 * 2. the path is a directory prefix of some element in the
2036 static int exclude_matches_pathspec(const char *path, int pathlen,
2037 const struct pathspec *pathspec)
2041 if (!pathspec || !pathspec->nr)
2044 GUARD_PATHSPEC(pathspec,
2052 for (i = 0; i < pathspec->nr; i++) {
2053 const struct pathspec_item *item = &pathspec->items[i];
2054 int len = item->nowildcard_len;
2056 if (len == pathlen &&
2057 !ps_strncmp(item, item->match, path, pathlen))
2059 if (len > pathlen &&
2060 item->match[pathlen] == '/' &&
2061 !ps_strncmp(item, item->match, path, pathlen))
2067 static int get_index_dtype(struct index_state *istate,
2068 const char *path, int len)
2071 const struct cache_entry *ce;
2073 ce = index_file_exists(istate, path, len, 0);
2075 if (!ce_uptodate(ce))
2077 if (S_ISGITLINK(ce->ce_mode))
2080 * Nobody actually cares about the
2081 * difference between DT_LNK and DT_REG
2086 /* Try to look it up as a directory */
2087 pos = index_name_pos(istate, path, len);
2091 while (pos < istate->cache_nr) {
2092 ce = istate->cache[pos++];
2093 if (strncmp(ce->name, path, len))
2095 if (ce->name[len] > '/')
2097 if (ce->name[len] < '/')
2099 if (!ce_uptodate(ce))
2100 break; /* continue? */
2106 static int resolve_dtype(int dtype, struct index_state *istate,
2107 const char *path, int len)
2111 if (dtype != DT_UNKNOWN)
2113 dtype = get_index_dtype(istate, path, len);
2114 if (dtype != DT_UNKNOWN)
2116 if (lstat(path, &st))
2118 if (S_ISREG(st.st_mode))
2120 if (S_ISDIR(st.st_mode))
2122 if (S_ISLNK(st.st_mode))
2127 static enum path_treatment treat_path_fast(struct dir_struct *dir,
2128 struct cached_dir *cdir,
2129 struct index_state *istate,
2130 struct strbuf *path,
2132 const struct pathspec *pathspec)
2135 * WARNING: From this function, you can return path_recurse or you
2136 * can call read_directory_recursive() (or neither), but
2137 * you CAN'T DO BOTH.
2139 strbuf_setlen(path, baselen);
2141 strbuf_addstr(path, cdir->file);
2142 return path_untracked;
2144 strbuf_addstr(path, cdir->ucd->name);
2145 /* treat_one_path() does this before it calls treat_directory() */
2146 strbuf_complete(path, '/');
2147 if (cdir->ucd->check_only)
2149 * check_only is set as a result of treat_directory() getting
2150 * to its bottom. Verify again the same set of directories
2151 * with check_only set.
2153 return read_directory_recursive(dir, istate, path->buf, path->len,
2154 cdir->ucd, 1, 0, pathspec);
2156 * We get path_recurse in the first run when
2157 * directory_exists_in_index() returns index_nonexistent. We
2158 * are sure that new changes in the index does not impact the
2159 * outcome. Return now.
2161 return path_recurse;
2164 static enum path_treatment treat_path(struct dir_struct *dir,
2165 struct untracked_cache_dir *untracked,
2166 struct cached_dir *cdir,
2167 struct index_state *istate,
2168 struct strbuf *path,
2170 const struct pathspec *pathspec)
2172 int has_path_in_index, dtype, excluded;
2175 return treat_path_fast(dir, cdir, istate, path,
2177 if (is_dot_or_dotdot(cdir->d_name) || !fspathcmp(cdir->d_name, ".git"))
2179 strbuf_setlen(path, baselen);
2180 strbuf_addstr(path, cdir->d_name);
2181 if (simplify_away(path->buf, path->len, pathspec))
2184 dtype = resolve_dtype(cdir->d_type, istate, path->buf, path->len);
2186 /* Always exclude indexed files */
2187 has_path_in_index = !!index_file_exists(istate, path->buf, path->len,
2189 if (dtype != DT_DIR && has_path_in_index)
2193 * When we are looking at a directory P in the working tree,
2194 * there are three cases:
2196 * (1) P exists in the index. Everything inside the directory P in
2197 * the working tree needs to go when P is checked out from the
2200 * (2) P does not exist in the index, but there is P/Q in the index.
2201 * We know P will stay a directory when we check out the contents
2202 * of the index, but we do not know yet if there is a directory
2203 * P/Q in the working tree to be killed, so we need to recurse.
2205 * (3) P does not exist in the index, and there is no P/Q in the index
2206 * to require P to be a directory, either. Only in this case, we
2207 * know that everything inside P will not be killed without
2210 if ((dir->flags & DIR_COLLECT_KILLED_ONLY) &&
2211 (dtype == DT_DIR) &&
2212 !has_path_in_index &&
2213 (directory_exists_in_index(istate, path->buf, path->len) == index_nonexistent))
2216 excluded = is_excluded(dir, istate, path->buf, &dtype);
2219 * Excluded? If we don't explicitly want to show
2220 * ignored files, ignore it
2222 if (excluded && !(dir->flags & (DIR_SHOW_IGNORED|DIR_SHOW_IGNORED_TOO)))
2223 return path_excluded;
2230 * WARNING: Do not ignore/amend the return value from
2231 * treat_directory(), and especially do not change it to return
2232 * path_recurse as that can cause exponential slowdown.
2233 * Instead, modify treat_directory() to return the right value.
2235 strbuf_addch(path, '/');
2236 return treat_directory(dir, istate, untracked,
2237 path->buf, path->len,
2238 baselen, excluded, pathspec);
2242 !match_pathspec(istate, pathspec, path->buf, path->len,
2243 0 /* prefix */, NULL /* seen */,
2247 return path_excluded;
2248 return path_untracked;
2252 static void add_untracked(struct untracked_cache_dir *dir, const char *name)
2256 ALLOC_GROW(dir->untracked, dir->untracked_nr + 1,
2257 dir->untracked_alloc);
2258 dir->untracked[dir->untracked_nr++] = xstrdup(name);
2261 static int valid_cached_dir(struct dir_struct *dir,
2262 struct untracked_cache_dir *untracked,
2263 struct index_state *istate,
2264 struct strbuf *path,
2273 * With fsmonitor, we can trust the untracked cache's valid field.
2275 refresh_fsmonitor(istate);
2276 if (!(dir->untracked->use_fsmonitor && untracked->valid)) {
2277 if (lstat(path->len ? path->buf : ".", &st)) {
2278 memset(&untracked->stat_data, 0, sizeof(untracked->stat_data));
2281 if (!untracked->valid ||
2282 match_stat_data_racy(istate, &untracked->stat_data, &st)) {
2283 fill_stat_data(&untracked->stat_data, &st);
2288 if (untracked->check_only != !!check_only)
2292 * prep_exclude will be called eventually on this directory,
2293 * but it's called much later in last_matching_pattern(). We
2294 * need it now to determine the validity of the cache for this
2295 * path. The next calls will be nearly no-op, the way
2296 * prep_exclude() is designed.
2298 if (path->len && path->buf[path->len - 1] != '/') {
2299 strbuf_addch(path, '/');
2300 prep_exclude(dir, istate, path->buf, path->len);
2301 strbuf_setlen(path, path->len - 1);
2303 prep_exclude(dir, istate, path->buf, path->len);
2305 /* hopefully prep_exclude() haven't invalidated this entry... */
2306 return untracked->valid;
2309 static int open_cached_dir(struct cached_dir *cdir,
2310 struct dir_struct *dir,
2311 struct untracked_cache_dir *untracked,
2312 struct index_state *istate,
2313 struct strbuf *path,
2318 memset(cdir, 0, sizeof(*cdir));
2319 cdir->untracked = untracked;
2320 if (valid_cached_dir(dir, untracked, istate, path, check_only))
2322 c_path = path->len ? path->buf : ".";
2323 cdir->fdir = opendir(c_path);
2325 warning_errno(_("could not open directory '%s'"), c_path);
2326 if (dir->untracked) {
2327 invalidate_directory(dir->untracked, untracked);
2328 dir->untracked->dir_opened++;
2335 static int read_cached_dir(struct cached_dir *cdir)
2340 de = readdir(cdir->fdir);
2342 cdir->d_name = NULL;
2343 cdir->d_type = DT_UNKNOWN;
2346 cdir->d_name = de->d_name;
2347 cdir->d_type = DTYPE(de);
2350 while (cdir->nr_dirs < cdir->untracked->dirs_nr) {
2351 struct untracked_cache_dir *d = cdir->untracked->dirs[cdir->nr_dirs];
2361 if (cdir->nr_files < cdir->untracked->untracked_nr) {
2362 struct untracked_cache_dir *d = cdir->untracked;
2363 cdir->file = d->untracked[cdir->nr_files++];
2369 static void close_cached_dir(struct cached_dir *cdir)
2372 closedir(cdir->fdir);
2374 * We have gone through this directory and found no untracked
2375 * entries. Mark it valid.
2377 if (cdir->untracked) {
2378 cdir->untracked->valid = 1;
2379 cdir->untracked->recurse = 1;
2383 static void add_path_to_appropriate_result_list(struct dir_struct *dir,
2384 struct untracked_cache_dir *untracked,
2385 struct cached_dir *cdir,
2386 struct index_state *istate,
2387 struct strbuf *path,
2389 const struct pathspec *pathspec,
2390 enum path_treatment state)
2392 /* add the path to the appropriate result list */
2395 if (dir->flags & DIR_SHOW_IGNORED)
2396 dir_add_name(dir, istate, path->buf, path->len);
2397 else if ((dir->flags & DIR_SHOW_IGNORED_TOO) ||
2398 ((dir->flags & DIR_COLLECT_IGNORED) &&
2399 exclude_matches_pathspec(path->buf, path->len,
2401 dir_add_ignored(dir, istate, path->buf, path->len);
2404 case path_untracked:
2405 if (dir->flags & DIR_SHOW_IGNORED)
2407 dir_add_name(dir, istate, path->buf, path->len);
2409 add_untracked(untracked, path->buf + baselen);
2418 * Read a directory tree. We currently ignore anything but
2419 * directories, regular files and symlinks. That's because git
2420 * doesn't handle them at all yet. Maybe that will change some
2423 * Also, we ignore the name ".git" (even if it is not a directory).
2424 * That likely will not change.
2426 * If 'stop_at_first_file' is specified, 'path_excluded' is returned
2427 * to signal that a file was found. This is the least significant value that
2428 * indicates that a file was encountered that does not depend on the order of
2429 * whether an untracked or excluded path was encountered first.
2431 * Returns the most significant path_treatment value encountered in the scan.
2432 * If 'stop_at_first_file' is specified, `path_excluded` is the most
2433 * significant path_treatment value that will be returned.
2436 static enum path_treatment read_directory_recursive(struct dir_struct *dir,
2437 struct index_state *istate, const char *base, int baselen,
2438 struct untracked_cache_dir *untracked, int check_only,
2439 int stop_at_first_file, const struct pathspec *pathspec)
2442 * WARNING: Do NOT recurse unless path_recurse is returned from
2443 * treat_path(). Recursing on any other return value
2444 * can result in exponential slowdown.
2446 struct cached_dir cdir;
2447 enum path_treatment state, subdir_state, dir_state = path_none;
2448 struct strbuf path = STRBUF_INIT;
2450 strbuf_add(&path, base, baselen);
2452 if (open_cached_dir(&cdir, dir, untracked, istate, &path, check_only))
2456 untracked->check_only = !!check_only;
2458 while (!read_cached_dir(&cdir)) {
2459 /* check how the file or directory should be treated */
2460 state = treat_path(dir, untracked, &cdir, istate, &path,
2463 if (state > dir_state)
2466 /* recurse into subdir if instructed by treat_path */
2467 if (state == path_recurse) {
2468 struct untracked_cache_dir *ud;
2469 ud = lookup_untracked(dir->untracked, untracked,
2471 path.len - baselen);
2473 read_directory_recursive(dir, istate, path.buf,
2475 check_only, stop_at_first_file, pathspec);
2476 if (subdir_state > dir_state)
2477 dir_state = subdir_state;
2480 !match_pathspec(istate, pathspec, path.buf, path.len,
2481 0 /* prefix */, NULL,
2482 0 /* do NOT special case dirs */))
2487 if (stop_at_first_file) {
2489 * If stopping at first file, then
2490 * signal that a file was found by
2491 * returning `path_excluded`. This is
2492 * to return a consistent value
2493 * regardless of whether an ignored or
2494 * excluded file happened to be
2497 * In current usage, the
2498 * `stop_at_first_file` is passed when
2499 * an ancestor directory has matched
2500 * an exclude pattern, so any found
2501 * files will be excluded.
2503 if (dir_state >= path_excluded) {
2504 dir_state = path_excluded;
2509 /* abort early if maximum state has been reached */
2510 if (dir_state == path_untracked) {
2512 add_untracked(untracked, path.buf + baselen);
2515 /* skip the add_path_to_appropriate_result_list() */
2519 add_path_to_appropriate_result_list(dir, untracked, &cdir,
2520 istate, &path, baselen,
2523 close_cached_dir(&cdir);
2525 strbuf_release(&path);
2530 int cmp_dir_entry(const void *p1, const void *p2)
2532 const struct dir_entry *e1 = *(const struct dir_entry **)p1;
2533 const struct dir_entry *e2 = *(const struct dir_entry **)p2;
2535 return name_compare(e1->name, e1->len, e2->name, e2->len);
2538 /* check if *out lexically strictly contains *in */
2539 int check_dir_entry_contains(const struct dir_entry *out, const struct dir_entry *in)
2541 return (out->len < in->len) &&
2542 (out->name[out->len - 1] == '/') &&
2543 !memcmp(out->name, in->name, out->len);
2546 static int treat_leading_path(struct dir_struct *dir,
2547 struct index_state *istate,
2548 const char *path, int len,
2549 const struct pathspec *pathspec)
2551 struct strbuf sb = STRBUF_INIT;
2552 struct strbuf subdir = STRBUF_INIT;
2553 int prevlen, baselen;
2555 struct cached_dir cdir;
2556 enum path_treatment state = path_none;
2559 * For each directory component of path, we are going to check whether
2560 * that path is relevant given the pathspec. For example, if path is
2562 * then we will ask treat_path() whether we should go into foo, then
2563 * whether we should go into bar, then whether baz is relevant.
2564 * Checking each is important because e.g. if path is
2566 * then we need to check .git to know we shouldn't traverse it.
2567 * If the return from treat_path() is:
2568 * * path_none, for any path, we return false.
2569 * * path_recurse, for all path components, we return true
2570 * * <anything else> for some intermediate component, we make sure
2571 * to add that path to the relevant list but return false
2572 * signifying that we shouldn't recurse into it.
2575 while (len && path[len - 1] == '/')
2580 memset(&cdir, 0, sizeof(cdir));
2581 cdir.d_type = DT_DIR;
2585 prevlen = baselen + !!baselen;
2586 cp = path + prevlen;
2587 cp = memchr(cp, '/', path + len - cp);
2591 baselen = cp - path;
2593 strbuf_add(&sb, path, baselen);
2594 if (!is_directory(sb.buf))
2597 strbuf_add(&sb, path, prevlen);
2598 strbuf_reset(&subdir);
2599 strbuf_add(&subdir, path+prevlen, baselen-prevlen);
2600 cdir.d_name = subdir.buf;
2601 state = treat_path(dir, NULL, &cdir, istate, &sb, prevlen, pathspec);
2603 if (state != path_recurse)
2604 break; /* do not recurse into it */
2606 break; /* finished checking */
2608 add_path_to_appropriate_result_list(dir, NULL, &cdir, istate,
2609 &sb, baselen, pathspec,
2612 strbuf_release(&subdir);
2613 strbuf_release(&sb);
2614 return state == path_recurse;
2617 static const char *get_ident_string(void)
2619 static struct strbuf sb = STRBUF_INIT;
2624 if (uname(&uts) < 0)
2625 die_errno(_("failed to get kernel name and information"));
2626 strbuf_addf(&sb, "Location %s, system %s", get_git_work_tree(),
2631 static int ident_in_untracked(const struct untracked_cache *uc)
2634 * Previous git versions may have saved many NUL separated
2635 * strings in the "ident" field, but it is insane to manage
2636 * many locations, so just take care of the first one.
2639 return !strcmp(uc->ident.buf, get_ident_string());
2642 static void set_untracked_ident(struct untracked_cache *uc)
2644 strbuf_reset(&uc->ident);
2645 strbuf_addstr(&uc->ident, get_ident_string());
2648 * This strbuf used to contain a list of NUL separated
2649 * strings, so save NUL too for backward compatibility.
2651 strbuf_addch(&uc->ident, 0);
2654 static void new_untracked_cache(struct index_state *istate)
2656 struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
2657 strbuf_init(&uc->ident, 100);
2658 uc->exclude_per_dir = ".gitignore";
2659 /* should be the same flags used by git-status */
2660 uc->dir_flags = DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
2661 set_untracked_ident(uc);
2662 istate->untracked = uc;
2663 istate->cache_changed |= UNTRACKED_CHANGED;
2666 void add_untracked_cache(struct index_state *istate)
2668 if (!istate->untracked) {
2669 new_untracked_cache(istate);
2671 if (!ident_in_untracked(istate->untracked)) {
2672 free_untracked_cache(istate->untracked);
2673 new_untracked_cache(istate);
2678 void remove_untracked_cache(struct index_state *istate)
2680 if (istate->untracked) {
2681 free_untracked_cache(istate->untracked);
2682 istate->untracked = NULL;
2683 istate->cache_changed |= UNTRACKED_CHANGED;
2687 static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *dir,
2689 const struct pathspec *pathspec)
2691 struct untracked_cache_dir *root;
2692 static int untracked_cache_disabled = -1;
2694 if (!dir->untracked)
2696 if (untracked_cache_disabled < 0)
2697 untracked_cache_disabled = git_env_bool("GIT_DISABLE_UNTRACKED_CACHE", 0);
2698 if (untracked_cache_disabled)
2702 * We only support $GIT_DIR/info/exclude and core.excludesfile
2703 * as the global ignore rule files. Any other additions
2704 * (e.g. from command line) invalidate the cache. This
2705 * condition also catches running setup_standard_excludes()
2706 * before setting dir->untracked!
2708 if (dir->unmanaged_exclude_files)
2712 * Optimize for the main use case only: whole-tree git
2713 * status. More work involved in treat_leading_path() if we
2714 * use cache on just a subset of the worktree. pathspec
2715 * support could make the matter even worse.
2717 if (base_len || (pathspec && pathspec->nr))
2720 /* Different set of flags may produce different results */
2721 if (dir->flags != dir->untracked->dir_flags ||
2723 * See treat_directory(), case index_nonexistent. Without
2724 * this flag, we may need to also cache .git file content
2725 * for the resolve_gitlink_ref() call, which we don't.
2727 !(dir->flags & DIR_SHOW_OTHER_DIRECTORIES) ||
2728 /* We don't support collecting ignore files */
2729 (dir->flags & (DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO |
2730 DIR_COLLECT_IGNORED)))
2734 * If we use .gitignore in the cache and now you change it to
2735 * .gitexclude, everything will go wrong.
2737 if (dir->exclude_per_dir != dir->untracked->exclude_per_dir &&
2738 strcmp(dir->exclude_per_dir, dir->untracked->exclude_per_dir))
2742 * EXC_CMDL is not considered in the cache. If people set it,
2745 if (dir->exclude_list_group[EXC_CMDL].nr)
2748 if (!ident_in_untracked(dir->untracked)) {
2749 warning(_("untracked cache is disabled on this system or location"));
2753 if (!dir->untracked->root)
2754 FLEX_ALLOC_STR(dir->untracked->root, name, "");
2756 /* Validate $GIT_DIR/info/exclude and core.excludesfile */
2757 root = dir->untracked->root;
2758 if (!oideq(&dir->ss_info_exclude.oid,
2759 &dir->untracked->ss_info_exclude.oid)) {
2760 invalidate_gitignore(dir->untracked, root);
2761 dir->untracked->ss_info_exclude = dir->ss_info_exclude;
2763 if (!oideq(&dir->ss_excludes_file.oid,
2764 &dir->untracked->ss_excludes_file.oid)) {
2765 invalidate_gitignore(dir->untracked, root);
2766 dir->untracked->ss_excludes_file = dir->ss_excludes_file;
2769 /* Make sure this directory is not dropped out at saving phase */
2774 int read_directory(struct dir_struct *dir, struct index_state *istate,
2775 const char *path, int len, const struct pathspec *pathspec)
2777 struct untracked_cache_dir *untracked;
2779 trace_performance_enter();
2781 if (has_symlink_leading_path(path, len)) {
2782 trace_performance_leave("read directory %.*s", len, path);
2786 untracked = validate_untracked_cache(dir, len, pathspec);
2789 * make sure untracked cache code path is disabled,
2790 * e.g. prep_exclude()
2792 dir->untracked = NULL;
2793 if (!len || treat_leading_path(dir, istate, path, len, pathspec))
2794 read_directory_recursive(dir, istate, path, len, untracked, 0, 0, pathspec);
2795 QSORT(dir->entries, dir->nr, cmp_dir_entry);
2796 QSORT(dir->ignored, dir->ignored_nr, cmp_dir_entry);
2798 trace_performance_leave("read directory %.*s", len, path);
2799 if (dir->untracked) {
2800 static int force_untracked_cache = -1;
2801 static struct trace_key trace_untracked_stats = TRACE_KEY_INIT(UNTRACKED_STATS);
2803 if (force_untracked_cache < 0)
2804 force_untracked_cache =
2805 git_env_bool("GIT_FORCE_UNTRACKED_CACHE", 0);
2806 trace_printf_key(&trace_untracked_stats,
2807 "node creation: %u\n"
2808 "gitignore invalidation: %u\n"
2809 "directory invalidation: %u\n"
2811 dir->untracked->dir_created,
2812 dir->untracked->gitignore_invalidated,
2813 dir->untracked->dir_invalidated,
2814 dir->untracked->dir_opened);
2815 if (force_untracked_cache &&
2816 dir->untracked == istate->untracked &&
2817 (dir->untracked->dir_opened ||
2818 dir->untracked->gitignore_invalidated ||
2819 dir->untracked->dir_invalidated))
2820 istate->cache_changed |= UNTRACKED_CHANGED;
2821 if (dir->untracked != istate->untracked) {
2822 FREE_AND_NULL(dir->untracked);
2828 int file_exists(const char *f)
2831 return lstat(f, &sb) == 0;
2834 int repo_file_exists(struct repository *repo, const char *path)
2836 if (repo != the_repository)
2837 BUG("do not know how to check file existence in arbitrary repo");
2839 return file_exists(path);
2842 static int cmp_icase(char a, char b)
2847 return toupper(a) - toupper(b);
2852 * Given two normalized paths (a trailing slash is ok), if subdir is
2853 * outside dir, return -1. Otherwise return the offset in subdir that
2854 * can be used as relative path to dir.
2856 int dir_inside_of(const char *subdir, const char *dir)
2860 assert(dir && subdir && *dir && *subdir);
2862 while (*dir && *subdir && !cmp_icase(*dir, *subdir)) {
2868 /* hel[p]/me vs hel[l]/yeah */
2869 if (*dir && *subdir)
2873 return !*dir ? offset : -1; /* same dir */
2875 /* foo/[b]ar vs foo/[] */
2876 if (is_dir_sep(dir[-1]))
2877 return is_dir_sep(subdir[-1]) ? offset : -1;
2879 /* foo[/]bar vs foo[] */
2880 return is_dir_sep(*subdir) ? offset + 1 : -1;
2883 int is_inside_dir(const char *dir)
2892 rc = (dir_inside_of(cwd, dir) >= 0);
2897 int is_empty_dir(const char *path)
2899 DIR *dir = opendir(path);
2906 while ((e = readdir(dir)) != NULL)
2907 if (!is_dot_or_dotdot(e->d_name)) {
2916 static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
2920 int ret = 0, original_len = path->len, len, kept_down = 0;
2921 int only_empty = (flag & REMOVE_DIR_EMPTY_ONLY);
2922 int keep_toplevel = (flag & REMOVE_DIR_KEEP_TOPLEVEL);
2923 struct object_id submodule_head;
2925 if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
2926 !resolve_gitlink_ref(path->buf, "HEAD", &submodule_head)) {
2927 /* Do not descend and nuke a nested git work tree. */
2933 flag &= ~REMOVE_DIR_KEEP_TOPLEVEL;
2934 dir = opendir(path->buf);
2936 if (errno == ENOENT)
2937 return keep_toplevel ? -1 : 0;
2938 else if (errno == EACCES && !keep_toplevel)
2940 * An empty dir could be removable even if it
2943 return rmdir(path->buf);
2947 strbuf_complete(path, '/');
2950 while ((e = readdir(dir)) != NULL) {
2952 if (is_dot_or_dotdot(e->d_name))
2955 strbuf_setlen(path, len);
2956 strbuf_addstr(path, e->d_name);
2957 if (lstat(path->buf, &st)) {
2958 if (errno == ENOENT)
2960 * file disappeared, which is what we
2965 } else if (S_ISDIR(st.st_mode)) {
2966 if (!remove_dir_recurse(path, flag, &kept_down))
2967 continue; /* happy */
2968 } else if (!only_empty &&
2969 (!unlink(path->buf) || errno == ENOENT)) {
2970 continue; /* happy, too */
2973 /* path too long, stat fails, or non-directory still exists */
2979 strbuf_setlen(path, original_len);
2980 if (!ret && !keep_toplevel && !kept_down)
2981 ret = (!rmdir(path->buf) || errno == ENOENT) ? 0 : -1;
2984 * report the uplevel that it is not an error that we
2985 * did not rmdir() our directory.
2991 int remove_dir_recursively(struct strbuf *path, int flag)
2993 return remove_dir_recurse(path, flag, NULL);
2996 static GIT_PATH_FUNC(git_path_info_exclude, "info/exclude")
2998 void setup_standard_excludes(struct dir_struct *dir)
3000 dir->exclude_per_dir = ".gitignore";
3002 /* core.excludesfile defaulting to $XDG_CONFIG_HOME/git/ignore */
3004 excludes_file = xdg_config_home("ignore");
3005 if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))
3006 add_patterns_from_file_1(dir, excludes_file,
3007 dir->untracked ? &dir->ss_excludes_file : NULL);
3009 /* per repository user preference */
3010 if (startup_info->have_repository) {
3011 const char *path = git_path_info_exclude();
3012 if (!access_or_warn(path, R_OK, 0))
3013 add_patterns_from_file_1(dir, path,
3014 dir->untracked ? &dir->ss_info_exclude : NULL);
3018 char *get_sparse_checkout_filename(void)
3020 return git_pathdup("info/sparse-checkout");
3023 int get_sparse_checkout_patterns(struct pattern_list *pl)
3026 char *sparse_filename = get_sparse_checkout_filename();
3028 pl->use_cone_patterns = core_sparse_checkout_cone;
3029 res = add_patterns_from_file_to_list(sparse_filename, "", 0, pl, NULL, 0);
3031 free(sparse_filename);
3035 int remove_path(const char *name)
3039 if (unlink(name) && !is_missing_file_error(errno))
3042 slash = strrchr(name, '/');
3044 char *dirs = xstrdup(name);
3045 slash = dirs + (slash - name);
3048 } while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/')));
3055 * Frees memory within dir which was allocated, and resets fields for further
3056 * use. Does not free dir itself.
3058 void dir_clear(struct dir_struct *dir)
3061 struct exclude_list_group *group;
3062 struct pattern_list *pl;
3063 struct exclude_stack *stk;
3065 for (i = EXC_CMDL; i <= EXC_FILE; i++) {
3066 group = &dir->exclude_list_group[i];
3067 for (j = 0; j < group->nr; j++) {
3070 free((char *)pl->src);
3071 clear_pattern_list(pl);
3076 for (i = 0; i < dir->ignored_nr; i++)
3077 free(dir->ignored[i]);
3078 for (i = 0; i < dir->nr; i++)
3079 free(dir->entries[i]);
3083 stk = dir->exclude_stack;
3085 struct exclude_stack *prev = stk->prev;
3089 strbuf_release(&dir->basebuf);
3094 struct ondisk_untracked_cache {
3095 struct stat_data info_exclude_stat;
3096 struct stat_data excludes_file_stat;
3100 #define ouc_offset(x) offsetof(struct ondisk_untracked_cache, x)
3103 int index; /* number of written untracked_cache_dir */
3104 struct ewah_bitmap *check_only; /* from untracked_cache_dir */
3105 struct ewah_bitmap *valid; /* from untracked_cache_dir */
3106 struct ewah_bitmap *sha1_valid; /* set if exclude_sha1 is not null */
3108 struct strbuf sb_stat;
3109 struct strbuf sb_sha1;
3112 static void stat_data_to_disk(struct stat_data *to, const struct stat_data *from)
3114 to->sd_ctime.sec = htonl(from->sd_ctime.sec);
3115 to->sd_ctime.nsec = htonl(from->sd_ctime.nsec);
3116 to->sd_mtime.sec = htonl(from->sd_mtime.sec);
3117 to->sd_mtime.nsec = htonl(from->sd_mtime.nsec);
3118 to->sd_dev = htonl(from->sd_dev);
3119 to->sd_ino = htonl(from->sd_ino);
3120 to->sd_uid = htonl(from->sd_uid);
3121 to->sd_gid = htonl(from->sd_gid);
3122 to->sd_size = htonl(from->sd_size);
3125 static void write_one_dir(struct untracked_cache_dir *untracked,
3126 struct write_data *wd)
3128 struct stat_data stat_data;
3129 struct strbuf *out = &wd->out;
3130 unsigned char intbuf[16];
3131 unsigned int intlen, value;
3132 int i = wd->index++;
3135 * untracked_nr should be reset whenever valid is clear, but
3138 if (!untracked->valid) {
3139 untracked->untracked_nr = 0;
3140 untracked->check_only = 0;
3143 if (untracked->check_only)
3144 ewah_set(wd->check_only, i);
3145 if (untracked->valid) {
3146 ewah_set(wd->valid, i);
3147 stat_data_to_disk(&stat_data, &untracked->stat_data);
3148 strbuf_add(&wd->sb_stat, &stat_data, sizeof(stat_data));
3150 if (!is_null_oid(&untracked->exclude_oid)) {
3151 ewah_set(wd->sha1_valid, i);
3152 strbuf_add(&wd->sb_sha1, untracked->exclude_oid.hash,
3153 the_hash_algo->rawsz);
3156 intlen = encode_varint(untracked->untracked_nr, intbuf);
3157 strbuf_add(out, intbuf, intlen);
3159 /* skip non-recurse directories */
3160 for (i = 0, value = 0; i < untracked->dirs_nr; i++)
3161 if (untracked->dirs[i]->recurse)
3163 intlen = encode_varint(value, intbuf);
3164 strbuf_add(out, intbuf, intlen);
3166 strbuf_add(out, untracked->name, strlen(untracked->name) + 1);
3168 for (i = 0; i < untracked->untracked_nr; i++)
3169 strbuf_add(out, untracked->untracked[i],
3170 strlen(untracked->untracked[i]) + 1);
3172 for (i = 0; i < untracked->dirs_nr; i++)
3173 if (untracked->dirs[i]->recurse)
3174 write_one_dir(untracked->dirs[i], wd);
3177 void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked)
3179 struct ondisk_untracked_cache *ouc;
3180 struct write_data wd;
3181 unsigned char varbuf[16];
3183 const unsigned hashsz = the_hash_algo->rawsz;
3185 CALLOC_ARRAY(ouc, 1);
3186 stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclude.stat);
3187 stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_file.stat);
3188 ouc->dir_flags = htonl(untracked->dir_flags);
3190 varint_len = encode_varint(untracked->ident.len, varbuf);
3191 strbuf_add(out, varbuf, varint_len);
3192 strbuf_addbuf(out, &untracked->ident);
3194 strbuf_add(out, ouc, sizeof(*ouc));
3195 strbuf_add(out, untracked->ss_info_exclude.oid.hash, hashsz);
3196 strbuf_add(out, untracked->ss_excludes_file.oid.hash, hashsz);
3197 strbuf_add(out, untracked->exclude_per_dir, strlen(untracked->exclude_per_dir) + 1);
3200 if (!untracked->root) {
3201 varint_len = encode_varint(0, varbuf);
3202 strbuf_add(out, varbuf, varint_len);
3207 wd.check_only = ewah_new();
3208 wd.valid = ewah_new();
3209 wd.sha1_valid = ewah_new();
3210 strbuf_init(&wd.out, 1024);
3211 strbuf_init(&wd.sb_stat, 1024);
3212 strbuf_init(&wd.sb_sha1, 1024);
3213 write_one_dir(untracked->root, &wd);
3215 varint_len = encode_varint(wd.index, varbuf);
3216 strbuf_add(out, varbuf, varint_len);
3217 strbuf_addbuf(out, &wd.out);
3218 ewah_serialize_strbuf(wd.valid, out);
3219 ewah_serialize_strbuf(wd.check_only, out);
3220 ewah_serialize_strbuf(wd.sha1_valid, out);
3221 strbuf_addbuf(out, &wd.sb_stat);
3222 strbuf_addbuf(out, &wd.sb_sha1);
3223 strbuf_addch(out, '\0'); /* safe guard for string lists */
3225 ewah_free(wd.valid);
3226 ewah_free(wd.check_only);
3227 ewah_free(wd.sha1_valid);
3228 strbuf_release(&wd.out);
3229 strbuf_release(&wd.sb_stat);
3230 strbuf_release(&wd.sb_sha1);
3233 static void free_untracked(struct untracked_cache_dir *ucd)
3238 for (i = 0; i < ucd->dirs_nr; i++)
3239 free_untracked(ucd->dirs[i]);
3240 for (i = 0; i < ucd->untracked_nr; i++)
3241 free(ucd->untracked[i]);
3242 free(ucd->untracked);
3247 void free_untracked_cache(struct untracked_cache *uc)
3250 free_untracked(uc->root);
3256 struct untracked_cache_dir **ucd;
3257 struct ewah_bitmap *check_only;
3258 struct ewah_bitmap *valid;
3259 struct ewah_bitmap *sha1_valid;
3260 const unsigned char *data;
3261 const unsigned char *end;
3264 static void stat_data_from_disk(struct stat_data *to, const unsigned char *data)
3266 memcpy(to, data, sizeof(*to));
3267 to->sd_ctime.sec = ntohl(to->sd_ctime.sec);
3268 to->sd_ctime.nsec = ntohl(to->sd_ctime.nsec);
3269 to->sd_mtime.sec = ntohl(to->sd_mtime.sec);
3270 to->sd_mtime.nsec = ntohl(to->sd_mtime.nsec);
3271 to->sd_dev = ntohl(to->sd_dev);
3272 to->sd_ino = ntohl(to->sd_ino);
3273 to->sd_uid = ntohl(to->sd_uid);
3274 to->sd_gid = ntohl(to->sd_gid);
3275 to->sd_size = ntohl(to->sd_size);
3278 static int read_one_dir(struct untracked_cache_dir **untracked_,
3279 struct read_data *rd)
3281 struct untracked_cache_dir ud, *untracked;
3282 const unsigned char *data = rd->data, *end = rd->end;
3283 const unsigned char *eos;
3287 memset(&ud, 0, sizeof(ud));
3289 value = decode_varint(&data);
3293 ud.untracked_alloc = value;
3294 ud.untracked_nr = value;
3295 if (ud.untracked_nr)
3296 ALLOC_ARRAY(ud.untracked, ud.untracked_nr);
3298 ud.dirs_alloc = ud.dirs_nr = decode_varint(&data);
3301 ALLOC_ARRAY(ud.dirs, ud.dirs_nr);
3303 eos = memchr(data, '\0', end - data);
3304 if (!eos || eos == end)
3307 *untracked_ = untracked = xmalloc(st_add3(sizeof(*untracked), eos - data, 1));
3308 memcpy(untracked, &ud, sizeof(ud));
3309 memcpy(untracked->name, data, eos - data + 1);
3312 for (i = 0; i < untracked->untracked_nr; i++) {
3313 eos = memchr(data, '\0', end - data);
3314 if (!eos || eos == end)
3316 untracked->untracked[i] = xmemdupz(data, eos - data);
3320 rd->ucd[rd->index++] = untracked;
3323 for (i = 0; i < untracked->dirs_nr; i++) {
3324 if (read_one_dir(untracked->dirs + i, rd) < 0)
3330 static void set_check_only(size_t pos, void *cb)
3332 struct read_data *rd = cb;
3333 struct untracked_cache_dir *ud = rd->ucd[pos];
3337 static void read_stat(size_t pos, void *cb)
3339 struct read_data *rd = cb;
3340 struct untracked_cache_dir *ud = rd->ucd[pos];
3341 if (rd->data + sizeof(struct stat_data) > rd->end) {
3342 rd->data = rd->end + 1;
3345 stat_data_from_disk(&ud->stat_data, rd->data);
3346 rd->data += sizeof(struct stat_data);
3350 static void read_oid(size_t pos, void *cb)
3352 struct read_data *rd = cb;
3353 struct untracked_cache_dir *ud = rd->ucd[pos];
3354 if (rd->data + the_hash_algo->rawsz > rd->end) {
3355 rd->data = rd->end + 1;
3358 hashcpy(ud->exclude_oid.hash, rd->data);
3359 rd->data += the_hash_algo->rawsz;
3362 static void load_oid_stat(struct oid_stat *oid_stat, const unsigned char *data,
3363 const unsigned char *sha1)
3365 stat_data_from_disk(&oid_stat->stat, data);
3366 hashcpy(oid_stat->oid.hash, sha1);
3367 oid_stat->valid = 1;
3370 struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz)
3372 struct untracked_cache *uc;
3373 struct read_data rd;
3374 const unsigned char *next = data, *end = (const unsigned char *)data + sz;
3378 const char *exclude_per_dir;
3379 const unsigned hashsz = the_hash_algo->rawsz;
3380 const unsigned offset = sizeof(struct ondisk_untracked_cache);
3381 const unsigned exclude_per_dir_offset = offset + 2 * hashsz;
3383 if (sz <= 1 || end[-1] != '\0')
3387 ident_len = decode_varint(&next);
3388 if (next + ident_len > end)
3390 ident = (const char *)next;
3393 if (next + exclude_per_dir_offset + 1 > end)
3396 CALLOC_ARRAY(uc, 1);
3397 strbuf_init(&uc->ident, ident_len);
3398 strbuf_add(&uc->ident, ident, ident_len);
3399 load_oid_stat(&uc->ss_info_exclude,
3400 next + ouc_offset(info_exclude_stat),
3402 load_oid_stat(&uc->ss_excludes_file,
3403 next + ouc_offset(excludes_file_stat),
3404 next + offset + hashsz);
3405 uc->dir_flags = get_be32(next + ouc_offset(dir_flags));
3406 exclude_per_dir = (const char *)next + exclude_per_dir_offset;
3407 uc->exclude_per_dir = xstrdup(exclude_per_dir);
3408 /* NUL after exclude_per_dir is covered by sizeof(*ouc) */
3409 next += exclude_per_dir_offset + strlen(exclude_per_dir) + 1;
3413 len = decode_varint(&next);
3414 if (next > end || len == 0)
3417 rd.valid = ewah_new();
3418 rd.check_only = ewah_new();
3419 rd.sha1_valid = ewah_new();
3423 ALLOC_ARRAY(rd.ucd, len);
3425 if (read_one_dir(&uc->root, &rd) || rd.index != len)
3429 len = ewah_read_mmap(rd.valid, next, end - next);
3434 len = ewah_read_mmap(rd.check_only, next, end - next);
3439 len = ewah_read_mmap(rd.sha1_valid, next, end - next);
3443 ewah_each_bit(rd.check_only, set_check_only, &rd);
3444 rd.data = next + len;
3445 ewah_each_bit(rd.valid, read_stat, &rd);
3446 ewah_each_bit(rd.sha1_valid, read_oid, &rd);
3451 ewah_free(rd.valid);
3452 ewah_free(rd.check_only);
3453 ewah_free(rd.sha1_valid);
3456 free_untracked_cache(uc);
3462 static void invalidate_one_directory(struct untracked_cache *uc,
3463 struct untracked_cache_dir *ucd)
3465 uc->dir_invalidated++;
3467 ucd->untracked_nr = 0;
3471 * Normally when an entry is added or removed from a directory,
3472 * invalidating that directory is enough. No need to touch its
3473 * ancestors. When a directory is shown as "foo/bar/" in git-status
3474 * however, deleting or adding an entry may have cascading effect.
3476 * Say the "foo/bar/file" has become untracked, we need to tell the
3477 * untracked_cache_dir of "foo" that "bar/" is not an untracked
3478 * directory any more (because "bar" is managed by foo as an untracked
3481 * Similarly, if "foo/bar/file" moves from untracked to tracked and it
3482 * was the last untracked entry in the entire "foo", we should show
3483 * "foo/" instead. Which means we have to invalidate past "bar" up to
3486 * This function traverses all directories from root to leaf. If there
3487 * is a chance of one of the above cases happening, we invalidate back
3488 * to root. Otherwise we just invalidate the leaf. There may be a more
3489 * sophisticated way than checking for SHOW_OTHER_DIRECTORIES to
3490 * detect these cases and avoid unnecessary invalidation, for example,
3491 * checking for the untracked entry named "bar/" in "foo", but for now
3492 * stick to something safe and simple.
3494 static int invalidate_one_component(struct untracked_cache *uc,
3495 struct untracked_cache_dir *dir,
3496 const char *path, int len)
3498 const char *rest = strchr(path, '/');
3501 int component_len = rest - path;
3502 struct untracked_cache_dir *d =
3503 lookup_untracked(uc, dir, path, component_len);
3505 invalidate_one_component(uc, d, rest + 1,
3506 len - (component_len + 1));
3508 invalidate_one_directory(uc, dir);
3512 invalidate_one_directory(uc, dir);
3513 return uc->dir_flags & DIR_SHOW_OTHER_DIRECTORIES;
3516 void untracked_cache_invalidate_path(struct index_state *istate,
3517 const char *path, int safe_path)
3519 if (!istate->untracked || !istate->untracked->root)
3521 if (!safe_path && !verify_path(path, 0))
3523 invalidate_one_component(istate->untracked, istate->untracked->root,
3524 path, strlen(path));
3527 void untracked_cache_remove_from_index(struct index_state *istate,
3530 untracked_cache_invalidate_path(istate, path, 1);
3533 void untracked_cache_add_to_index(struct index_state *istate,
3536 untracked_cache_invalidate_path(istate, path, 1);
3539 static void connect_wt_gitdir_in_nested(const char *sub_worktree,
3540 const char *sub_gitdir)
3543 struct repository subrepo;
3544 struct strbuf sub_wt = STRBUF_INIT;
3545 struct strbuf sub_gd = STRBUF_INIT;
3547 const struct submodule *sub;
3549 /* If the submodule has no working tree, we can ignore it. */
3550 if (repo_init(&subrepo, sub_gitdir, sub_worktree))
3553 if (repo_read_index(&subrepo) < 0)
3554 die(_("index file corrupt in repo %s"), subrepo.gitdir);
3556 /* TODO: audit for interaction with sparse-index. */
3557 ensure_full_index(subrepo.index);
3558 for (i = 0; i < subrepo.index->cache_nr; i++) {
3559 const struct cache_entry *ce = subrepo.index->cache[i];
3561 if (!S_ISGITLINK(ce->ce_mode))
3564 while (i + 1 < subrepo.index->cache_nr &&
3565 !strcmp(ce->name, subrepo.index->cache[i + 1]->name))
3567 * Skip entries with the same name in different stages
3568 * to make sure an entry is returned only once.
3572 sub = submodule_from_path(&subrepo, &null_oid, ce->name);
3573 if (!sub || !is_submodule_active(&subrepo, ce->name))
3574 /* .gitmodules broken or inactive sub */
3577 strbuf_reset(&sub_wt);
3578 strbuf_reset(&sub_gd);
3579 strbuf_addf(&sub_wt, "%s/%s", sub_worktree, sub->path);
3580 strbuf_addf(&sub_gd, "%s/modules/%s", sub_gitdir, sub->name);
3582 connect_work_tree_and_git_dir(sub_wt.buf, sub_gd.buf, 1);
3584 strbuf_release(&sub_wt);
3585 strbuf_release(&sub_gd);
3586 repo_clear(&subrepo);
3589 void connect_work_tree_and_git_dir(const char *work_tree_,
3590 const char *git_dir_,
3591 int recurse_into_nested)
3593 struct strbuf gitfile_sb = STRBUF_INIT;
3594 struct strbuf cfg_sb = STRBUF_INIT;
3595 struct strbuf rel_path = STRBUF_INIT;
3596 char *git_dir, *work_tree;
3598 /* Prepare .git file */
3599 strbuf_addf(&gitfile_sb, "%s/.git", work_tree_);
3600 if (safe_create_leading_directories_const(gitfile_sb.buf))
3601 die(_("could not create directories for %s"), gitfile_sb.buf);
3603 /* Prepare config file */
3604 strbuf_addf(&cfg_sb, "%s/config", git_dir_);
3605 if (safe_create_leading_directories_const(cfg_sb.buf))
3606 die(_("could not create directories for %s"), cfg_sb.buf);
3608 git_dir = real_pathdup(git_dir_, 1);
3609 work_tree = real_pathdup(work_tree_, 1);
3611 /* Write .git file */
3612 write_file(gitfile_sb.buf, "gitdir: %s",
3613 relative_path(git_dir, work_tree, &rel_path));
3614 /* Update core.worktree setting */
3615 git_config_set_in_file(cfg_sb.buf, "core.worktree",
3616 relative_path(work_tree, git_dir, &rel_path));
3618 strbuf_release(&gitfile_sb);
3619 strbuf_release(&cfg_sb);
3620 strbuf_release(&rel_path);
3622 if (recurse_into_nested)
3623 connect_wt_gitdir_in_nested(work_tree, git_dir);
3630 * Migrate the git directory of the given path from old_git_dir to new_git_dir.
3632 void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_git_dir)
3634 if (rename(old_git_dir, new_git_dir) < 0)
3635 die_errno(_("could not migrate git directory from '%s' to '%s'"),
3636 old_git_dir, new_git_dir);
3638 connect_work_tree_and_git_dir(path, new_git_dir, 0);