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
14 #include "wildmatch.h"
18 #include "ewah/ewok.h"
21 * Tells read_directory_recursive how a file or directory should be treated.
22 * Values are ordered by significance, e.g. if a directory contains both
23 * excluded and untracked files, it is listed as untracked because
24 * path_untracked > path_excluded.
34 * Support data structure for our opendir/readdir/closedir wrappers
38 struct untracked_cache_dir *untracked;
44 struct untracked_cache_dir *ucd;
47 static enum path_treatment read_directory_recursive(struct dir_struct *dir,
48 const char *path, int len, struct untracked_cache_dir *untracked,
49 int check_only, const struct pathspec *pathspec);
50 static int get_dtype(struct dirent *de, const char *path, int len);
52 int count_slashes(const char *s)
61 int fspathcmp(const char *a, const char *b)
63 return ignore_case ? strcasecmp(a, b) : strcmp(a, b);
66 int fspathncmp(const char *a, const char *b, size_t count)
68 return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count);
71 int git_fnmatch(const struct pathspec_item *item,
72 const char *pattern, const char *string,
76 if (ps_strncmp(item, pattern, string, prefix))
81 if (item->flags & PATHSPEC_ONESTAR) {
82 int pattern_len = strlen(++pattern);
83 int string_len = strlen(string);
84 return string_len < pattern_len ||
85 ps_strcmp(item, pattern,
86 string + string_len - pattern_len);
88 if (item->magic & PATHSPEC_GLOB)
89 return wildmatch(pattern, string,
91 (item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0),
94 /* wildmatch has not learned no FNM_PATHNAME mode yet */
95 return wildmatch(pattern, string,
96 item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0,
100 static int fnmatch_icase_mem(const char *pattern, int patternlen,
101 const char *string, int stringlen,
105 struct strbuf pat_buf = STRBUF_INIT;
106 struct strbuf str_buf = STRBUF_INIT;
107 const char *use_pat = pattern;
108 const char *use_str = string;
110 if (pattern[patternlen]) {
111 strbuf_add(&pat_buf, pattern, patternlen);
112 use_pat = pat_buf.buf;
114 if (string[stringlen]) {
115 strbuf_add(&str_buf, string, stringlen);
116 use_str = str_buf.buf;
120 flags |= WM_CASEFOLD;
121 match_status = wildmatch(use_pat, use_str, flags, NULL);
123 strbuf_release(&pat_buf);
124 strbuf_release(&str_buf);
129 static size_t common_prefix_len(const struct pathspec *pathspec)
135 * ":(icase)path" is treated as a pathspec full of
136 * wildcard. In other words, only prefix is considered common
137 * prefix. If the pathspec is abc/foo abc/bar, running in
138 * subdir xyz, the common prefix is still xyz, not xuz/abc as
141 GUARD_PATHSPEC(pathspec,
150 for (n = 0; n < pathspec->nr; n++) {
151 size_t i = 0, len = 0, item_len;
152 if (pathspec->items[n].magic & PATHSPEC_EXCLUDE)
154 if (pathspec->items[n].magic & PATHSPEC_ICASE)
155 item_len = pathspec->items[n].prefix;
157 item_len = pathspec->items[n].nowildcard_len;
158 while (i < item_len && (n == 0 || i < max)) {
159 char c = pathspec->items[n].match[i];
160 if (c != pathspec->items[0].match[i])
166 if (n == 0 || len < max) {
176 * Returns a copy of the longest leading path common among all
179 char *common_prefix(const struct pathspec *pathspec)
181 unsigned long len = common_prefix_len(pathspec);
183 return len ? xmemdupz(pathspec->items[0].match, len) : NULL;
186 int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec)
192 * Calculate common prefix for the pathspec, and
193 * use that to optimize the directory walk
195 prefix_len = common_prefix_len(pathspec);
196 prefix = prefix_len ? pathspec->items[0].match : "";
198 /* Read the directory and prune it */
199 read_directory(dir, prefix, prefix_len, pathspec);
204 int within_depth(const char *name, int namelen,
205 int depth, int max_depth)
207 const char *cp = name, *cpe = name + namelen;
213 if (depth > max_depth)
219 #define DO_MATCH_EXCLUDE (1<<0)
220 #define DO_MATCH_DIRECTORY (1<<1)
221 #define DO_MATCH_SUBMODULE (1<<2)
223 static int match_attrs(const char *name, int namelen,
224 const struct pathspec_item *item)
228 git_check_attr(name, item->attr_check);
229 for (i = 0; i < item->attr_match_nr; i++) {
232 enum attr_match_mode match_mode;
234 value = item->attr_check->items[i].value;
235 match_mode = item->attr_match[i].match_mode;
237 if (ATTR_TRUE(value))
238 matched = (match_mode == MATCH_SET);
239 else if (ATTR_FALSE(value))
240 matched = (match_mode == MATCH_UNSET);
241 else if (ATTR_UNSET(value))
242 matched = (match_mode == MATCH_UNSPECIFIED);
244 matched = (match_mode == MATCH_VALUE &&
245 !strcmp(item->attr_match[i].value, value));
254 * Does 'match' match the given name?
255 * A match is found if
257 * (1) the 'match' string is leading directory of 'name', or
258 * (2) the 'match' string is a wildcard and matches 'name', or
259 * (3) the 'match' string is exactly the same as 'name'.
261 * and the return value tells which case it was.
263 * It returns 0 when there is no match.
265 static int match_pathspec_item(const struct pathspec_item *item, int prefix,
266 const char *name, int namelen, unsigned flags)
268 /* name/namelen has prefix cut off by caller */
269 const char *match = item->match + prefix;
270 int matchlen = item->len - prefix;
273 * The normal call pattern is:
274 * 1. prefix = common_prefix_len(ps);
275 * 2. prune something, or fill_directory
276 * 3. match_pathspec()
278 * 'prefix' at #1 may be shorter than the command's prefix and
279 * it's ok for #2 to match extra files. Those extras will be
282 * Suppose the pathspec is 'foo' and '../bar' running from
283 * subdir 'xyz'. The common prefix at #1 will be empty, thanks
284 * to "../". We may have xyz/foo _and_ XYZ/foo after #2. The
285 * user does not want XYZ/foo, only the "foo" part should be
286 * case-insensitive. We need to filter out XYZ/foo here. In
287 * other words, we do not trust the caller on comparing the
288 * prefix part when :(icase) is involved. We do exact
289 * comparison ourselves.
291 * Normally the caller (common_prefix_len() in fact) does
292 * _exact_ matching on name[-prefix+1..-1] and we do not need
293 * to check that part. Be defensive and check it anyway, in
294 * case common_prefix_len is changed, or a new caller is
295 * introduced that does not use common_prefix_len.
297 * If the penalty turns out too high when prefix is really
298 * long, maybe change it to
299 * strncmp(match, name, item->prefix - prefix)
301 if (item->prefix && (item->magic & PATHSPEC_ICASE) &&
302 strncmp(item->match, name - prefix, item->prefix))
305 if (item->attr_match_nr && !match_attrs(name, namelen, item))
308 /* If the match was just the prefix, we matched */
310 return MATCHED_RECURSIVELY;
312 if (matchlen <= namelen && !ps_strncmp(item, match, name, matchlen)) {
313 if (matchlen == namelen)
314 return MATCHED_EXACTLY;
316 if (match[matchlen-1] == '/' || name[matchlen] == '/')
317 return MATCHED_RECURSIVELY;
318 } else if ((flags & DO_MATCH_DIRECTORY) &&
319 match[matchlen - 1] == '/' &&
320 namelen == matchlen - 1 &&
321 !ps_strncmp(item, match, name, namelen))
322 return MATCHED_EXACTLY;
324 if (item->nowildcard_len < item->len &&
325 !git_fnmatch(item, match, name,
326 item->nowildcard_len - prefix))
327 return MATCHED_FNMATCH;
329 /* Perform checks to see if "name" is a super set of the pathspec */
330 if (flags & DO_MATCH_SUBMODULE) {
331 /* name is a literal prefix of the pathspec */
332 if ((namelen < matchlen) &&
333 (match[namelen] == '/') &&
334 !ps_strncmp(item, match, name, namelen))
335 return MATCHED_RECURSIVELY;
337 /* name" doesn't match up to the first wild character */
338 if (item->nowildcard_len < item->len &&
339 ps_strncmp(item, match, name,
340 item->nowildcard_len - prefix))
344 * Here is where we would perform a wildmatch to check if
345 * "name" can be matched as a directory (or a prefix) against
346 * the pathspec. Since wildmatch doesn't have this capability
347 * at the present we have to punt and say that it is a match,
348 * potentially returning a false positive
349 * The submodules themselves will be able to perform more
350 * accurate matching to determine if the pathspec matches.
352 return MATCHED_RECURSIVELY;
359 * Given a name and a list of pathspecs, returns the nature of the
360 * closest (i.e. most specific) match of the name to any of the
363 * The caller typically calls this multiple times with the same
364 * pathspec and seen[] array but with different name/namelen
365 * (e.g. entries from the index) and is interested in seeing if and
366 * how each pathspec matches all the names it calls this function
367 * with. A mark is left in the seen[] array for each pathspec element
368 * indicating the closest type of match that element achieved, so if
369 * seen[n] remains zero after multiple invocations, that means the nth
370 * pathspec did not match any names, which could indicate that the
371 * user mistyped the nth pathspec.
373 static int do_match_pathspec(const struct pathspec *ps,
374 const char *name, int namelen,
375 int prefix, char *seen,
378 int i, retval = 0, exclude = flags & DO_MATCH_EXCLUDE;
390 if (!ps->recursive ||
391 !(ps->magic & PATHSPEC_MAXDEPTH) ||
393 return MATCHED_RECURSIVELY;
395 if (within_depth(name, namelen, 0, ps->max_depth))
396 return MATCHED_EXACTLY;
404 for (i = ps->nr - 1; i >= 0; i--) {
407 if ((!exclude && ps->items[i].magic & PATHSPEC_EXCLUDE) ||
408 ( exclude && !(ps->items[i].magic & PATHSPEC_EXCLUDE)))
411 if (seen && seen[i] == MATCHED_EXACTLY)
414 * Make exclude patterns optional and never report
415 * "pathspec ':(exclude)foo' matches no files"
417 if (seen && ps->items[i].magic & PATHSPEC_EXCLUDE)
418 seen[i] = MATCHED_FNMATCH;
419 how = match_pathspec_item(ps->items+i, prefix, name,
422 (ps->magic & PATHSPEC_MAXDEPTH) &&
423 ps->max_depth != -1 &&
424 how && how != MATCHED_FNMATCH) {
425 int len = ps->items[i].len;
426 if (name[len] == '/')
428 if (within_depth(name+len, namelen-len, 0, ps->max_depth))
429 how = MATCHED_EXACTLY;
436 if (seen && seen[i] < how)
443 int match_pathspec(const struct pathspec *ps,
444 const char *name, int namelen,
445 int prefix, char *seen, int is_dir)
447 int positive, negative;
448 unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0;
449 positive = do_match_pathspec(ps, name, namelen,
450 prefix, seen, flags);
451 if (!(ps->magic & PATHSPEC_EXCLUDE) || !positive)
453 negative = do_match_pathspec(ps, name, namelen,
455 flags | DO_MATCH_EXCLUDE);
456 return negative ? 0 : positive;
460 * Check if a submodule is a superset of the pathspec
462 int submodule_path_match(const struct pathspec *ps,
463 const char *submodule_name,
466 int matched = do_match_pathspec(ps, submodule_name,
467 strlen(submodule_name),
474 int report_path_error(const char *ps_matched,
475 const struct pathspec *pathspec,
479 * Make sure all pathspec matched; otherwise it is an error.
482 for (num = 0; num < pathspec->nr; num++) {
483 int other, found_dup;
488 * The caller might have fed identical pathspec
489 * twice. Do not barf on such a mistake.
490 * FIXME: parse_pathspec should have eliminated
491 * duplicate pathspec.
493 for (found_dup = other = 0;
494 !found_dup && other < pathspec->nr;
496 if (other == num || !ps_matched[other])
498 if (!strcmp(pathspec->items[other].original,
499 pathspec->items[num].original))
501 * Ok, we have a match already.
508 error("pathspec '%s' did not match any file(s) known to git.",
509 pathspec->items[num].original);
516 * Return the length of the "simple" part of a path match limiter.
518 int simple_length(const char *match)
523 unsigned char c = *match++;
525 if (c == '\0' || is_glob_special(c))
530 int no_wildcard(const char *string)
532 return string[simple_length(string)] == '\0';
535 void parse_exclude_pattern(const char **pattern,
540 const char *p = *pattern;
545 *flags |= EXC_FLAG_NEGATIVE;
549 if (len && p[len - 1] == '/') {
551 *flags |= EXC_FLAG_MUSTBEDIR;
553 for (i = 0; i < len; i++) {
558 *flags |= EXC_FLAG_NODIR;
559 *nowildcardlen = simple_length(p);
561 * we should have excluded the trailing slash from 'p' too,
562 * but that's one more allocation. Instead just make sure
563 * nowildcardlen does not exceed real patternlen
565 if (*nowildcardlen > len)
566 *nowildcardlen = len;
567 if (*p == '*' && no_wildcard(p + 1))
568 *flags |= EXC_FLAG_ENDSWITH;
573 void add_exclude(const char *string, const char *base,
574 int baselen, struct exclude_list *el, int srcpos)
581 parse_exclude_pattern(&string, &patternlen, &flags, &nowildcardlen);
582 if (flags & EXC_FLAG_MUSTBEDIR) {
583 FLEXPTR_ALLOC_MEM(x, pattern, string, patternlen);
585 x = xmalloc(sizeof(*x));
588 x->patternlen = patternlen;
589 x->nowildcardlen = nowildcardlen;
591 x->baselen = baselen;
594 ALLOC_GROW(el->excludes, el->nr + 1, el->alloc);
595 el->excludes[el->nr++] = x;
599 static void *read_skip_worktree_file_from_index(const char *path, size_t *size,
600 struct sha1_stat *sha1_stat)
604 enum object_type type;
608 pos = cache_name_pos(path, len);
611 if (!ce_skip_worktree(active_cache[pos]))
613 data = read_sha1_file(active_cache[pos]->oid.hash, &type, &sz);
614 if (!data || type != OBJ_BLOB) {
620 memset(&sha1_stat->stat, 0, sizeof(sha1_stat->stat));
621 hashcpy(sha1_stat->sha1, active_cache[pos]->oid.hash);
627 * Frees memory within el which was allocated for exclude patterns and
628 * the file buffer. Does not free el itself.
630 void clear_exclude_list(struct exclude_list *el)
634 for (i = 0; i < el->nr; i++)
635 free(el->excludes[i]);
639 memset(el, 0, sizeof(*el));
642 static void trim_trailing_spaces(char *buf)
644 char *p, *last_space = NULL;
646 for (p = buf; *p; p++)
666 * Given a subdirectory name and "dir" of the current directory,
667 * search the subdir in "dir" and return it, or create a new one if it
668 * does not exist in "dir".
670 * If "name" has the trailing slash, it'll be excluded in the search.
672 static struct untracked_cache_dir *lookup_untracked(struct untracked_cache *uc,
673 struct untracked_cache_dir *dir,
674 const char *name, int len)
677 struct untracked_cache_dir *d;
680 if (len && name[len - 1] == '/')
684 while (last > first) {
685 int cmp, next = (last + first) >> 1;
687 cmp = strncmp(name, d->name, len);
688 if (!cmp && strlen(d->name) > len)
700 FLEX_ALLOC_MEM(d, name, name, len);
702 ALLOC_GROW(dir->dirs, dir->dirs_nr + 1, dir->dirs_alloc);
703 memmove(dir->dirs + first + 1, dir->dirs + first,
704 (dir->dirs_nr - first) * sizeof(*dir->dirs));
706 dir->dirs[first] = d;
710 static void do_invalidate_gitignore(struct untracked_cache_dir *dir)
714 dir->untracked_nr = 0;
715 for (i = 0; i < dir->dirs_nr; i++)
716 do_invalidate_gitignore(dir->dirs[i]);
719 static void invalidate_gitignore(struct untracked_cache *uc,
720 struct untracked_cache_dir *dir)
722 uc->gitignore_invalidated++;
723 do_invalidate_gitignore(dir);
726 static void invalidate_directory(struct untracked_cache *uc,
727 struct untracked_cache_dir *dir)
730 uc->dir_invalidated++;
732 dir->untracked_nr = 0;
733 for (i = 0; i < dir->dirs_nr; i++)
734 dir->dirs[i]->recurse = 0;
738 * Given a file with name "fname", read it (either from disk, or from
739 * the index if "check_index" is non-zero), parse it and store the
740 * exclude rules in "el".
742 * If "ss" is not NULL, compute SHA-1 of the exclude file and fill
743 * stat data from disk (only valid if add_excludes returns zero). If
744 * ss_valid is non-zero, "ss" must contain good value as input.
746 static int add_excludes(const char *fname, const char *base, int baselen,
747 struct exclude_list *el, int check_index,
748 struct sha1_stat *sha1_stat)
751 int fd, i, lineno = 1;
755 fd = open(fname, O_RDONLY);
756 if (fd < 0 || fstat(fd, &st) < 0) {
758 warn_on_inaccessible(fname);
762 (buf = read_skip_worktree_file_from_index(fname, &size, sha1_stat)) == NULL)
768 if (buf[size-1] != '\n') {
769 buf = xrealloc(buf, st_add(size, 1));
773 size = xsize_t(st.st_size);
776 fill_stat_data(&sha1_stat->stat, &st);
777 hashcpy(sha1_stat->sha1, EMPTY_BLOB_SHA1_BIN);
778 sha1_stat->valid = 1;
783 buf = xmallocz(size);
784 if (read_in_full(fd, buf, size) != size) {
793 if (sha1_stat->valid &&
794 !match_stat_data_racy(&the_index, &sha1_stat->stat, &st))
795 ; /* no content change, ss->sha1 still good */
796 else if (check_index &&
797 (pos = cache_name_pos(fname, strlen(fname))) >= 0 &&
798 !ce_stage(active_cache[pos]) &&
799 ce_uptodate(active_cache[pos]) &&
800 !would_convert_to_git(fname))
801 hashcpy(sha1_stat->sha1,
802 active_cache[pos]->oid.hash);
804 hash_sha1_file(buf, size, "blob", sha1_stat->sha1);
805 fill_stat_data(&sha1_stat->stat, &st);
806 sha1_stat->valid = 1;
812 if (skip_utf8_bom(&buf, size))
813 size -= buf - el->filebuf;
817 for (i = 0; i < size; i++) {
818 if (buf[i] == '\n') {
819 if (entry != buf + i && entry[0] != '#') {
820 buf[i - (i && buf[i-1] == '\r')] = 0;
821 trim_trailing_spaces(entry);
822 add_exclude(entry, base, baselen, el, lineno);
831 int add_excludes_from_file_to_list(const char *fname, const char *base,
832 int baselen, struct exclude_list *el,
835 return add_excludes(fname, base, baselen, el, check_index, NULL);
838 struct exclude_list *add_exclude_list(struct dir_struct *dir,
839 int group_type, const char *src)
841 struct exclude_list *el;
842 struct exclude_list_group *group;
844 group = &dir->exclude_list_group[group_type];
845 ALLOC_GROW(group->el, group->nr + 1, group->alloc);
846 el = &group->el[group->nr++];
847 memset(el, 0, sizeof(*el));
853 * Used to set up core.excludesfile and .git/info/exclude lists.
855 static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname,
856 struct sha1_stat *sha1_stat)
858 struct exclude_list *el;
860 * catch setup_standard_excludes() that's called before
861 * dir->untracked is assigned. That function behaves
862 * differently when dir->untracked is non-NULL.
865 dir->unmanaged_exclude_files++;
866 el = add_exclude_list(dir, EXC_FILE, fname);
867 if (add_excludes(fname, "", 0, el, 0, sha1_stat) < 0)
868 die("cannot use %s as an exclude file", fname);
871 void add_excludes_from_file(struct dir_struct *dir, const char *fname)
873 dir->unmanaged_exclude_files++; /* see validate_untracked_cache() */
874 add_excludes_from_file_1(dir, fname, NULL);
877 int match_basename(const char *basename, int basenamelen,
878 const char *pattern, int prefix, int patternlen,
881 if (prefix == patternlen) {
882 if (patternlen == basenamelen &&
883 !fspathncmp(pattern, basename, basenamelen))
885 } else if (flags & EXC_FLAG_ENDSWITH) {
886 /* "*literal" matching against "fooliteral" */
887 if (patternlen - 1 <= basenamelen &&
888 !fspathncmp(pattern + 1,
889 basename + basenamelen - (patternlen - 1),
893 if (fnmatch_icase_mem(pattern, patternlen,
894 basename, basenamelen,
901 int match_pathname(const char *pathname, int pathlen,
902 const char *base, int baselen,
903 const char *pattern, int prefix, int patternlen,
910 * match with FNM_PATHNAME; the pattern has base implicitly
913 if (*pattern == '/') {
920 * baselen does not count the trailing slash. base[] may or
921 * may not end with a trailing slash though.
923 if (pathlen < baselen + 1 ||
924 (baselen && pathname[baselen] != '/') ||
925 fspathncmp(pathname, base, baselen))
928 namelen = baselen ? pathlen - baselen - 1 : pathlen;
929 name = pathname + pathlen - namelen;
933 * if the non-wildcard part is longer than the
934 * remaining pathname, surely it cannot match.
936 if (prefix > namelen)
939 if (fspathncmp(pattern, name, prefix))
942 patternlen -= prefix;
947 * If the whole pattern did not have a wildcard,
948 * then our prefix match is all we need; we
949 * do not need to call fnmatch at all.
951 if (!patternlen && !namelen)
955 return fnmatch_icase_mem(pattern, patternlen,
961 * Scan the given exclude list in reverse to see whether pathname
962 * should be ignored. The first match (i.e. the last on the list), if
963 * any, determines the fate. Returns the exclude_list element which
964 * matched, or NULL for undecided.
966 static struct exclude *last_exclude_matching_from_list(const char *pathname,
968 const char *basename,
970 struct exclude_list *el)
972 struct exclude *exc = NULL; /* undecided */
976 return NULL; /* undefined */
978 for (i = el->nr - 1; 0 <= i; i--) {
979 struct exclude *x = el->excludes[i];
980 const char *exclude = x->pattern;
981 int prefix = x->nowildcardlen;
983 if (x->flags & EXC_FLAG_MUSTBEDIR) {
984 if (*dtype == DT_UNKNOWN)
985 *dtype = get_dtype(NULL, pathname, pathlen);
986 if (*dtype != DT_DIR)
990 if (x->flags & EXC_FLAG_NODIR) {
991 if (match_basename(basename,
992 pathlen - (basename - pathname),
993 exclude, prefix, x->patternlen,
1001 assert(x->baselen == 0 || x->base[x->baselen - 1] == '/');
1002 if (match_pathname(pathname, pathlen,
1003 x->base, x->baselen ? x->baselen - 1 : 0,
1004 exclude, prefix, x->patternlen, x->flags)) {
1013 * Scan the list and let the last match determine the fate.
1014 * Return 1 for exclude, 0 for include and -1 for undecided.
1016 int is_excluded_from_list(const char *pathname,
1017 int pathlen, const char *basename, int *dtype,
1018 struct exclude_list *el)
1020 struct exclude *exclude;
1021 exclude = last_exclude_matching_from_list(pathname, pathlen, basename, dtype, el);
1023 return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1;
1024 return -1; /* undecided */
1027 static struct exclude *last_exclude_matching_from_lists(struct dir_struct *dir,
1028 const char *pathname, int pathlen, const char *basename,
1032 struct exclude_list_group *group;
1033 struct exclude *exclude;
1034 for (i = EXC_CMDL; i <= EXC_FILE; i++) {
1035 group = &dir->exclude_list_group[i];
1036 for (j = group->nr - 1; j >= 0; j--) {
1037 exclude = last_exclude_matching_from_list(
1038 pathname, pathlen, basename, dtype_p,
1048 * Loads the per-directory exclude list for the substring of base
1049 * which has a char length of baselen.
1051 static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
1053 struct exclude_list_group *group;
1054 struct exclude_list *el;
1055 struct exclude_stack *stk = NULL;
1056 struct untracked_cache_dir *untracked;
1059 group = &dir->exclude_list_group[EXC_DIRS];
1062 * Pop the exclude lists from the EXCL_DIRS exclude_list_group
1063 * which originate from directories not in the prefix of the
1064 * path being checked.
1066 while ((stk = dir->exclude_stack) != NULL) {
1067 if (stk->baselen <= baselen &&
1068 !strncmp(dir->basebuf.buf, base, stk->baselen))
1070 el = &group->el[dir->exclude_stack->exclude_ix];
1071 dir->exclude_stack = stk->prev;
1072 dir->exclude = NULL;
1073 free((char *)el->src); /* see strbuf_detach() below */
1074 clear_exclude_list(el);
1079 /* Skip traversing into sub directories if the parent is excluded */
1084 * Lazy initialization. All call sites currently just
1085 * memset(dir, 0, sizeof(*dir)) before use. Changing all of
1086 * them seems lots of work for little benefit.
1088 if (!dir->basebuf.buf)
1089 strbuf_init(&dir->basebuf, PATH_MAX);
1091 /* Read from the parent directories and push them down. */
1092 current = stk ? stk->baselen : -1;
1093 strbuf_setlen(&dir->basebuf, current < 0 ? 0 : current);
1095 untracked = stk ? stk->ucd : dir->untracked->root;
1099 while (current < baselen) {
1101 struct sha1_stat sha1_stat;
1103 stk = xcalloc(1, sizeof(*stk));
1108 cp = strchr(base + current + 1, '/');
1110 die("oops in prep_exclude");
1113 lookup_untracked(dir->untracked, untracked,
1115 cp - base - current);
1117 stk->prev = dir->exclude_stack;
1118 stk->baselen = cp - base;
1119 stk->exclude_ix = group->nr;
1120 stk->ucd = untracked;
1121 el = add_exclude_list(dir, EXC_DIRS, NULL);
1122 strbuf_add(&dir->basebuf, base + current, stk->baselen - current);
1123 assert(stk->baselen == dir->basebuf.len);
1125 /* Abort if the directory is excluded */
1128 dir->basebuf.buf[stk->baselen - 1] = 0;
1129 dir->exclude = last_exclude_matching_from_lists(dir,
1130 dir->basebuf.buf, stk->baselen - 1,
1131 dir->basebuf.buf + current, &dt);
1132 dir->basebuf.buf[stk->baselen - 1] = '/';
1134 dir->exclude->flags & EXC_FLAG_NEGATIVE)
1135 dir->exclude = NULL;
1137 dir->exclude_stack = stk;
1142 /* Try to read per-directory file */
1143 hashclr(sha1_stat.sha1);
1144 sha1_stat.valid = 0;
1145 if (dir->exclude_per_dir &&
1147 * If we know that no files have been added in
1148 * this directory (i.e. valid_cached_dir() has
1149 * been executed and set untracked->valid) ..
1151 (!untracked || !untracked->valid ||
1153 * .. and .gitignore does not exist before
1154 * (i.e. null exclude_sha1). Then we can skip
1155 * loading .gitignore, which would result in
1158 !is_null_sha1(untracked->exclude_sha1))) {
1160 * dir->basebuf gets reused by the traversal, but we
1161 * need fname to remain unchanged to ensure the src
1162 * member of each struct exclude correctly
1163 * back-references its source file. Other invocations
1164 * of add_exclude_list provide stable strings, so we
1165 * strbuf_detach() and free() here in the caller.
1167 struct strbuf sb = STRBUF_INIT;
1168 strbuf_addbuf(&sb, &dir->basebuf);
1169 strbuf_addstr(&sb, dir->exclude_per_dir);
1170 el->src = strbuf_detach(&sb, NULL);
1171 add_excludes(el->src, el->src, stk->baselen, el, 1,
1172 untracked ? &sha1_stat : NULL);
1175 * NEEDSWORK: when untracked cache is enabled, prep_exclude()
1176 * will first be called in valid_cached_dir() then maybe many
1177 * times more in last_exclude_matching(). When the cache is
1178 * used, last_exclude_matching() will not be called and
1179 * reading .gitignore content will be a waste.
1181 * So when it's called by valid_cached_dir() and we can get
1182 * .gitignore SHA-1 from the index (i.e. .gitignore is not
1183 * modified on work tree), we could delay reading the
1184 * .gitignore content until we absolutely need it in
1185 * last_exclude_matching(). Be careful about ignore rule
1186 * order, though, if you do that.
1189 hashcmp(sha1_stat.sha1, untracked->exclude_sha1)) {
1190 invalidate_gitignore(dir->untracked, untracked);
1191 hashcpy(untracked->exclude_sha1, sha1_stat.sha1);
1193 dir->exclude_stack = stk;
1194 current = stk->baselen;
1196 strbuf_setlen(&dir->basebuf, baselen);
1200 * Loads the exclude lists for the directory containing pathname, then
1201 * scans all exclude lists to determine whether pathname is excluded.
1202 * Returns the exclude_list element which matched, or NULL for
1205 struct exclude *last_exclude_matching(struct dir_struct *dir,
1206 const char *pathname,
1209 int pathlen = strlen(pathname);
1210 const char *basename = strrchr(pathname, '/');
1211 basename = (basename) ? basename+1 : pathname;
1213 prep_exclude(dir, pathname, basename-pathname);
1216 return dir->exclude;
1218 return last_exclude_matching_from_lists(dir, pathname, pathlen,
1223 * Loads the exclude lists for the directory containing pathname, then
1224 * scans all exclude lists to determine whether pathname is excluded.
1225 * Returns 1 if true, otherwise 0.
1227 int is_excluded(struct dir_struct *dir, const char *pathname, int *dtype_p)
1229 struct exclude *exclude =
1230 last_exclude_matching(dir, pathname, dtype_p);
1232 return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1;
1236 static struct dir_entry *dir_entry_new(const char *pathname, int len)
1238 struct dir_entry *ent;
1240 FLEX_ALLOC_MEM(ent, name, pathname, len);
1245 static struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len)
1247 if (cache_file_exists(pathname, len, ignore_case))
1250 ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc);
1251 return dir->entries[dir->nr++] = dir_entry_new(pathname, len);
1254 struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len)
1256 if (!cache_name_is_other(pathname, len))
1259 ALLOC_GROW(dir->ignored, dir->ignored_nr+1, dir->ignored_alloc);
1260 return dir->ignored[dir->ignored_nr++] = dir_entry_new(pathname, len);
1264 index_nonexistent = 0,
1270 * Do not use the alphabetically sorted index to look up
1271 * the directory name; instead, use the case insensitive
1274 static enum exist_status directory_exists_in_index_icase(const char *dirname, int len)
1276 struct cache_entry *ce;
1278 if (cache_dir_exists(dirname, len))
1279 return index_directory;
1281 ce = cache_file_exists(dirname, len, ignore_case);
1282 if (ce && S_ISGITLINK(ce->ce_mode))
1283 return index_gitdir;
1285 return index_nonexistent;
1289 * The index sorts alphabetically by entry name, which
1290 * means that a gitlink sorts as '\0' at the end, while
1291 * a directory (which is defined not as an entry, but as
1292 * the files it contains) will sort with the '/' at the
1295 static enum exist_status directory_exists_in_index(const char *dirname, int len)
1300 return directory_exists_in_index_icase(dirname, len);
1302 pos = cache_name_pos(dirname, len);
1305 while (pos < active_nr) {
1306 const struct cache_entry *ce = active_cache[pos++];
1307 unsigned char endchar;
1309 if (strncmp(ce->name, dirname, len))
1311 endchar = ce->name[len];
1315 return index_directory;
1316 if (!endchar && S_ISGITLINK(ce->ce_mode))
1317 return index_gitdir;
1319 return index_nonexistent;
1323 * When we find a directory when traversing the filesystem, we
1324 * have three distinct cases:
1327 * - see it as a directory
1330 * and which one we choose depends on a combination of existing
1331 * git index contents and the flags passed into the directory
1332 * traversal routine.
1334 * Case 1: If we *already* have entries in the index under that
1335 * directory name, we always recurse into the directory to see
1338 * Case 2: If we *already* have that directory name as a gitlink,
1339 * we always continue to see it as a gitlink, regardless of whether
1340 * there is an actual git directory there or not (it might not
1341 * be checked out as a subproject!)
1343 * Case 3: if we didn't have it in the index previously, we
1344 * have a few sub-cases:
1346 * (a) if "show_other_directories" is true, we show it as
1347 * just a directory, unless "hide_empty_directories" is
1348 * also true, in which case we need to check if it contains any
1349 * untracked and / or ignored files.
1350 * (b) if it looks like a git directory, and we don't have
1351 * 'no_gitlinks' set we treat it as a gitlink, and show it
1353 * (c) otherwise, we recurse into it.
1355 static enum path_treatment treat_directory(struct dir_struct *dir,
1356 struct untracked_cache_dir *untracked,
1357 const char *dirname, int len, int baselen, int exclude,
1358 const struct pathspec *pathspec)
1360 /* The "len-1" is to strip the final '/' */
1361 switch (directory_exists_in_index(dirname, len-1)) {
1362 case index_directory:
1363 return path_recurse;
1368 case index_nonexistent:
1369 if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES)
1371 if (!(dir->flags & DIR_NO_GITLINKS)) {
1372 unsigned char sha1[20];
1373 if (resolve_gitlink_ref(dirname, "HEAD", sha1) == 0)
1374 return path_untracked;
1376 return path_recurse;
1379 /* This is the "show_other_directories" case */
1381 if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))
1382 return exclude ? path_excluded : path_untracked;
1384 untracked = lookup_untracked(dir->untracked, untracked,
1385 dirname + baselen, len - baselen);
1386 return read_directory_recursive(dir, dirname, len,
1387 untracked, 1, pathspec);
1391 * This is an inexact early pruning of any recursive directory
1392 * reading - if the path cannot possibly be in the pathspec,
1393 * return true, and we'll skip it early.
1395 static int simplify_away(const char *path, int pathlen,
1396 const struct pathspec *pathspec)
1400 if (!pathspec || !pathspec->nr)
1403 GUARD_PATHSPEC(pathspec,
1412 for (i = 0; i < pathspec->nr; i++) {
1413 const struct pathspec_item *item = &pathspec->items[i];
1414 int len = item->nowildcard_len;
1418 if (!ps_strncmp(item, item->match, path, len))
1426 * This function tells us whether an excluded path matches a
1427 * list of "interesting" pathspecs. That is, whether a path matched
1428 * by any of the pathspecs could possibly be ignored by excluding
1429 * the specified path. This can happen if:
1431 * 1. the path is mentioned explicitly in the pathspec
1433 * 2. the path is a directory prefix of some element in the
1436 static int exclude_matches_pathspec(const char *path, int pathlen,
1437 const struct pathspec *pathspec)
1441 if (!pathspec || !pathspec->nr)
1444 GUARD_PATHSPEC(pathspec,
1452 for (i = 0; i < pathspec->nr; i++) {
1453 const struct pathspec_item *item = &pathspec->items[i];
1454 int len = item->nowildcard_len;
1456 if (len == pathlen &&
1457 !ps_strncmp(item, item->match, path, pathlen))
1459 if (len > pathlen &&
1460 item->match[pathlen] == '/' &&
1461 !ps_strncmp(item, item->match, path, pathlen))
1467 static int get_index_dtype(const char *path, int len)
1470 const struct cache_entry *ce;
1472 ce = cache_file_exists(path, len, 0);
1474 if (!ce_uptodate(ce))
1476 if (S_ISGITLINK(ce->ce_mode))
1479 * Nobody actually cares about the
1480 * difference between DT_LNK and DT_REG
1485 /* Try to look it up as a directory */
1486 pos = cache_name_pos(path, len);
1490 while (pos < active_nr) {
1491 ce = active_cache[pos++];
1492 if (strncmp(ce->name, path, len))
1494 if (ce->name[len] > '/')
1496 if (ce->name[len] < '/')
1498 if (!ce_uptodate(ce))
1499 break; /* continue? */
1505 static int get_dtype(struct dirent *de, const char *path, int len)
1507 int dtype = de ? DTYPE(de) : DT_UNKNOWN;
1510 if (dtype != DT_UNKNOWN)
1512 dtype = get_index_dtype(path, len);
1513 if (dtype != DT_UNKNOWN)
1515 if (lstat(path, &st))
1517 if (S_ISREG(st.st_mode))
1519 if (S_ISDIR(st.st_mode))
1521 if (S_ISLNK(st.st_mode))
1526 static enum path_treatment treat_one_path(struct dir_struct *dir,
1527 struct untracked_cache_dir *untracked,
1528 struct strbuf *path,
1530 const struct pathspec *pathspec,
1531 int dtype, struct dirent *de)
1534 int has_path_in_index = !!cache_file_exists(path->buf, path->len, ignore_case);
1536 if (dtype == DT_UNKNOWN)
1537 dtype = get_dtype(de, path->buf, path->len);
1539 /* Always exclude indexed files */
1540 if (dtype != DT_DIR && has_path_in_index)
1544 * When we are looking at a directory P in the working tree,
1545 * there are three cases:
1547 * (1) P exists in the index. Everything inside the directory P in
1548 * the working tree needs to go when P is checked out from the
1551 * (2) P does not exist in the index, but there is P/Q in the index.
1552 * We know P will stay a directory when we check out the contents
1553 * of the index, but we do not know yet if there is a directory
1554 * P/Q in the working tree to be killed, so we need to recurse.
1556 * (3) P does not exist in the index, and there is no P/Q in the index
1557 * to require P to be a directory, either. Only in this case, we
1558 * know that everything inside P will not be killed without
1561 if ((dir->flags & DIR_COLLECT_KILLED_ONLY) &&
1562 (dtype == DT_DIR) &&
1563 !has_path_in_index &&
1564 (directory_exists_in_index(path->buf, path->len) == index_nonexistent))
1567 exclude = is_excluded(dir, path->buf, &dtype);
1570 * Excluded? If we don't explicitly want to show
1571 * ignored files, ignore it
1573 if (exclude && !(dir->flags & (DIR_SHOW_IGNORED|DIR_SHOW_IGNORED_TOO)))
1574 return path_excluded;
1580 strbuf_addch(path, '/');
1581 return treat_directory(dir, untracked, path->buf, path->len,
1582 baselen, exclude, pathspec);
1585 return exclude ? path_excluded : path_untracked;
1589 static enum path_treatment treat_path_fast(struct dir_struct *dir,
1590 struct untracked_cache_dir *untracked,
1591 struct cached_dir *cdir,
1592 struct strbuf *path,
1594 const struct pathspec *pathspec)
1596 strbuf_setlen(path, baselen);
1598 strbuf_addstr(path, cdir->file);
1599 return path_untracked;
1601 strbuf_addstr(path, cdir->ucd->name);
1602 /* treat_one_path() does this before it calls treat_directory() */
1603 strbuf_complete(path, '/');
1604 if (cdir->ucd->check_only)
1606 * check_only is set as a result of treat_directory() getting
1607 * to its bottom. Verify again the same set of directories
1608 * with check_only set.
1610 return read_directory_recursive(dir, path->buf, path->len,
1611 cdir->ucd, 1, pathspec);
1613 * We get path_recurse in the first run when
1614 * directory_exists_in_index() returns index_nonexistent. We
1615 * are sure that new changes in the index does not impact the
1616 * outcome. Return now.
1618 return path_recurse;
1621 static enum path_treatment treat_path(struct dir_struct *dir,
1622 struct untracked_cache_dir *untracked,
1623 struct cached_dir *cdir,
1624 struct strbuf *path,
1626 const struct pathspec *pathspec)
1629 struct dirent *de = cdir->de;
1632 return treat_path_fast(dir, untracked, cdir, path,
1634 if (is_dot_or_dotdot(de->d_name) || !strcmp(de->d_name, ".git"))
1636 strbuf_setlen(path, baselen);
1637 strbuf_addstr(path, de->d_name);
1638 if (simplify_away(path->buf, path->len, pathspec))
1642 return treat_one_path(dir, untracked, path, baselen, pathspec, dtype, de);
1645 static void add_untracked(struct untracked_cache_dir *dir, const char *name)
1649 ALLOC_GROW(dir->untracked, dir->untracked_nr + 1,
1650 dir->untracked_alloc);
1651 dir->untracked[dir->untracked_nr++] = xstrdup(name);
1654 static int valid_cached_dir(struct dir_struct *dir,
1655 struct untracked_cache_dir *untracked,
1656 struct strbuf *path,
1664 if (stat(path->len ? path->buf : ".", &st)) {
1665 invalidate_directory(dir->untracked, untracked);
1666 memset(&untracked->stat_data, 0, sizeof(untracked->stat_data));
1669 if (!untracked->valid ||
1670 match_stat_data_racy(&the_index, &untracked->stat_data, &st)) {
1671 if (untracked->valid)
1672 invalidate_directory(dir->untracked, untracked);
1673 fill_stat_data(&untracked->stat_data, &st);
1677 if (untracked->check_only != !!check_only) {
1678 invalidate_directory(dir->untracked, untracked);
1683 * prep_exclude will be called eventually on this directory,
1684 * but it's called much later in last_exclude_matching(). We
1685 * need it now to determine the validity of the cache for this
1686 * path. The next calls will be nearly no-op, the way
1687 * prep_exclude() is designed.
1689 if (path->len && path->buf[path->len - 1] != '/') {
1690 strbuf_addch(path, '/');
1691 prep_exclude(dir, path->buf, path->len);
1692 strbuf_setlen(path, path->len - 1);
1694 prep_exclude(dir, path->buf, path->len);
1696 /* hopefully prep_exclude() haven't invalidated this entry... */
1697 return untracked->valid;
1700 static int open_cached_dir(struct cached_dir *cdir,
1701 struct dir_struct *dir,
1702 struct untracked_cache_dir *untracked,
1703 struct strbuf *path,
1706 memset(cdir, 0, sizeof(*cdir));
1707 cdir->untracked = untracked;
1708 if (valid_cached_dir(dir, untracked, path, check_only))
1710 cdir->fdir = opendir(path->len ? path->buf : ".");
1712 dir->untracked->dir_opened++;
1718 static int read_cached_dir(struct cached_dir *cdir)
1721 cdir->de = readdir(cdir->fdir);
1726 while (cdir->nr_dirs < cdir->untracked->dirs_nr) {
1727 struct untracked_cache_dir *d = cdir->untracked->dirs[cdir->nr_dirs];
1737 if (cdir->nr_files < cdir->untracked->untracked_nr) {
1738 struct untracked_cache_dir *d = cdir->untracked;
1739 cdir->file = d->untracked[cdir->nr_files++];
1745 static void close_cached_dir(struct cached_dir *cdir)
1748 closedir(cdir->fdir);
1750 * We have gone through this directory and found no untracked
1751 * entries. Mark it valid.
1753 if (cdir->untracked) {
1754 cdir->untracked->valid = 1;
1755 cdir->untracked->recurse = 1;
1760 * Read a directory tree. We currently ignore anything but
1761 * directories, regular files and symlinks. That's because git
1762 * doesn't handle them at all yet. Maybe that will change some
1765 * Also, we ignore the name ".git" (even if it is not a directory).
1766 * That likely will not change.
1768 * Returns the most significant path_treatment value encountered in the scan.
1770 static enum path_treatment read_directory_recursive(struct dir_struct *dir,
1771 const char *base, int baselen,
1772 struct untracked_cache_dir *untracked, int check_only,
1773 const struct pathspec *pathspec)
1775 struct cached_dir cdir;
1776 enum path_treatment state, subdir_state, dir_state = path_none;
1777 struct strbuf path = STRBUF_INIT;
1779 strbuf_add(&path, base, baselen);
1781 if (open_cached_dir(&cdir, dir, untracked, &path, check_only))
1785 untracked->check_only = !!check_only;
1787 while (!read_cached_dir(&cdir)) {
1788 /* check how the file or directory should be treated */
1789 state = treat_path(dir, untracked, &cdir, &path,
1792 if (state > dir_state)
1795 /* recurse into subdir if instructed by treat_path */
1796 if (state == path_recurse) {
1797 struct untracked_cache_dir *ud;
1798 ud = lookup_untracked(dir->untracked, untracked,
1800 path.len - baselen);
1802 read_directory_recursive(dir, path.buf,
1804 check_only, pathspec);
1805 if (subdir_state > dir_state)
1806 dir_state = subdir_state;
1810 /* abort early if maximum state has been reached */
1811 if (dir_state == path_untracked) {
1813 add_untracked(untracked, path.buf + baselen);
1816 /* skip the dir_add_* part */
1820 /* add the path to the appropriate result list */
1823 if (dir->flags & DIR_SHOW_IGNORED)
1824 dir_add_name(dir, path.buf, path.len);
1825 else if ((dir->flags & DIR_SHOW_IGNORED_TOO) ||
1826 ((dir->flags & DIR_COLLECT_IGNORED) &&
1827 exclude_matches_pathspec(path.buf, path.len,
1829 dir_add_ignored(dir, path.buf, path.len);
1832 case path_untracked:
1833 if (dir->flags & DIR_SHOW_IGNORED)
1835 dir_add_name(dir, path.buf, path.len);
1837 add_untracked(untracked, path.buf + baselen);
1844 close_cached_dir(&cdir);
1846 strbuf_release(&path);
1851 static int cmp_name(const void *p1, const void *p2)
1853 const struct dir_entry *e1 = *(const struct dir_entry **)p1;
1854 const struct dir_entry *e2 = *(const struct dir_entry **)p2;
1856 return name_compare(e1->name, e1->len, e2->name, e2->len);
1859 static int treat_leading_path(struct dir_struct *dir,
1860 const char *path, int len,
1861 const struct pathspec *pathspec)
1863 struct strbuf sb = STRBUF_INIT;
1864 int baselen, rc = 0;
1866 int old_flags = dir->flags;
1868 while (len && path[len - 1] == '/')
1873 dir->flags &= ~DIR_SHOW_OTHER_DIRECTORIES;
1875 cp = path + baselen + !!baselen;
1876 cp = memchr(cp, '/', path + len - cp);
1880 baselen = cp - path;
1881 strbuf_setlen(&sb, 0);
1882 strbuf_add(&sb, path, baselen);
1883 if (!is_directory(sb.buf))
1885 if (simplify_away(sb.buf, sb.len, pathspec))
1887 if (treat_one_path(dir, NULL, &sb, baselen, pathspec,
1888 DT_DIR, NULL) == path_none)
1889 break; /* do not recurse into it */
1890 if (len <= baselen) {
1892 break; /* finished checking */
1895 strbuf_release(&sb);
1896 dir->flags = old_flags;
1900 static const char *get_ident_string(void)
1902 static struct strbuf sb = STRBUF_INIT;
1907 if (uname(&uts) < 0)
1908 die_errno(_("failed to get kernel name and information"));
1909 strbuf_addf(&sb, "Location %s, system %s", get_git_work_tree(),
1914 static int ident_in_untracked(const struct untracked_cache *uc)
1917 * Previous git versions may have saved many NUL separated
1918 * strings in the "ident" field, but it is insane to manage
1919 * many locations, so just take care of the first one.
1922 return !strcmp(uc->ident.buf, get_ident_string());
1925 static void set_untracked_ident(struct untracked_cache *uc)
1927 strbuf_reset(&uc->ident);
1928 strbuf_addstr(&uc->ident, get_ident_string());
1931 * This strbuf used to contain a list of NUL separated
1932 * strings, so save NUL too for backward compatibility.
1934 strbuf_addch(&uc->ident, 0);
1937 static void new_untracked_cache(struct index_state *istate)
1939 struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
1940 strbuf_init(&uc->ident, 100);
1941 uc->exclude_per_dir = ".gitignore";
1942 /* should be the same flags used by git-status */
1943 uc->dir_flags = DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
1944 set_untracked_ident(uc);
1945 istate->untracked = uc;
1946 istate->cache_changed |= UNTRACKED_CHANGED;
1949 void add_untracked_cache(struct index_state *istate)
1951 if (!istate->untracked) {
1952 new_untracked_cache(istate);
1954 if (!ident_in_untracked(istate->untracked)) {
1955 free_untracked_cache(istate->untracked);
1956 new_untracked_cache(istate);
1961 void remove_untracked_cache(struct index_state *istate)
1963 if (istate->untracked) {
1964 free_untracked_cache(istate->untracked);
1965 istate->untracked = NULL;
1966 istate->cache_changed |= UNTRACKED_CHANGED;
1970 static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *dir,
1972 const struct pathspec *pathspec)
1974 struct untracked_cache_dir *root;
1976 if (!dir->untracked || getenv("GIT_DISABLE_UNTRACKED_CACHE"))
1980 * We only support $GIT_DIR/info/exclude and core.excludesfile
1981 * as the global ignore rule files. Any other additions
1982 * (e.g. from command line) invalidate the cache. This
1983 * condition also catches running setup_standard_excludes()
1984 * before setting dir->untracked!
1986 if (dir->unmanaged_exclude_files)
1990 * Optimize for the main use case only: whole-tree git
1991 * status. More work involved in treat_leading_path() if we
1992 * use cache on just a subset of the worktree. pathspec
1993 * support could make the matter even worse.
1995 if (base_len || (pathspec && pathspec->nr))
1998 /* Different set of flags may produce different results */
1999 if (dir->flags != dir->untracked->dir_flags ||
2001 * See treat_directory(), case index_nonexistent. Without
2002 * this flag, we may need to also cache .git file content
2003 * for the resolve_gitlink_ref() call, which we don't.
2005 !(dir->flags & DIR_SHOW_OTHER_DIRECTORIES) ||
2006 /* We don't support collecting ignore files */
2007 (dir->flags & (DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO |
2008 DIR_COLLECT_IGNORED)))
2012 * If we use .gitignore in the cache and now you change it to
2013 * .gitexclude, everything will go wrong.
2015 if (dir->exclude_per_dir != dir->untracked->exclude_per_dir &&
2016 strcmp(dir->exclude_per_dir, dir->untracked->exclude_per_dir))
2020 * EXC_CMDL is not considered in the cache. If people set it,
2023 if (dir->exclude_list_group[EXC_CMDL].nr)
2026 if (!ident_in_untracked(dir->untracked)) {
2027 warning(_("Untracked cache is disabled on this system or location."));
2031 if (!dir->untracked->root) {
2032 const int len = sizeof(*dir->untracked->root);
2033 dir->untracked->root = xmalloc(len);
2034 memset(dir->untracked->root, 0, len);
2037 /* Validate $GIT_DIR/info/exclude and core.excludesfile */
2038 root = dir->untracked->root;
2039 if (hashcmp(dir->ss_info_exclude.sha1,
2040 dir->untracked->ss_info_exclude.sha1)) {
2041 invalidate_gitignore(dir->untracked, root);
2042 dir->untracked->ss_info_exclude = dir->ss_info_exclude;
2044 if (hashcmp(dir->ss_excludes_file.sha1,
2045 dir->untracked->ss_excludes_file.sha1)) {
2046 invalidate_gitignore(dir->untracked, root);
2047 dir->untracked->ss_excludes_file = dir->ss_excludes_file;
2050 /* Make sure this directory is not dropped out at saving phase */
2055 int read_directory(struct dir_struct *dir, const char *path,
2056 int len, const struct pathspec *pathspec)
2058 struct untracked_cache_dir *untracked;
2060 if (has_symlink_leading_path(path, len))
2063 untracked = validate_untracked_cache(dir, len, pathspec);
2066 * make sure untracked cache code path is disabled,
2067 * e.g. prep_exclude()
2069 dir->untracked = NULL;
2070 if (!len || treat_leading_path(dir, path, len, pathspec))
2071 read_directory_recursive(dir, path, len, untracked, 0, pathspec);
2072 QSORT(dir->entries, dir->nr, cmp_name);
2073 QSORT(dir->ignored, dir->ignored_nr, cmp_name);
2074 if (dir->untracked) {
2075 static struct trace_key trace_untracked_stats = TRACE_KEY_INIT(UNTRACKED_STATS);
2076 trace_printf_key(&trace_untracked_stats,
2077 "node creation: %u\n"
2078 "gitignore invalidation: %u\n"
2079 "directory invalidation: %u\n"
2081 dir->untracked->dir_created,
2082 dir->untracked->gitignore_invalidated,
2083 dir->untracked->dir_invalidated,
2084 dir->untracked->dir_opened);
2085 if (dir->untracked == the_index.untracked &&
2086 (dir->untracked->dir_opened ||
2087 dir->untracked->gitignore_invalidated ||
2088 dir->untracked->dir_invalidated))
2089 the_index.cache_changed |= UNTRACKED_CHANGED;
2090 if (dir->untracked != the_index.untracked) {
2091 free(dir->untracked);
2092 dir->untracked = NULL;
2098 int file_exists(const char *f)
2101 return lstat(f, &sb) == 0;
2104 static int cmp_icase(char a, char b)
2109 return toupper(a) - toupper(b);
2114 * Given two normalized paths (a trailing slash is ok), if subdir is
2115 * outside dir, return -1. Otherwise return the offset in subdir that
2116 * can be used as relative path to dir.
2118 int dir_inside_of(const char *subdir, const char *dir)
2122 assert(dir && subdir && *dir && *subdir);
2124 while (*dir && *subdir && !cmp_icase(*dir, *subdir)) {
2130 /* hel[p]/me vs hel[l]/yeah */
2131 if (*dir && *subdir)
2135 return !*dir ? offset : -1; /* same dir */
2137 /* foo/[b]ar vs foo/[] */
2138 if (is_dir_sep(dir[-1]))
2139 return is_dir_sep(subdir[-1]) ? offset : -1;
2141 /* foo[/]bar vs foo[] */
2142 return is_dir_sep(*subdir) ? offset + 1 : -1;
2145 int is_inside_dir(const char *dir)
2154 rc = (dir_inside_of(cwd, dir) >= 0);
2159 int is_empty_dir(const char *path)
2161 DIR *dir = opendir(path);
2168 while ((e = readdir(dir)) != NULL)
2169 if (!is_dot_or_dotdot(e->d_name)) {
2178 static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
2182 int ret = 0, original_len = path->len, len, kept_down = 0;
2183 int only_empty = (flag & REMOVE_DIR_EMPTY_ONLY);
2184 int keep_toplevel = (flag & REMOVE_DIR_KEEP_TOPLEVEL);
2185 unsigned char submodule_head[20];
2187 if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
2188 !resolve_gitlink_ref(path->buf, "HEAD", submodule_head)) {
2189 /* Do not descend and nuke a nested git work tree. */
2195 flag &= ~REMOVE_DIR_KEEP_TOPLEVEL;
2196 dir = opendir(path->buf);
2198 if (errno == ENOENT)
2199 return keep_toplevel ? -1 : 0;
2200 else if (errno == EACCES && !keep_toplevel)
2202 * An empty dir could be removable even if it
2205 return rmdir(path->buf);
2209 strbuf_complete(path, '/');
2212 while ((e = readdir(dir)) != NULL) {
2214 if (is_dot_or_dotdot(e->d_name))
2217 strbuf_setlen(path, len);
2218 strbuf_addstr(path, e->d_name);
2219 if (lstat(path->buf, &st)) {
2220 if (errno == ENOENT)
2222 * file disappeared, which is what we
2227 } else if (S_ISDIR(st.st_mode)) {
2228 if (!remove_dir_recurse(path, flag, &kept_down))
2229 continue; /* happy */
2230 } else if (!only_empty &&
2231 (!unlink(path->buf) || errno == ENOENT)) {
2232 continue; /* happy, too */
2235 /* path too long, stat fails, or non-directory still exists */
2241 strbuf_setlen(path, original_len);
2242 if (!ret && !keep_toplevel && !kept_down)
2243 ret = (!rmdir(path->buf) || errno == ENOENT) ? 0 : -1;
2246 * report the uplevel that it is not an error that we
2247 * did not rmdir() our directory.
2253 int remove_dir_recursively(struct strbuf *path, int flag)
2255 return remove_dir_recurse(path, flag, NULL);
2258 static GIT_PATH_FUNC(git_path_info_exclude, "info/exclude")
2260 void setup_standard_excludes(struct dir_struct *dir)
2262 dir->exclude_per_dir = ".gitignore";
2264 /* core.excludefile defaulting to $XDG_HOME/git/ignore */
2266 excludes_file = xdg_config_home("ignore");
2267 if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))
2268 add_excludes_from_file_1(dir, excludes_file,
2269 dir->untracked ? &dir->ss_excludes_file : NULL);
2271 /* per repository user preference */
2272 if (startup_info->have_repository) {
2273 const char *path = git_path_info_exclude();
2274 if (!access_or_warn(path, R_OK, 0))
2275 add_excludes_from_file_1(dir, path,
2276 dir->untracked ? &dir->ss_info_exclude : NULL);
2280 int remove_path(const char *name)
2284 if (unlink(name) && errno != ENOENT && errno != ENOTDIR)
2287 slash = strrchr(name, '/');
2289 char *dirs = xstrdup(name);
2290 slash = dirs + (slash - name);
2293 } while (rmdir(dirs) == 0 && (slash = strrchr(dirs, '/')));
2300 * Frees memory within dir which was allocated for exclude lists and
2301 * the exclude_stack. Does not free dir itself.
2303 void clear_directory(struct dir_struct *dir)
2306 struct exclude_list_group *group;
2307 struct exclude_list *el;
2308 struct exclude_stack *stk;
2310 for (i = EXC_CMDL; i <= EXC_FILE; i++) {
2311 group = &dir->exclude_list_group[i];
2312 for (j = 0; j < group->nr; j++) {
2315 free((char *)el->src);
2316 clear_exclude_list(el);
2321 stk = dir->exclude_stack;
2323 struct exclude_stack *prev = stk->prev;
2327 strbuf_release(&dir->basebuf);
2330 struct ondisk_untracked_cache {
2331 struct stat_data info_exclude_stat;
2332 struct stat_data excludes_file_stat;
2334 unsigned char info_exclude_sha1[20];
2335 unsigned char excludes_file_sha1[20];
2336 char exclude_per_dir[FLEX_ARRAY];
2339 #define ouc_size(len) (offsetof(struct ondisk_untracked_cache, exclude_per_dir) + len + 1)
2342 int index; /* number of written untracked_cache_dir */
2343 struct ewah_bitmap *check_only; /* from untracked_cache_dir */
2344 struct ewah_bitmap *valid; /* from untracked_cache_dir */
2345 struct ewah_bitmap *sha1_valid; /* set if exclude_sha1 is not null */
2347 struct strbuf sb_stat;
2348 struct strbuf sb_sha1;
2351 static void stat_data_to_disk(struct stat_data *to, const struct stat_data *from)
2353 to->sd_ctime.sec = htonl(from->sd_ctime.sec);
2354 to->sd_ctime.nsec = htonl(from->sd_ctime.nsec);
2355 to->sd_mtime.sec = htonl(from->sd_mtime.sec);
2356 to->sd_mtime.nsec = htonl(from->sd_mtime.nsec);
2357 to->sd_dev = htonl(from->sd_dev);
2358 to->sd_ino = htonl(from->sd_ino);
2359 to->sd_uid = htonl(from->sd_uid);
2360 to->sd_gid = htonl(from->sd_gid);
2361 to->sd_size = htonl(from->sd_size);
2364 static void write_one_dir(struct untracked_cache_dir *untracked,
2365 struct write_data *wd)
2367 struct stat_data stat_data;
2368 struct strbuf *out = &wd->out;
2369 unsigned char intbuf[16];
2370 unsigned int intlen, value;
2371 int i = wd->index++;
2374 * untracked_nr should be reset whenever valid is clear, but
2377 if (!untracked->valid) {
2378 untracked->untracked_nr = 0;
2379 untracked->check_only = 0;
2382 if (untracked->check_only)
2383 ewah_set(wd->check_only, i);
2384 if (untracked->valid) {
2385 ewah_set(wd->valid, i);
2386 stat_data_to_disk(&stat_data, &untracked->stat_data);
2387 strbuf_add(&wd->sb_stat, &stat_data, sizeof(stat_data));
2389 if (!is_null_sha1(untracked->exclude_sha1)) {
2390 ewah_set(wd->sha1_valid, i);
2391 strbuf_add(&wd->sb_sha1, untracked->exclude_sha1, 20);
2394 intlen = encode_varint(untracked->untracked_nr, intbuf);
2395 strbuf_add(out, intbuf, intlen);
2397 /* skip non-recurse directories */
2398 for (i = 0, value = 0; i < untracked->dirs_nr; i++)
2399 if (untracked->dirs[i]->recurse)
2401 intlen = encode_varint(value, intbuf);
2402 strbuf_add(out, intbuf, intlen);
2404 strbuf_add(out, untracked->name, strlen(untracked->name) + 1);
2406 for (i = 0; i < untracked->untracked_nr; i++)
2407 strbuf_add(out, untracked->untracked[i],
2408 strlen(untracked->untracked[i]) + 1);
2410 for (i = 0; i < untracked->dirs_nr; i++)
2411 if (untracked->dirs[i]->recurse)
2412 write_one_dir(untracked->dirs[i], wd);
2415 void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked)
2417 struct ondisk_untracked_cache *ouc;
2418 struct write_data wd;
2419 unsigned char varbuf[16];
2421 size_t len = strlen(untracked->exclude_per_dir);
2423 FLEX_ALLOC_MEM(ouc, exclude_per_dir, untracked->exclude_per_dir, len);
2424 stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclude.stat);
2425 stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_file.stat);
2426 hashcpy(ouc->info_exclude_sha1, untracked->ss_info_exclude.sha1);
2427 hashcpy(ouc->excludes_file_sha1, untracked->ss_excludes_file.sha1);
2428 ouc->dir_flags = htonl(untracked->dir_flags);
2430 varint_len = encode_varint(untracked->ident.len, varbuf);
2431 strbuf_add(out, varbuf, varint_len);
2432 strbuf_addbuf(out, &untracked->ident);
2434 strbuf_add(out, ouc, ouc_size(len));
2438 if (!untracked->root) {
2439 varint_len = encode_varint(0, varbuf);
2440 strbuf_add(out, varbuf, varint_len);
2445 wd.check_only = ewah_new();
2446 wd.valid = ewah_new();
2447 wd.sha1_valid = ewah_new();
2448 strbuf_init(&wd.out, 1024);
2449 strbuf_init(&wd.sb_stat, 1024);
2450 strbuf_init(&wd.sb_sha1, 1024);
2451 write_one_dir(untracked->root, &wd);
2453 varint_len = encode_varint(wd.index, varbuf);
2454 strbuf_add(out, varbuf, varint_len);
2455 strbuf_addbuf(out, &wd.out);
2456 ewah_serialize_strbuf(wd.valid, out);
2457 ewah_serialize_strbuf(wd.check_only, out);
2458 ewah_serialize_strbuf(wd.sha1_valid, out);
2459 strbuf_addbuf(out, &wd.sb_stat);
2460 strbuf_addbuf(out, &wd.sb_sha1);
2461 strbuf_addch(out, '\0'); /* safe guard for string lists */
2463 ewah_free(wd.valid);
2464 ewah_free(wd.check_only);
2465 ewah_free(wd.sha1_valid);
2466 strbuf_release(&wd.out);
2467 strbuf_release(&wd.sb_stat);
2468 strbuf_release(&wd.sb_sha1);
2471 static void free_untracked(struct untracked_cache_dir *ucd)
2476 for (i = 0; i < ucd->dirs_nr; i++)
2477 free_untracked(ucd->dirs[i]);
2478 for (i = 0; i < ucd->untracked_nr; i++)
2479 free(ucd->untracked[i]);
2480 free(ucd->untracked);
2485 void free_untracked_cache(struct untracked_cache *uc)
2488 free_untracked(uc->root);
2494 struct untracked_cache_dir **ucd;
2495 struct ewah_bitmap *check_only;
2496 struct ewah_bitmap *valid;
2497 struct ewah_bitmap *sha1_valid;
2498 const unsigned char *data;
2499 const unsigned char *end;
2502 static void stat_data_from_disk(struct stat_data *to, const struct stat_data *from)
2504 to->sd_ctime.sec = get_be32(&from->sd_ctime.sec);
2505 to->sd_ctime.nsec = get_be32(&from->sd_ctime.nsec);
2506 to->sd_mtime.sec = get_be32(&from->sd_mtime.sec);
2507 to->sd_mtime.nsec = get_be32(&from->sd_mtime.nsec);
2508 to->sd_dev = get_be32(&from->sd_dev);
2509 to->sd_ino = get_be32(&from->sd_ino);
2510 to->sd_uid = get_be32(&from->sd_uid);
2511 to->sd_gid = get_be32(&from->sd_gid);
2512 to->sd_size = get_be32(&from->sd_size);
2515 static int read_one_dir(struct untracked_cache_dir **untracked_,
2516 struct read_data *rd)
2518 struct untracked_cache_dir ud, *untracked;
2519 const unsigned char *next, *data = rd->data, *end = rd->end;
2523 memset(&ud, 0, sizeof(ud));
2526 value = decode_varint(&next);
2530 ud.untracked_alloc = value;
2531 ud.untracked_nr = value;
2532 if (ud.untracked_nr)
2533 ALLOC_ARRAY(ud.untracked, ud.untracked_nr);
2537 ud.dirs_alloc = ud.dirs_nr = decode_varint(&next);
2540 ALLOC_ARRAY(ud.dirs, ud.dirs_nr);
2543 len = strlen((const char *)data);
2544 next = data + len + 1;
2547 *untracked_ = untracked = xmalloc(st_add(sizeof(*untracked), len));
2548 memcpy(untracked, &ud, sizeof(ud));
2549 memcpy(untracked->name, data, len + 1);
2552 for (i = 0; i < untracked->untracked_nr; i++) {
2553 len = strlen((const char *)data);
2554 next = data + len + 1;
2557 untracked->untracked[i] = xstrdup((const char*)data);
2561 rd->ucd[rd->index++] = untracked;
2564 for (i = 0; i < untracked->dirs_nr; i++) {
2565 len = read_one_dir(untracked->dirs + i, rd);
2572 static void set_check_only(size_t pos, void *cb)
2574 struct read_data *rd = cb;
2575 struct untracked_cache_dir *ud = rd->ucd[pos];
2579 static void read_stat(size_t pos, void *cb)
2581 struct read_data *rd = cb;
2582 struct untracked_cache_dir *ud = rd->ucd[pos];
2583 if (rd->data + sizeof(struct stat_data) > rd->end) {
2584 rd->data = rd->end + 1;
2587 stat_data_from_disk(&ud->stat_data, (struct stat_data *)rd->data);
2588 rd->data += sizeof(struct stat_data);
2592 static void read_sha1(size_t pos, void *cb)
2594 struct read_data *rd = cb;
2595 struct untracked_cache_dir *ud = rd->ucd[pos];
2596 if (rd->data + 20 > rd->end) {
2597 rd->data = rd->end + 1;
2600 hashcpy(ud->exclude_sha1, rd->data);
2604 static void load_sha1_stat(struct sha1_stat *sha1_stat,
2605 const struct stat_data *stat,
2606 const unsigned char *sha1)
2608 stat_data_from_disk(&sha1_stat->stat, stat);
2609 hashcpy(sha1_stat->sha1, sha1);
2610 sha1_stat->valid = 1;
2613 struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz)
2615 const struct ondisk_untracked_cache *ouc;
2616 struct untracked_cache *uc;
2617 struct read_data rd;
2618 const unsigned char *next = data, *end = (const unsigned char *)data + sz;
2622 if (sz <= 1 || end[-1] != '\0')
2626 ident_len = decode_varint(&next);
2627 if (next + ident_len > end)
2629 ident = (const char *)next;
2632 ouc = (const struct ondisk_untracked_cache *)next;
2633 if (next + ouc_size(0) > end)
2636 uc = xcalloc(1, sizeof(*uc));
2637 strbuf_init(&uc->ident, ident_len);
2638 strbuf_add(&uc->ident, ident, ident_len);
2639 load_sha1_stat(&uc->ss_info_exclude, &ouc->info_exclude_stat,
2640 ouc->info_exclude_sha1);
2641 load_sha1_stat(&uc->ss_excludes_file, &ouc->excludes_file_stat,
2642 ouc->excludes_file_sha1);
2643 uc->dir_flags = get_be32(&ouc->dir_flags);
2644 uc->exclude_per_dir = xstrdup(ouc->exclude_per_dir);
2645 /* NUL after exclude_per_dir is covered by sizeof(*ouc) */
2646 next += ouc_size(strlen(ouc->exclude_per_dir));
2650 len = decode_varint(&next);
2651 if (next > end || len == 0)
2654 rd.valid = ewah_new();
2655 rd.check_only = ewah_new();
2656 rd.sha1_valid = ewah_new();
2660 ALLOC_ARRAY(rd.ucd, len);
2662 if (read_one_dir(&uc->root, &rd) || rd.index != len)
2666 len = ewah_read_mmap(rd.valid, next, end - next);
2671 len = ewah_read_mmap(rd.check_only, next, end - next);
2676 len = ewah_read_mmap(rd.sha1_valid, next, end - next);
2680 ewah_each_bit(rd.check_only, set_check_only, &rd);
2681 rd.data = next + len;
2682 ewah_each_bit(rd.valid, read_stat, &rd);
2683 ewah_each_bit(rd.sha1_valid, read_sha1, &rd);
2688 ewah_free(rd.valid);
2689 ewah_free(rd.check_only);
2690 ewah_free(rd.sha1_valid);
2693 free_untracked_cache(uc);
2699 static void invalidate_one_directory(struct untracked_cache *uc,
2700 struct untracked_cache_dir *ucd)
2702 uc->dir_invalidated++;
2704 ucd->untracked_nr = 0;
2708 * Normally when an entry is added or removed from a directory,
2709 * invalidating that directory is enough. No need to touch its
2710 * ancestors. When a directory is shown as "foo/bar/" in git-status
2711 * however, deleting or adding an entry may have cascading effect.
2713 * Say the "foo/bar/file" has become untracked, we need to tell the
2714 * untracked_cache_dir of "foo" that "bar/" is not an untracked
2715 * directory any more (because "bar" is managed by foo as an untracked
2718 * Similarly, if "foo/bar/file" moves from untracked to tracked and it
2719 * was the last untracked entry in the entire "foo", we should show
2720 * "foo/" instead. Which means we have to invalidate past "bar" up to
2723 * This function traverses all directories from root to leaf. If there
2724 * is a chance of one of the above cases happening, we invalidate back
2725 * to root. Otherwise we just invalidate the leaf. There may be a more
2726 * sophisticated way than checking for SHOW_OTHER_DIRECTORIES to
2727 * detect these cases and avoid unnecessary invalidation, for example,
2728 * checking for the untracked entry named "bar/" in "foo", but for now
2729 * stick to something safe and simple.
2731 static int invalidate_one_component(struct untracked_cache *uc,
2732 struct untracked_cache_dir *dir,
2733 const char *path, int len)
2735 const char *rest = strchr(path, '/');
2738 int component_len = rest - path;
2739 struct untracked_cache_dir *d =
2740 lookup_untracked(uc, dir, path, component_len);
2742 invalidate_one_component(uc, d, rest + 1,
2743 len - (component_len + 1));
2745 invalidate_one_directory(uc, dir);
2749 invalidate_one_directory(uc, dir);
2750 return uc->dir_flags & DIR_SHOW_OTHER_DIRECTORIES;
2753 void untracked_cache_invalidate_path(struct index_state *istate,
2756 if (!istate->untracked || !istate->untracked->root)
2758 invalidate_one_component(istate->untracked, istate->untracked->root,
2759 path, strlen(path));
2762 void untracked_cache_remove_from_index(struct index_state *istate,
2765 untracked_cache_invalidate_path(istate, path);
2768 void untracked_cache_add_to_index(struct index_state *istate,
2771 untracked_cache_invalidate_path(istate, path);
2774 /* Update gitfile and core.worktree setting to connect work tree and git dir */
2775 void connect_work_tree_and_git_dir(const char *work_tree_, const char *git_dir_)
2777 struct strbuf gitfile_sb = STRBUF_INIT;
2778 struct strbuf cfg_sb = STRBUF_INIT;
2779 struct strbuf rel_path = STRBUF_INIT;
2780 char *git_dir, *work_tree;
2782 /* Prepare .git file */
2783 strbuf_addf(&gitfile_sb, "%s/.git", work_tree_);
2784 if (safe_create_leading_directories_const(gitfile_sb.buf))
2785 die(_("could not create directories for %s"), gitfile_sb.buf);
2787 /* Prepare config file */
2788 strbuf_addf(&cfg_sb, "%s/config", git_dir_);
2789 if (safe_create_leading_directories_const(cfg_sb.buf))
2790 die(_("could not create directories for %s"), cfg_sb.buf);
2792 git_dir = real_pathdup(git_dir_, 1);
2793 work_tree = real_pathdup(work_tree_, 1);
2795 /* Write .git file */
2796 write_file(gitfile_sb.buf, "gitdir: %s",
2797 relative_path(git_dir, work_tree, &rel_path));
2798 /* Update core.worktree setting */
2799 git_config_set_in_file(cfg_sb.buf, "core.worktree",
2800 relative_path(work_tree, git_dir, &rel_path));
2802 strbuf_release(&gitfile_sb);
2803 strbuf_release(&cfg_sb);
2804 strbuf_release(&rel_path);
2810 * Migrate the git directory of the given path from old_git_dir to new_git_dir.
2812 void relocate_gitdir(const char *path, const char *old_git_dir, const char *new_git_dir)
2814 if (rename(old_git_dir, new_git_dir) < 0)
2815 die_errno(_("could not migrate git directory from '%s' to '%s'"),
2816 old_git_dir, new_git_dir);
2818 connect_work_tree_and_git_dir(path, new_git_dir);