2 * This handles recursive filename detection with exclude
3 * files, index knowledge etc..
5 * See Documentation/technical/api-directory-listing.txt
7 * Copyright (C) Linus Torvalds, 2005-2006
8 * Junio Hamano, 2005-2006
13 #include "object-store.h"
16 #include "wildmatch.h"
20 #include "ewah/ewok.h"
21 #include "fsmonitor.h"
22 #include "submodule-config.h"
25 * Tells read_directory_recursive how a file or directory should be treated.
26 * Values are ordered by significance, e.g. if a directory contains both
27 * excluded and untracked files, it is listed as untracked because
28 * path_untracked > path_excluded.
38 * Support data structure for our opendir/readdir/closedir wrappers
42 struct untracked_cache_dir
*untracked
;
48 struct untracked_cache_dir
*ucd
;
51 static enum path_treatment
read_directory_recursive(struct dir_struct
*dir
,
52 struct index_state
*istate
, const char *path
, int len
,
53 struct untracked_cache_dir
*untracked
,
54 int check_only
, int stop_at_first_file
, const struct pathspec
*pathspec
);
55 static int get_dtype(struct dirent
*de
, struct index_state
*istate
,
56 const char *path
, int len
);
58 int count_slashes(const char *s
)
67 int fspathcmp(const char *a
, const char *b
)
69 return ignore_case
? strcasecmp(a
, b
) : strcmp(a
, b
);
72 int fspathncmp(const char *a
, const char *b
, size_t count
)
74 return ignore_case
? strncasecmp(a
, b
, count
) : strncmp(a
, b
, count
);
77 int git_fnmatch(const struct pathspec_item
*item
,
78 const char *pattern
, const char *string
,
82 if (ps_strncmp(item
, pattern
, string
, prefix
))
87 if (item
->flags
& PATHSPEC_ONESTAR
) {
88 int pattern_len
= strlen(++pattern
);
89 int string_len
= strlen(string
);
90 return string_len
< pattern_len
||
91 ps_strcmp(item
, pattern
,
92 string
+ string_len
- pattern_len
);
94 if (item
->magic
& PATHSPEC_GLOB
)
95 return wildmatch(pattern
, string
,
97 (item
->magic
& PATHSPEC_ICASE
? WM_CASEFOLD
: 0));
99 /* wildmatch has not learned no FNM_PATHNAME mode yet */
100 return wildmatch(pattern
, string
,
101 item
->magic
& PATHSPEC_ICASE
? WM_CASEFOLD
: 0);
104 static int fnmatch_icase_mem(const char *pattern
, int patternlen
,
105 const char *string
, int stringlen
,
109 struct strbuf pat_buf
= STRBUF_INIT
;
110 struct strbuf str_buf
= STRBUF_INIT
;
111 const char *use_pat
= pattern
;
112 const char *use_str
= string
;
114 if (pattern
[patternlen
]) {
115 strbuf_add(&pat_buf
, pattern
, patternlen
);
116 use_pat
= pat_buf
.buf
;
118 if (string
[stringlen
]) {
119 strbuf_add(&str_buf
, string
, stringlen
);
120 use_str
= str_buf
.buf
;
124 flags
|= WM_CASEFOLD
;
125 match_status
= wildmatch(use_pat
, use_str
, flags
);
127 strbuf_release(&pat_buf
);
128 strbuf_release(&str_buf
);
133 static size_t common_prefix_len(const struct pathspec
*pathspec
)
139 * ":(icase)path" is treated as a pathspec full of
140 * wildcard. In other words, only prefix is considered common
141 * prefix. If the pathspec is abc/foo abc/bar, running in
142 * subdir xyz, the common prefix is still xyz, not xyz/abc as
145 GUARD_PATHSPEC(pathspec
,
154 for (n
= 0; n
< pathspec
->nr
; n
++) {
155 size_t i
= 0, len
= 0, item_len
;
156 if (pathspec
->items
[n
].magic
& PATHSPEC_EXCLUDE
)
158 if (pathspec
->items
[n
].magic
& PATHSPEC_ICASE
)
159 item_len
= pathspec
->items
[n
].prefix
;
161 item_len
= pathspec
->items
[n
].nowildcard_len
;
162 while (i
< item_len
&& (n
== 0 || i
< max
)) {
163 char c
= pathspec
->items
[n
].match
[i
];
164 if (c
!= pathspec
->items
[0].match
[i
])
170 if (n
== 0 || len
< max
) {
180 * Returns a copy of the longest leading path common among all
183 char *common_prefix(const struct pathspec
*pathspec
)
185 unsigned long len
= common_prefix_len(pathspec
);
187 return len
? xmemdupz(pathspec
->items
[0].match
, len
) : NULL
;
190 int fill_directory(struct dir_struct
*dir
,
191 struct index_state
*istate
,
192 const struct pathspec
*pathspec
)
198 * Calculate common prefix for the pathspec, and
199 * use that to optimize the directory walk
201 prefix_len
= common_prefix_len(pathspec
);
202 prefix
= prefix_len
? pathspec
->items
[0].match
: "";
204 /* Read the directory and prune it */
205 read_directory(dir
, istate
, prefix
, prefix_len
, pathspec
);
210 int within_depth(const char *name
, int namelen
,
211 int depth
, int max_depth
)
213 const char *cp
= name
, *cpe
= name
+ namelen
;
219 if (depth
> max_depth
)
226 * Read the contents of the blob with the given OID into a buffer.
227 * Append a trailing LF to the end if the last line doesn't have one.
230 * -1 when the OID is invalid or unknown or does not refer to a blob.
231 * 0 when the blob is empty.
232 * 1 along with { data, size } of the (possibly augmented) buffer
235 * Optionally updates the given oid_stat with the given OID (when valid).
237 static int do_read_blob(const struct object_id
*oid
, struct oid_stat
*oid_stat
,
238 size_t *size_out
, char **data_out
)
240 enum object_type type
;
247 data
= read_object_file(oid
, &type
, &sz
);
248 if (!data
|| type
!= OBJ_BLOB
) {
254 memset(&oid_stat
->stat
, 0, sizeof(oid_stat
->stat
));
255 oidcpy(&oid_stat
->oid
, oid
);
263 if (data
[sz
- 1] != '\n') {
264 data
= xrealloc(data
, st_add(sz
, 1));
268 *size_out
= xsize_t(sz
);
274 #define DO_MATCH_EXCLUDE (1<<0)
275 #define DO_MATCH_DIRECTORY (1<<1)
276 #define DO_MATCH_LEADING_PATHSPEC (1<<2)
279 * Does the given pathspec match the given name? A match is found if
281 * (1) the pathspec string is leading directory of 'name' ("RECURSIVELY"), or
282 * (2) the pathspec string has a leading part matching 'name' ("LEADING"), or
283 * (3) the pathspec string is a wildcard and matches 'name' ("WILDCARD"), or
284 * (4) the pathspec string is exactly the same as 'name' ("EXACT").
286 * Return value tells which case it was (1-4), or 0 when there is no match.
288 * It may be instructive to look at a small table of concrete examples
289 * to understand the differences between 1, 2, and 4:
292 * | a/b | a/b/ | a/b/c
293 * ------+-----------+-----------+------------
294 * a/b | EXACT | EXACT[1] | LEADING[2]
295 * Names a/b/ | RECURSIVE | EXACT | LEADING[2]
296 * a/b/c | RECURSIVE | RECURSIVE | EXACT
298 * [1] Only if DO_MATCH_DIRECTORY is passed; otherwise, this is NOT a match.
299 * [2] Only if DO_MATCH_LEADING_PATHSPEC is passed; otherwise, not a match.
301 static int match_pathspec_item(const struct index_state
*istate
,
302 const struct pathspec_item
*item
, int prefix
,
303 const char *name
, int namelen
, unsigned flags
)
305 /* name/namelen has prefix cut off by caller */
306 const char *match
= item
->match
+ prefix
;
307 int matchlen
= item
->len
- prefix
;
310 * The normal call pattern is:
311 * 1. prefix = common_prefix_len(ps);
312 * 2. prune something, or fill_directory
313 * 3. match_pathspec()
315 * 'prefix' at #1 may be shorter than the command's prefix and
316 * it's ok for #2 to match extra files. Those extras will be
319 * Suppose the pathspec is 'foo' and '../bar' running from
320 * subdir 'xyz'. The common prefix at #1 will be empty, thanks
321 * to "../". We may have xyz/foo _and_ XYZ/foo after #2. The
322 * user does not want XYZ/foo, only the "foo" part should be
323 * case-insensitive. We need to filter out XYZ/foo here. In
324 * other words, we do not trust the caller on comparing the
325 * prefix part when :(icase) is involved. We do exact
326 * comparison ourselves.
328 * Normally the caller (common_prefix_len() in fact) does
329 * _exact_ matching on name[-prefix+1..-1] and we do not need
330 * to check that part. Be defensive and check it anyway, in
331 * case common_prefix_len is changed, or a new caller is
332 * introduced that does not use common_prefix_len.
334 * If the penalty turns out too high when prefix is really
335 * long, maybe change it to
336 * strncmp(match, name, item->prefix - prefix)
338 if (item
->prefix
&& (item
->magic
& PATHSPEC_ICASE
) &&
339 strncmp(item
->match
, name
- prefix
, item
->prefix
))
342 if (item
->attr_match_nr
&&
343 !match_pathspec_attrs(istate
, name
, namelen
, item
))
346 /* If the match was just the prefix, we matched */
348 return MATCHED_RECURSIVELY
;
350 if (matchlen
<= namelen
&& !ps_strncmp(item
, match
, name
, matchlen
)) {
351 if (matchlen
== namelen
)
352 return MATCHED_EXACTLY
;
354 if (match
[matchlen
-1] == '/' || name
[matchlen
] == '/')
355 return MATCHED_RECURSIVELY
;
356 } else if ((flags
& DO_MATCH_DIRECTORY
) &&
357 match
[matchlen
- 1] == '/' &&
358 namelen
== matchlen
- 1 &&
359 !ps_strncmp(item
, match
, name
, namelen
))
360 return MATCHED_EXACTLY
;
362 if (item
->nowildcard_len
< item
->len
&&
363 !git_fnmatch(item
, match
, name
,
364 item
->nowildcard_len
- prefix
))
365 return MATCHED_FNMATCH
;
367 /* Perform checks to see if "name" is a leading string of the pathspec */
368 if (flags
& DO_MATCH_LEADING_PATHSPEC
) {
369 /* name is a literal prefix of the pathspec */
370 int offset
= name
[namelen
-1] == '/' ? 1 : 0;
371 if ((namelen
< matchlen
) &&
372 (match
[namelen
-offset
] == '/') &&
373 !ps_strncmp(item
, match
, name
, namelen
))
374 return MATCHED_RECURSIVELY_LEADING_PATHSPEC
;
376 /* name" doesn't match up to the first wild character */
377 if (item
->nowildcard_len
< item
->len
&&
378 ps_strncmp(item
, match
, name
,
379 item
->nowildcard_len
- prefix
))
383 * Here is where we would perform a wildmatch to check if
384 * "name" can be matched as a directory (or a prefix) against
385 * the pathspec. Since wildmatch doesn't have this capability
386 * at the present we have to punt and say that it is a match,
387 * potentially returning a false positive
388 * The submodules themselves will be able to perform more
389 * accurate matching to determine if the pathspec matches.
391 return MATCHED_RECURSIVELY_LEADING_PATHSPEC
;
398 * Given a name and a list of pathspecs, returns the nature of the
399 * closest (i.e. most specific) match of the name to any of the
402 * The caller typically calls this multiple times with the same
403 * pathspec and seen[] array but with different name/namelen
404 * (e.g. entries from the index) and is interested in seeing if and
405 * how each pathspec matches all the names it calls this function
406 * with. A mark is left in the seen[] array for each pathspec element
407 * indicating the closest type of match that element achieved, so if
408 * seen[n] remains zero after multiple invocations, that means the nth
409 * pathspec did not match any names, which could indicate that the
410 * user mistyped the nth pathspec.
412 static int do_match_pathspec(const struct index_state
*istate
,
413 const struct pathspec
*ps
,
414 const char *name
, int namelen
,
415 int prefix
, char *seen
,
418 int i
, retval
= 0, exclude
= flags
& DO_MATCH_EXCLUDE
;
430 if (!ps
->recursive
||
431 !(ps
->magic
& PATHSPEC_MAXDEPTH
) ||
433 return MATCHED_RECURSIVELY
;
435 if (within_depth(name
, namelen
, 0, ps
->max_depth
))
436 return MATCHED_EXACTLY
;
444 for (i
= ps
->nr
- 1; i
>= 0; i
--) {
447 if ((!exclude
&& ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
) ||
448 ( exclude
&& !(ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
)))
451 if (seen
&& seen
[i
] == MATCHED_EXACTLY
)
454 * Make exclude patterns optional and never report
455 * "pathspec ':(exclude)foo' matches no files"
457 if (seen
&& ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
)
458 seen
[i
] = MATCHED_FNMATCH
;
459 how
= match_pathspec_item(istate
, ps
->items
+i
, prefix
, name
,
462 (ps
->magic
& PATHSPEC_MAXDEPTH
) &&
463 ps
->max_depth
!= -1 &&
464 how
&& how
!= MATCHED_FNMATCH
) {
465 int len
= ps
->items
[i
].len
;
466 if (name
[len
] == '/')
468 if (within_depth(name
+len
, namelen
-len
, 0, ps
->max_depth
))
469 how
= MATCHED_EXACTLY
;
476 if (seen
&& seen
[i
] < how
)
483 int match_pathspec(const struct index_state
*istate
,
484 const struct pathspec
*ps
,
485 const char *name
, int namelen
,
486 int prefix
, char *seen
, int is_dir
)
488 int positive
, negative
;
489 unsigned flags
= is_dir
? DO_MATCH_DIRECTORY
: 0;
490 positive
= do_match_pathspec(istate
, ps
, name
, namelen
,
491 prefix
, seen
, flags
);
492 if (!(ps
->magic
& PATHSPEC_EXCLUDE
) || !positive
)
494 negative
= do_match_pathspec(istate
, ps
, name
, namelen
,
496 flags
| DO_MATCH_EXCLUDE
);
497 return negative
? 0 : positive
;
501 * Check if a submodule is a superset of the pathspec
503 int submodule_path_match(const struct index_state
*istate
,
504 const struct pathspec
*ps
,
505 const char *submodule_name
,
508 int matched
= do_match_pathspec(istate
, ps
, submodule_name
,
509 strlen(submodule_name
),
512 DO_MATCH_LEADING_PATHSPEC
);
516 int report_path_error(const char *ps_matched
,
517 const struct pathspec
*pathspec
)
520 * Make sure all pathspec matched; otherwise it is an error.
523 for (num
= 0; num
< pathspec
->nr
; num
++) {
524 int other
, found_dup
;
529 * The caller might have fed identical pathspec
530 * twice. Do not barf on such a mistake.
531 * FIXME: parse_pathspec should have eliminated
532 * duplicate pathspec.
534 for (found_dup
= other
= 0;
535 !found_dup
&& other
< pathspec
->nr
;
537 if (other
== num
|| !ps_matched
[other
])
539 if (!strcmp(pathspec
->items
[other
].original
,
540 pathspec
->items
[num
].original
))
542 * Ok, we have a match already.
549 error(_("pathspec '%s' did not match any file(s) known to git"),
550 pathspec
->items
[num
].original
);
557 * Return the length of the "simple" part of a path match limiter.
559 int simple_length(const char *match
)
564 unsigned char c
= *match
++;
566 if (c
== '\0' || is_glob_special(c
))
571 int no_wildcard(const char *string
)
573 return string
[simple_length(string
)] == '\0';
576 void parse_path_pattern(const char **pattern
,
581 const char *p
= *pattern
;
586 *flags
|= PATTERN_FLAG_NEGATIVE
;
590 if (len
&& p
[len
- 1] == '/') {
592 *flags
|= PATTERN_FLAG_MUSTBEDIR
;
594 for (i
= 0; i
< len
; i
++) {
599 *flags
|= PATTERN_FLAG_NODIR
;
600 *nowildcardlen
= simple_length(p
);
602 * we should have excluded the trailing slash from 'p' too,
603 * but that's one more allocation. Instead just make sure
604 * nowildcardlen does not exceed real patternlen
606 if (*nowildcardlen
> len
)
607 *nowildcardlen
= len
;
608 if (*p
== '*' && no_wildcard(p
+ 1))
609 *flags
|= PATTERN_FLAG_ENDSWITH
;
614 int pl_hashmap_cmp(const void *unused_cmp_data
,
615 const struct hashmap_entry
*a
,
616 const struct hashmap_entry
*b
,
619 const struct pattern_entry
*ee1
=
620 container_of(a
, struct pattern_entry
, ent
);
621 const struct pattern_entry
*ee2
=
622 container_of(b
, struct pattern_entry
, ent
);
624 size_t min_len
= ee1
->patternlen
<= ee2
->patternlen
629 return strncasecmp(ee1
->pattern
, ee2
->pattern
, min_len
);
630 return strncmp(ee1
->pattern
, ee2
->pattern
, min_len
);
633 static void add_pattern_to_hashsets(struct pattern_list
*pl
, struct path_pattern
*given
)
635 struct pattern_entry
*translated
;
638 const char *prev
, *cur
, *next
;
640 if (!pl
->use_cone_patterns
)
643 if (given
->flags
& PATTERN_FLAG_NEGATIVE
&&
644 given
->flags
& PATTERN_FLAG_MUSTBEDIR
&&
645 !strcmp(given
->pattern
, "/*")) {
650 if (!given
->flags
&& !strcmp(given
->pattern
, "/*")) {
655 if (given
->patternlen
<= 2 ||
656 *given
->pattern
== '*' ||
657 strstr(given
->pattern
, "**")) {
658 /* Not a cone pattern. */
659 warning(_("unrecognized pattern: '%s'"), given
->pattern
);
663 prev
= given
->pattern
;
664 cur
= given
->pattern
+ 1;
665 next
= given
->pattern
+ 2;
668 /* Watch for glob characters '*', '\', '[', '?' */
669 if (!is_glob_special(*cur
))
672 /* But only if *prev != '\\' */
676 /* But allow the initial '\' */
678 is_glob_special(*next
))
681 /* But a trailing '/' then '*' is fine */
687 /* Not a cone pattern. */
688 warning(_("unrecognized pattern: '%s'"), given
->pattern
);
697 if (given
->patternlen
> 2 &&
698 !strcmp(given
->pattern
+ given
->patternlen
- 2, "/*")) {
699 if (!(given
->flags
& PATTERN_FLAG_NEGATIVE
)) {
700 /* Not a cone pattern. */
701 warning(_("unrecognized pattern: '%s'"), given
->pattern
);
705 truncated
= xstrdup(given
->pattern
);
706 truncated
[given
->patternlen
- 2] = 0;
708 translated
= xmalloc(sizeof(struct pattern_entry
));
709 translated
->pattern
= truncated
;
710 translated
->patternlen
= given
->patternlen
- 2;
711 hashmap_entry_init(&translated
->ent
,
713 strihash(translated
->pattern
) :
714 strhash(translated
->pattern
));
716 if (!hashmap_get_entry(&pl
->recursive_hashmap
,
717 translated
, ent
, NULL
)) {
718 /* We did not see the "parent" included */
719 warning(_("unrecognized negative pattern: '%s'"),
726 hashmap_add(&pl
->parent_hashmap
, &translated
->ent
);
727 hashmap_remove(&pl
->recursive_hashmap
, &translated
->ent
, &data
);
732 if (given
->flags
& PATTERN_FLAG_NEGATIVE
) {
733 warning(_("unrecognized negative pattern: '%s'"),
738 translated
= xmalloc(sizeof(struct pattern_entry
));
740 translated
->pattern
= xstrdup(given
->pattern
);
741 translated
->patternlen
= given
->patternlen
;
742 hashmap_entry_init(&translated
->ent
,
744 strihash(translated
->pattern
) :
745 strhash(translated
->pattern
));
747 hashmap_add(&pl
->recursive_hashmap
, &translated
->ent
);
749 if (hashmap_get_entry(&pl
->parent_hashmap
, translated
, ent
, NULL
)) {
750 /* we already included this at the parent level */
751 warning(_("your sparse-checkout file may have issues: pattern '%s' is repeated"),
753 hashmap_remove(&pl
->parent_hashmap
, &translated
->ent
, &data
);
761 warning(_("disabling cone pattern matching"));
762 hashmap_free_entries(&pl
->parent_hashmap
, struct pattern_entry
, ent
);
763 hashmap_free_entries(&pl
->recursive_hashmap
, struct pattern_entry
, ent
);
764 pl
->use_cone_patterns
= 0;
767 static int hashmap_contains_path(struct hashmap
*map
,
768 struct strbuf
*pattern
)
770 struct pattern_entry p
;
772 /* Check straight mapping */
773 p
.pattern
= pattern
->buf
;
774 p
.patternlen
= pattern
->len
;
775 hashmap_entry_init(&p
.ent
,
777 strihash(p
.pattern
) :
779 return !!hashmap_get_entry(map
, &p
, ent
, NULL
);
782 int hashmap_contains_parent(struct hashmap
*map
,
784 struct strbuf
*buffer
)
788 strbuf_setlen(buffer
, 0);
791 strbuf_addch(buffer
, '/');
793 strbuf_addstr(buffer
, path
);
795 slash_pos
= strrchr(buffer
->buf
, '/');
797 while (slash_pos
> buffer
->buf
) {
798 strbuf_setlen(buffer
, slash_pos
- buffer
->buf
);
800 if (hashmap_contains_path(map
, buffer
))
803 slash_pos
= strrchr(buffer
->buf
, '/');
809 void add_pattern(const char *string
, const char *base
,
810 int baselen
, struct pattern_list
*pl
, int srcpos
)
812 struct path_pattern
*pattern
;
817 parse_path_pattern(&string
, &patternlen
, &flags
, &nowildcardlen
);
818 if (flags
& PATTERN_FLAG_MUSTBEDIR
) {
819 FLEXPTR_ALLOC_MEM(pattern
, pattern
, string
, patternlen
);
821 pattern
= xmalloc(sizeof(*pattern
));
822 pattern
->pattern
= string
;
824 pattern
->patternlen
= patternlen
;
825 pattern
->nowildcardlen
= nowildcardlen
;
826 pattern
->base
= base
;
827 pattern
->baselen
= baselen
;
828 pattern
->flags
= flags
;
829 pattern
->srcpos
= srcpos
;
830 ALLOC_GROW(pl
->patterns
, pl
->nr
+ 1, pl
->alloc
);
831 pl
->patterns
[pl
->nr
++] = pattern
;
834 add_pattern_to_hashsets(pl
, pattern
);
837 static int read_skip_worktree_file_from_index(const struct index_state
*istate
,
839 size_t *size_out
, char **data_out
,
840 struct oid_stat
*oid_stat
)
845 pos
= index_name_pos(istate
, path
, len
);
848 if (!ce_skip_worktree(istate
->cache
[pos
]))
851 return do_read_blob(&istate
->cache
[pos
]->oid
, oid_stat
, size_out
, data_out
);
855 * Frees memory within pl which was allocated for exclude patterns and
856 * the file buffer. Does not free pl itself.
858 void clear_pattern_list(struct pattern_list
*pl
)
862 for (i
= 0; i
< pl
->nr
; i
++)
863 free(pl
->patterns
[i
]);
867 memset(pl
, 0, sizeof(*pl
));
870 static void trim_trailing_spaces(char *buf
)
872 char *p
, *last_space
= NULL
;
874 for (p
= buf
; *p
; p
++)
894 * Given a subdirectory name and "dir" of the current directory,
895 * search the subdir in "dir" and return it, or create a new one if it
896 * does not exist in "dir".
898 * If "name" has the trailing slash, it'll be excluded in the search.
900 static struct untracked_cache_dir
*lookup_untracked(struct untracked_cache
*uc
,
901 struct untracked_cache_dir
*dir
,
902 const char *name
, int len
)
905 struct untracked_cache_dir
*d
;
908 if (len
&& name
[len
- 1] == '/')
912 while (last
> first
) {
913 int cmp
, next
= first
+ ((last
- first
) >> 1);
915 cmp
= strncmp(name
, d
->name
, len
);
916 if (!cmp
&& strlen(d
->name
) > len
)
928 FLEX_ALLOC_MEM(d
, name
, name
, len
);
930 ALLOC_GROW(dir
->dirs
, dir
->dirs_nr
+ 1, dir
->dirs_alloc
);
931 MOVE_ARRAY(dir
->dirs
+ first
+ 1, dir
->dirs
+ first
,
932 dir
->dirs_nr
- first
);
934 dir
->dirs
[first
] = d
;
938 static void do_invalidate_gitignore(struct untracked_cache_dir
*dir
)
942 dir
->untracked_nr
= 0;
943 for (i
= 0; i
< dir
->dirs_nr
; i
++)
944 do_invalidate_gitignore(dir
->dirs
[i
]);
947 static void invalidate_gitignore(struct untracked_cache
*uc
,
948 struct untracked_cache_dir
*dir
)
950 uc
->gitignore_invalidated
++;
951 do_invalidate_gitignore(dir
);
954 static void invalidate_directory(struct untracked_cache
*uc
,
955 struct untracked_cache_dir
*dir
)
960 * Invalidation increment here is just roughly correct. If
961 * untracked_nr or any of dirs[].recurse is non-zero, we
962 * should increment dir_invalidated too. But that's more
966 uc
->dir_invalidated
++;
969 dir
->untracked_nr
= 0;
970 for (i
= 0; i
< dir
->dirs_nr
; i
++)
971 dir
->dirs
[i
]->recurse
= 0;
974 static int add_patterns_from_buffer(char *buf
, size_t size
,
975 const char *base
, int baselen
,
976 struct pattern_list
*pl
);
979 * Given a file with name "fname", read it (either from disk, or from
980 * an index if 'istate' is non-null), parse it and store the
981 * exclude rules in "pl".
983 * If "ss" is not NULL, compute SHA-1 of the exclude file and fill
984 * stat data from disk (only valid if add_patterns returns zero). If
985 * ss_valid is non-zero, "ss" must contain good value as input.
987 static int add_patterns(const char *fname
, const char *base
, int baselen
,
988 struct pattern_list
*pl
, struct index_state
*istate
,
989 struct oid_stat
*oid_stat
)
997 fd
= open(fname
, O_RDONLY
);
998 if (fd
< 0 || fstat(fd
, &st
) < 0) {
1000 warn_on_fopen_errors(fname
);
1005 r
= read_skip_worktree_file_from_index(istate
, fname
,
1011 size
= xsize_t(st
.st_size
);
1014 fill_stat_data(&oid_stat
->stat
, &st
);
1015 oidcpy(&oid_stat
->oid
, the_hash_algo
->empty_blob
);
1016 oid_stat
->valid
= 1;
1021 buf
= xmallocz(size
);
1022 if (read_in_full(fd
, buf
, size
) != size
) {
1031 if (oid_stat
->valid
&&
1032 !match_stat_data_racy(istate
, &oid_stat
->stat
, &st
))
1033 ; /* no content change, ss->sha1 still good */
1035 (pos
= index_name_pos(istate
, fname
, strlen(fname
))) >= 0 &&
1036 !ce_stage(istate
->cache
[pos
]) &&
1037 ce_uptodate(istate
->cache
[pos
]) &&
1038 !would_convert_to_git(istate
, fname
))
1039 oidcpy(&oid_stat
->oid
,
1040 &istate
->cache
[pos
]->oid
);
1042 hash_object_file(buf
, size
, "blob",
1044 fill_stat_data(&oid_stat
->stat
, &st
);
1045 oid_stat
->valid
= 1;
1049 add_patterns_from_buffer(buf
, size
, base
, baselen
, pl
);
1053 static int add_patterns_from_buffer(char *buf
, size_t size
,
1054 const char *base
, int baselen
,
1055 struct pattern_list
*pl
)
1060 hashmap_init(&pl
->recursive_hashmap
, pl_hashmap_cmp
, NULL
, 0);
1061 hashmap_init(&pl
->parent_hashmap
, pl_hashmap_cmp
, NULL
, 0);
1065 if (skip_utf8_bom(&buf
, size
))
1066 size
-= buf
- pl
->filebuf
;
1070 for (i
= 0; i
< size
; i
++) {
1071 if (buf
[i
] == '\n') {
1072 if (entry
!= buf
+ i
&& entry
[0] != '#') {
1073 buf
[i
- (i
&& buf
[i
-1] == '\r')] = 0;
1074 trim_trailing_spaces(entry
);
1075 add_pattern(entry
, base
, baselen
, pl
, lineno
);
1078 entry
= buf
+ i
+ 1;
1084 int add_patterns_from_file_to_list(const char *fname
, const char *base
,
1085 int baselen
, struct pattern_list
*pl
,
1086 struct index_state
*istate
)
1088 return add_patterns(fname
, base
, baselen
, pl
, istate
, NULL
);
1091 int add_patterns_from_blob_to_list(
1092 struct object_id
*oid
,
1093 const char *base
, int baselen
,
1094 struct pattern_list
*pl
)
1100 r
= do_read_blob(oid
, NULL
, &size
, &buf
);
1104 add_patterns_from_buffer(buf
, size
, base
, baselen
, pl
);
1108 struct pattern_list
*add_pattern_list(struct dir_struct
*dir
,
1109 int group_type
, const char *src
)
1111 struct pattern_list
*pl
;
1112 struct exclude_list_group
*group
;
1114 group
= &dir
->exclude_list_group
[group_type
];
1115 ALLOC_GROW(group
->pl
, group
->nr
+ 1, group
->alloc
);
1116 pl
= &group
->pl
[group
->nr
++];
1117 memset(pl
, 0, sizeof(*pl
));
1123 * Used to set up core.excludesfile and .git/info/exclude lists.
1125 static void add_patterns_from_file_1(struct dir_struct
*dir
, const char *fname
,
1126 struct oid_stat
*oid_stat
)
1128 struct pattern_list
*pl
;
1130 * catch setup_standard_excludes() that's called before
1131 * dir->untracked is assigned. That function behaves
1132 * differently when dir->untracked is non-NULL.
1134 if (!dir
->untracked
)
1135 dir
->unmanaged_exclude_files
++;
1136 pl
= add_pattern_list(dir
, EXC_FILE
, fname
);
1137 if (add_patterns(fname
, "", 0, pl
, NULL
, oid_stat
) < 0)
1138 die(_("cannot use %s as an exclude file"), fname
);
1141 void add_patterns_from_file(struct dir_struct
*dir
, const char *fname
)
1143 dir
->unmanaged_exclude_files
++; /* see validate_untracked_cache() */
1144 add_patterns_from_file_1(dir
, fname
, NULL
);
1147 int match_basename(const char *basename
, int basenamelen
,
1148 const char *pattern
, int prefix
, int patternlen
,
1151 if (prefix
== patternlen
) {
1152 if (patternlen
== basenamelen
&&
1153 !fspathncmp(pattern
, basename
, basenamelen
))
1155 } else if (flags
& PATTERN_FLAG_ENDSWITH
) {
1156 /* "*literal" matching against "fooliteral" */
1157 if (patternlen
- 1 <= basenamelen
&&
1158 !fspathncmp(pattern
+ 1,
1159 basename
+ basenamelen
- (patternlen
- 1),
1163 if (fnmatch_icase_mem(pattern
, patternlen
,
1164 basename
, basenamelen
,
1171 int match_pathname(const char *pathname
, int pathlen
,
1172 const char *base
, int baselen
,
1173 const char *pattern
, int prefix
, int patternlen
,
1180 * match with FNM_PATHNAME; the pattern has base implicitly
1183 if (*pattern
== '/') {
1190 * baselen does not count the trailing slash. base[] may or
1191 * may not end with a trailing slash though.
1193 if (pathlen
< baselen
+ 1 ||
1194 (baselen
&& pathname
[baselen
] != '/') ||
1195 fspathncmp(pathname
, base
, baselen
))
1198 namelen
= baselen
? pathlen
- baselen
- 1 : pathlen
;
1199 name
= pathname
+ pathlen
- namelen
;
1203 * if the non-wildcard part is longer than the
1204 * remaining pathname, surely it cannot match.
1206 if (prefix
> namelen
)
1209 if (fspathncmp(pattern
, name
, prefix
))
1212 patternlen
-= prefix
;
1217 * If the whole pattern did not have a wildcard,
1218 * then our prefix match is all we need; we
1219 * do not need to call fnmatch at all.
1221 if (!patternlen
&& !namelen
)
1225 return fnmatch_icase_mem(pattern
, patternlen
,
1231 * Scan the given exclude list in reverse to see whether pathname
1232 * should be ignored. The first match (i.e. the last on the list), if
1233 * any, determines the fate. Returns the exclude_list element which
1234 * matched, or NULL for undecided.
1236 static struct path_pattern
*last_matching_pattern_from_list(const char *pathname
,
1238 const char *basename
,
1240 struct pattern_list
*pl
,
1241 struct index_state
*istate
)
1243 struct path_pattern
*res
= NULL
; /* undecided */
1247 return NULL
; /* undefined */
1249 for (i
= pl
->nr
- 1; 0 <= i
; i
--) {
1250 struct path_pattern
*pattern
= pl
->patterns
[i
];
1251 const char *exclude
= pattern
->pattern
;
1252 int prefix
= pattern
->nowildcardlen
;
1254 if (pattern
->flags
& PATTERN_FLAG_MUSTBEDIR
) {
1255 if (*dtype
== DT_UNKNOWN
)
1256 *dtype
= get_dtype(NULL
, istate
, pathname
, pathlen
);
1257 if (*dtype
!= DT_DIR
)
1261 if (pattern
->flags
& PATTERN_FLAG_NODIR
) {
1262 if (match_basename(basename
,
1263 pathlen
- (basename
- pathname
),
1264 exclude
, prefix
, pattern
->patternlen
,
1272 assert(pattern
->baselen
== 0 ||
1273 pattern
->base
[pattern
->baselen
- 1] == '/');
1274 if (match_pathname(pathname
, pathlen
,
1276 pattern
->baselen
? pattern
->baselen
- 1 : 0,
1277 exclude
, prefix
, pattern
->patternlen
,
1287 * Scan the list of patterns to determine if the ordered list
1288 * of patterns matches on 'pathname'.
1290 * Return 1 for a match, 0 for not matched and -1 for undecided.
1292 enum pattern_match_result
path_matches_pattern_list(
1293 const char *pathname
, int pathlen
,
1294 const char *basename
, int *dtype
,
1295 struct pattern_list
*pl
,
1296 struct index_state
*istate
)
1298 struct path_pattern
*pattern
;
1299 struct strbuf parent_pathname
= STRBUF_INIT
;
1300 int result
= NOT_MATCHED
;
1301 const char *slash_pos
;
1303 if (!pl
->use_cone_patterns
) {
1304 pattern
= last_matching_pattern_from_list(pathname
, pathlen
, basename
,
1307 if (pattern
->flags
& PATTERN_FLAG_NEGATIVE
)
1319 strbuf_addch(&parent_pathname
, '/');
1320 strbuf_add(&parent_pathname
, pathname
, pathlen
);
1322 if (hashmap_contains_path(&pl
->recursive_hashmap
,
1323 &parent_pathname
)) {
1324 result
= MATCHED_RECURSIVE
;
1328 slash_pos
= strrchr(parent_pathname
.buf
, '/');
1330 if (slash_pos
== parent_pathname
.buf
) {
1331 /* include every file in root */
1336 strbuf_setlen(&parent_pathname
, slash_pos
- parent_pathname
.buf
);
1338 if (hashmap_contains_path(&pl
->parent_hashmap
, &parent_pathname
)) {
1343 if (hashmap_contains_parent(&pl
->recursive_hashmap
,
1346 result
= MATCHED_RECURSIVE
;
1349 strbuf_release(&parent_pathname
);
1353 static struct path_pattern
*last_matching_pattern_from_lists(
1354 struct dir_struct
*dir
, struct index_state
*istate
,
1355 const char *pathname
, int pathlen
,
1356 const char *basename
, int *dtype_p
)
1359 struct exclude_list_group
*group
;
1360 struct path_pattern
*pattern
;
1361 for (i
= EXC_CMDL
; i
<= EXC_FILE
; i
++) {
1362 group
= &dir
->exclude_list_group
[i
];
1363 for (j
= group
->nr
- 1; j
>= 0; j
--) {
1364 pattern
= last_matching_pattern_from_list(
1365 pathname
, pathlen
, basename
, dtype_p
,
1366 &group
->pl
[j
], istate
);
1375 * Loads the per-directory exclude list for the substring of base
1376 * which has a char length of baselen.
1378 static void prep_exclude(struct dir_struct
*dir
,
1379 struct index_state
*istate
,
1380 const char *base
, int baselen
)
1382 struct exclude_list_group
*group
;
1383 struct pattern_list
*pl
;
1384 struct exclude_stack
*stk
= NULL
;
1385 struct untracked_cache_dir
*untracked
;
1388 group
= &dir
->exclude_list_group
[EXC_DIRS
];
1391 * Pop the exclude lists from the EXCL_DIRS exclude_list_group
1392 * which originate from directories not in the prefix of the
1393 * path being checked.
1395 while ((stk
= dir
->exclude_stack
) != NULL
) {
1396 if (stk
->baselen
<= baselen
&&
1397 !strncmp(dir
->basebuf
.buf
, base
, stk
->baselen
))
1399 pl
= &group
->pl
[dir
->exclude_stack
->exclude_ix
];
1400 dir
->exclude_stack
= stk
->prev
;
1401 dir
->pattern
= NULL
;
1402 free((char *)pl
->src
); /* see strbuf_detach() below */
1403 clear_pattern_list(pl
);
1408 /* Skip traversing into sub directories if the parent is excluded */
1413 * Lazy initialization. All call sites currently just
1414 * memset(dir, 0, sizeof(*dir)) before use. Changing all of
1415 * them seems lots of work for little benefit.
1417 if (!dir
->basebuf
.buf
)
1418 strbuf_init(&dir
->basebuf
, PATH_MAX
);
1420 /* Read from the parent directories and push them down. */
1421 current
= stk
? stk
->baselen
: -1;
1422 strbuf_setlen(&dir
->basebuf
, current
< 0 ? 0 : current
);
1424 untracked
= stk
? stk
->ucd
: dir
->untracked
->root
;
1428 while (current
< baselen
) {
1430 struct oid_stat oid_stat
;
1432 stk
= xcalloc(1, sizeof(*stk
));
1437 cp
= strchr(base
+ current
+ 1, '/');
1439 die("oops in prep_exclude");
1442 lookup_untracked(dir
->untracked
, untracked
,
1444 cp
- base
- current
);
1446 stk
->prev
= dir
->exclude_stack
;
1447 stk
->baselen
= cp
- base
;
1448 stk
->exclude_ix
= group
->nr
;
1449 stk
->ucd
= untracked
;
1450 pl
= add_pattern_list(dir
, EXC_DIRS
, NULL
);
1451 strbuf_add(&dir
->basebuf
, base
+ current
, stk
->baselen
- current
);
1452 assert(stk
->baselen
== dir
->basebuf
.len
);
1454 /* Abort if the directory is excluded */
1457 dir
->basebuf
.buf
[stk
->baselen
- 1] = 0;
1458 dir
->pattern
= last_matching_pattern_from_lists(dir
,
1460 dir
->basebuf
.buf
, stk
->baselen
- 1,
1461 dir
->basebuf
.buf
+ current
, &dt
);
1462 dir
->basebuf
.buf
[stk
->baselen
- 1] = '/';
1464 dir
->pattern
->flags
& PATTERN_FLAG_NEGATIVE
)
1465 dir
->pattern
= NULL
;
1467 dir
->exclude_stack
= stk
;
1472 /* Try to read per-directory file */
1473 oidclr(&oid_stat
.oid
);
1475 if (dir
->exclude_per_dir
&&
1477 * If we know that no files have been added in
1478 * this directory (i.e. valid_cached_dir() has
1479 * been executed and set untracked->valid) ..
1481 (!untracked
|| !untracked
->valid
||
1483 * .. and .gitignore does not exist before
1484 * (i.e. null exclude_oid). Then we can skip
1485 * loading .gitignore, which would result in
1488 !is_null_oid(&untracked
->exclude_oid
))) {
1490 * dir->basebuf gets reused by the traversal, but we
1491 * need fname to remain unchanged to ensure the src
1492 * member of each struct path_pattern correctly
1493 * back-references its source file. Other invocations
1494 * of add_pattern_list provide stable strings, so we
1495 * strbuf_detach() and free() here in the caller.
1497 struct strbuf sb
= STRBUF_INIT
;
1498 strbuf_addbuf(&sb
, &dir
->basebuf
);
1499 strbuf_addstr(&sb
, dir
->exclude_per_dir
);
1500 pl
->src
= strbuf_detach(&sb
, NULL
);
1501 add_patterns(pl
->src
, pl
->src
, stk
->baselen
, pl
, istate
,
1502 untracked
? &oid_stat
: NULL
);
1505 * NEEDSWORK: when untracked cache is enabled, prep_exclude()
1506 * will first be called in valid_cached_dir() then maybe many
1507 * times more in last_matching_pattern(). When the cache is
1508 * used, last_matching_pattern() will not be called and
1509 * reading .gitignore content will be a waste.
1511 * So when it's called by valid_cached_dir() and we can get
1512 * .gitignore SHA-1 from the index (i.e. .gitignore is not
1513 * modified on work tree), we could delay reading the
1514 * .gitignore content until we absolutely need it in
1515 * last_matching_pattern(). Be careful about ignore rule
1516 * order, though, if you do that.
1519 !oideq(&oid_stat
.oid
, &untracked
->exclude_oid
)) {
1520 invalidate_gitignore(dir
->untracked
, untracked
);
1521 oidcpy(&untracked
->exclude_oid
, &oid_stat
.oid
);
1523 dir
->exclude_stack
= stk
;
1524 current
= stk
->baselen
;
1526 strbuf_setlen(&dir
->basebuf
, baselen
);
1530 * Loads the exclude lists for the directory containing pathname, then
1531 * scans all exclude lists to determine whether pathname is excluded.
1532 * Returns the exclude_list element which matched, or NULL for
1535 struct path_pattern
*last_matching_pattern(struct dir_struct
*dir
,
1536 struct index_state
*istate
,
1537 const char *pathname
,
1540 int pathlen
= strlen(pathname
);
1541 const char *basename
= strrchr(pathname
, '/');
1542 basename
= (basename
) ? basename
+1 : pathname
;
1544 prep_exclude(dir
, istate
, pathname
, basename
-pathname
);
1547 return dir
->pattern
;
1549 return last_matching_pattern_from_lists(dir
, istate
, pathname
, pathlen
,
1554 * Loads the exclude lists for the directory containing pathname, then
1555 * scans all exclude lists to determine whether pathname is excluded.
1556 * Returns 1 if true, otherwise 0.
1558 int is_excluded(struct dir_struct
*dir
, struct index_state
*istate
,
1559 const char *pathname
, int *dtype_p
)
1561 struct path_pattern
*pattern
=
1562 last_matching_pattern(dir
, istate
, pathname
, dtype_p
);
1564 return pattern
->flags
& PATTERN_FLAG_NEGATIVE
? 0 : 1;
1568 static struct dir_entry
*dir_entry_new(const char *pathname
, int len
)
1570 struct dir_entry
*ent
;
1572 FLEX_ALLOC_MEM(ent
, name
, pathname
, len
);
1577 static struct dir_entry
*dir_add_name(struct dir_struct
*dir
,
1578 struct index_state
*istate
,
1579 const char *pathname
, int len
)
1581 if (index_file_exists(istate
, pathname
, len
, ignore_case
))
1584 ALLOC_GROW(dir
->entries
, dir
->nr
+1, dir
->alloc
);
1585 return dir
->entries
[dir
->nr
++] = dir_entry_new(pathname
, len
);
1588 struct dir_entry
*dir_add_ignored(struct dir_struct
*dir
,
1589 struct index_state
*istate
,
1590 const char *pathname
, int len
)
1592 if (!index_name_is_other(istate
, pathname
, len
))
1595 ALLOC_GROW(dir
->ignored
, dir
->ignored_nr
+1, dir
->ignored_alloc
);
1596 return dir
->ignored
[dir
->ignored_nr
++] = dir_entry_new(pathname
, len
);
1600 index_nonexistent
= 0,
1606 * Do not use the alphabetically sorted index to look up
1607 * the directory name; instead, use the case insensitive
1610 static enum exist_status
directory_exists_in_index_icase(struct index_state
*istate
,
1611 const char *dirname
, int len
)
1613 struct cache_entry
*ce
;
1615 if (index_dir_exists(istate
, dirname
, len
))
1616 return index_directory
;
1618 ce
= index_file_exists(istate
, dirname
, len
, ignore_case
);
1619 if (ce
&& S_ISGITLINK(ce
->ce_mode
))
1620 return index_gitdir
;
1622 return index_nonexistent
;
1626 * The index sorts alphabetically by entry name, which
1627 * means that a gitlink sorts as '\0' at the end, while
1628 * a directory (which is defined not as an entry, but as
1629 * the files it contains) will sort with the '/' at the
1632 static enum exist_status
directory_exists_in_index(struct index_state
*istate
,
1633 const char *dirname
, int len
)
1638 return directory_exists_in_index_icase(istate
, dirname
, len
);
1640 pos
= index_name_pos(istate
, dirname
, len
);
1643 while (pos
< istate
->cache_nr
) {
1644 const struct cache_entry
*ce
= istate
->cache
[pos
++];
1645 unsigned char endchar
;
1647 if (strncmp(ce
->name
, dirname
, len
))
1649 endchar
= ce
->name
[len
];
1653 return index_directory
;
1654 if (!endchar
&& S_ISGITLINK(ce
->ce_mode
))
1655 return index_gitdir
;
1657 return index_nonexistent
;
1661 * When we find a directory when traversing the filesystem, we
1662 * have three distinct cases:
1665 * - see it as a directory
1668 * and which one we choose depends on a combination of existing
1669 * git index contents and the flags passed into the directory
1670 * traversal routine.
1672 * Case 1: If we *already* have entries in the index under that
1673 * directory name, we always recurse into the directory to see
1676 * Case 2: If we *already* have that directory name as a gitlink,
1677 * we always continue to see it as a gitlink, regardless of whether
1678 * there is an actual git directory there or not (it might not
1679 * be checked out as a subproject!)
1681 * Case 3: if we didn't have it in the index previously, we
1682 * have a few sub-cases:
1684 * (a) if "show_other_directories" is true, we show it as
1685 * just a directory, unless "hide_empty_directories" is
1686 * also true, in which case we need to check if it contains any
1687 * untracked and / or ignored files.
1688 * (b) if it looks like a git directory, and we don't have
1689 * 'no_gitlinks' set we treat it as a gitlink, and show it
1691 * (c) otherwise, we recurse into it.
1693 static enum path_treatment
treat_directory(struct dir_struct
*dir
,
1694 struct index_state
*istate
,
1695 struct untracked_cache_dir
*untracked
,
1696 const char *dirname
, int len
, int baselen
, int exclude
,
1697 const struct pathspec
*pathspec
)
1699 /* The "len-1" is to strip the final '/' */
1700 switch (directory_exists_in_index(istate
, dirname
, len
-1)) {
1701 case index_directory
:
1702 return path_recurse
;
1707 case index_nonexistent
:
1708 if (dir
->flags
& DIR_SKIP_NESTED_GIT
) {
1710 struct strbuf sb
= STRBUF_INIT
;
1711 strbuf_addstr(&sb
, dirname
);
1712 nested_repo
= is_nonbare_repository_dir(&sb
);
1713 strbuf_release(&sb
);
1718 if (dir
->flags
& DIR_SHOW_OTHER_DIRECTORIES
)
1721 (dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
1722 (dir
->flags
& DIR_SHOW_IGNORED_TOO_MODE_MATCHING
)) {
1725 * This is an excluded directory and we are
1726 * showing ignored paths that match an exclude
1727 * pattern. (e.g. show directory as ignored
1728 * only if it matches an exclude pattern).
1729 * This path will either be 'path_excluded`
1730 * (if we are showing empty directories or if
1731 * the directory is not empty), or will be
1732 * 'path_none' (empty directory, and we are
1733 * not showing empty directories).
1735 if (!(dir
->flags
& DIR_HIDE_EMPTY_DIRECTORIES
))
1736 return path_excluded
;
1738 if (read_directory_recursive(dir
, istate
, dirname
, len
,
1739 untracked
, 1, 1, pathspec
) == path_excluded
)
1740 return path_excluded
;
1744 if (!(dir
->flags
& DIR_NO_GITLINKS
)) {
1745 struct strbuf sb
= STRBUF_INIT
;
1746 strbuf_addstr(&sb
, dirname
);
1747 if (is_nonbare_repository_dir(&sb
))
1748 return exclude
? path_excluded
: path_untracked
;
1749 strbuf_release(&sb
);
1751 return path_recurse
;
1754 /* This is the "show_other_directories" case */
1756 if (!(dir
->flags
& DIR_HIDE_EMPTY_DIRECTORIES
))
1757 return exclude
? path_excluded
: path_untracked
;
1759 untracked
= lookup_untracked(dir
->untracked
, untracked
,
1760 dirname
+ baselen
, len
- baselen
);
1763 * If this is an excluded directory, then we only need to check if
1764 * the directory contains any files.
1766 return read_directory_recursive(dir
, istate
, dirname
, len
,
1767 untracked
, 1, exclude
, pathspec
);
1771 * This is an inexact early pruning of any recursive directory
1772 * reading - if the path cannot possibly be in the pathspec,
1773 * return true, and we'll skip it early.
1775 static int simplify_away(const char *path
, int pathlen
,
1776 const struct pathspec
*pathspec
)
1780 if (!pathspec
|| !pathspec
->nr
)
1783 GUARD_PATHSPEC(pathspec
,
1792 for (i
= 0; i
< pathspec
->nr
; i
++) {
1793 const struct pathspec_item
*item
= &pathspec
->items
[i
];
1794 int len
= item
->nowildcard_len
;
1798 if (!ps_strncmp(item
, item
->match
, path
, len
))
1806 * This function tells us whether an excluded path matches a
1807 * list of "interesting" pathspecs. That is, whether a path matched
1808 * by any of the pathspecs could possibly be ignored by excluding
1809 * the specified path. This can happen if:
1811 * 1. the path is mentioned explicitly in the pathspec
1813 * 2. the path is a directory prefix of some element in the
1816 static int exclude_matches_pathspec(const char *path
, int pathlen
,
1817 const struct pathspec
*pathspec
)
1821 if (!pathspec
|| !pathspec
->nr
)
1824 GUARD_PATHSPEC(pathspec
,
1832 for (i
= 0; i
< pathspec
->nr
; i
++) {
1833 const struct pathspec_item
*item
= &pathspec
->items
[i
];
1834 int len
= item
->nowildcard_len
;
1836 if (len
== pathlen
&&
1837 !ps_strncmp(item
, item
->match
, path
, pathlen
))
1839 if (len
> pathlen
&&
1840 item
->match
[pathlen
] == '/' &&
1841 !ps_strncmp(item
, item
->match
, path
, pathlen
))
1847 static int get_index_dtype(struct index_state
*istate
,
1848 const char *path
, int len
)
1851 const struct cache_entry
*ce
;
1853 ce
= index_file_exists(istate
, path
, len
, 0);
1855 if (!ce_uptodate(ce
))
1857 if (S_ISGITLINK(ce
->ce_mode
))
1860 * Nobody actually cares about the
1861 * difference between DT_LNK and DT_REG
1866 /* Try to look it up as a directory */
1867 pos
= index_name_pos(istate
, path
, len
);
1871 while (pos
< istate
->cache_nr
) {
1872 ce
= istate
->cache
[pos
++];
1873 if (strncmp(ce
->name
, path
, len
))
1875 if (ce
->name
[len
] > '/')
1877 if (ce
->name
[len
] < '/')
1879 if (!ce_uptodate(ce
))
1880 break; /* continue? */
1886 static int get_dtype(struct dirent
*de
, struct index_state
*istate
,
1887 const char *path
, int len
)
1889 int dtype
= de
? DTYPE(de
) : DT_UNKNOWN
;
1892 if (dtype
!= DT_UNKNOWN
)
1894 dtype
= get_index_dtype(istate
, path
, len
);
1895 if (dtype
!= DT_UNKNOWN
)
1897 if (lstat(path
, &st
))
1899 if (S_ISREG(st
.st_mode
))
1901 if (S_ISDIR(st
.st_mode
))
1903 if (S_ISLNK(st
.st_mode
))
1908 static enum path_treatment
treat_one_path(struct dir_struct
*dir
,
1909 struct untracked_cache_dir
*untracked
,
1910 struct index_state
*istate
,
1911 struct strbuf
*path
,
1913 const struct pathspec
*pathspec
,
1914 int dtype
, struct dirent
*de
)
1917 int has_path_in_index
= !!index_file_exists(istate
, path
->buf
, path
->len
, ignore_case
);
1918 enum path_treatment path_treatment
;
1920 if (dtype
== DT_UNKNOWN
)
1921 dtype
= get_dtype(de
, istate
, path
->buf
, path
->len
);
1923 /* Always exclude indexed files */
1924 if (dtype
!= DT_DIR
&& has_path_in_index
)
1928 * When we are looking at a directory P in the working tree,
1929 * there are three cases:
1931 * (1) P exists in the index. Everything inside the directory P in
1932 * the working tree needs to go when P is checked out from the
1935 * (2) P does not exist in the index, but there is P/Q in the index.
1936 * We know P will stay a directory when we check out the contents
1937 * of the index, but we do not know yet if there is a directory
1938 * P/Q in the working tree to be killed, so we need to recurse.
1940 * (3) P does not exist in the index, and there is no P/Q in the index
1941 * to require P to be a directory, either. Only in this case, we
1942 * know that everything inside P will not be killed without
1945 if ((dir
->flags
& DIR_COLLECT_KILLED_ONLY
) &&
1946 (dtype
== DT_DIR
) &&
1947 !has_path_in_index
&&
1948 (directory_exists_in_index(istate
, path
->buf
, path
->len
) == index_nonexistent
))
1951 exclude
= is_excluded(dir
, istate
, path
->buf
, &dtype
);
1954 * Excluded? If we don't explicitly want to show
1955 * ignored files, ignore it
1957 if (exclude
&& !(dir
->flags
& (DIR_SHOW_IGNORED
|DIR_SHOW_IGNORED_TOO
)))
1958 return path_excluded
;
1964 strbuf_addch(path
, '/');
1965 path_treatment
= treat_directory(dir
, istate
, untracked
,
1966 path
->buf
, path
->len
,
1967 baselen
, exclude
, pathspec
);
1969 * If 1) we only want to return directories that
1970 * match an exclude pattern and 2) this directory does
1971 * not match an exclude pattern but all of its
1972 * contents are excluded, then indicate that we should
1973 * recurse into this directory (instead of marking the
1974 * directory itself as an ignored path).
1977 path_treatment
== path_excluded
&&
1978 (dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
1979 (dir
->flags
& DIR_SHOW_IGNORED_TOO_MODE_MATCHING
))
1980 return path_recurse
;
1981 return path_treatment
;
1984 return exclude
? path_excluded
: path_untracked
;
1988 static enum path_treatment
treat_path_fast(struct dir_struct
*dir
,
1989 struct untracked_cache_dir
*untracked
,
1990 struct cached_dir
*cdir
,
1991 struct index_state
*istate
,
1992 struct strbuf
*path
,
1994 const struct pathspec
*pathspec
)
1996 strbuf_setlen(path
, baselen
);
1998 strbuf_addstr(path
, cdir
->file
);
1999 return path_untracked
;
2001 strbuf_addstr(path
, cdir
->ucd
->name
);
2002 /* treat_one_path() does this before it calls treat_directory() */
2003 strbuf_complete(path
, '/');
2004 if (cdir
->ucd
->check_only
)
2006 * check_only is set as a result of treat_directory() getting
2007 * to its bottom. Verify again the same set of directories
2008 * with check_only set.
2010 return read_directory_recursive(dir
, istate
, path
->buf
, path
->len
,
2011 cdir
->ucd
, 1, 0, pathspec
);
2013 * We get path_recurse in the first run when
2014 * directory_exists_in_index() returns index_nonexistent. We
2015 * are sure that new changes in the index does not impact the
2016 * outcome. Return now.
2018 return path_recurse
;
2021 static enum path_treatment
treat_path(struct dir_struct
*dir
,
2022 struct untracked_cache_dir
*untracked
,
2023 struct cached_dir
*cdir
,
2024 struct index_state
*istate
,
2025 struct strbuf
*path
,
2027 const struct pathspec
*pathspec
)
2030 struct dirent
*de
= cdir
->de
;
2033 return treat_path_fast(dir
, untracked
, cdir
, istate
, path
,
2035 if (is_dot_or_dotdot(de
->d_name
) || !fspathcmp(de
->d_name
, ".git"))
2037 strbuf_setlen(path
, baselen
);
2038 strbuf_addstr(path
, de
->d_name
);
2039 if (simplify_away(path
->buf
, path
->len
, pathspec
))
2043 return treat_one_path(dir
, untracked
, istate
, path
, baselen
, pathspec
, dtype
, de
);
2046 static void add_untracked(struct untracked_cache_dir
*dir
, const char *name
)
2050 ALLOC_GROW(dir
->untracked
, dir
->untracked_nr
+ 1,
2051 dir
->untracked_alloc
);
2052 dir
->untracked
[dir
->untracked_nr
++] = xstrdup(name
);
2055 static int valid_cached_dir(struct dir_struct
*dir
,
2056 struct untracked_cache_dir
*untracked
,
2057 struct index_state
*istate
,
2058 struct strbuf
*path
,
2067 * With fsmonitor, we can trust the untracked cache's valid field.
2069 refresh_fsmonitor(istate
);
2070 if (!(dir
->untracked
->use_fsmonitor
&& untracked
->valid
)) {
2071 if (lstat(path
->len
? path
->buf
: ".", &st
)) {
2072 memset(&untracked
->stat_data
, 0, sizeof(untracked
->stat_data
));
2075 if (!untracked
->valid
||
2076 match_stat_data_racy(istate
, &untracked
->stat_data
, &st
)) {
2077 fill_stat_data(&untracked
->stat_data
, &st
);
2082 if (untracked
->check_only
!= !!check_only
)
2086 * prep_exclude will be called eventually on this directory,
2087 * but it's called much later in last_matching_pattern(). We
2088 * need it now to determine the validity of the cache for this
2089 * path. The next calls will be nearly no-op, the way
2090 * prep_exclude() is designed.
2092 if (path
->len
&& path
->buf
[path
->len
- 1] != '/') {
2093 strbuf_addch(path
, '/');
2094 prep_exclude(dir
, istate
, path
->buf
, path
->len
);
2095 strbuf_setlen(path
, path
->len
- 1);
2097 prep_exclude(dir
, istate
, path
->buf
, path
->len
);
2099 /* hopefully prep_exclude() haven't invalidated this entry... */
2100 return untracked
->valid
;
2103 static int open_cached_dir(struct cached_dir
*cdir
,
2104 struct dir_struct
*dir
,
2105 struct untracked_cache_dir
*untracked
,
2106 struct index_state
*istate
,
2107 struct strbuf
*path
,
2112 memset(cdir
, 0, sizeof(*cdir
));
2113 cdir
->untracked
= untracked
;
2114 if (valid_cached_dir(dir
, untracked
, istate
, path
, check_only
))
2116 c_path
= path
->len
? path
->buf
: ".";
2117 cdir
->fdir
= opendir(c_path
);
2119 warning_errno(_("could not open directory '%s'"), c_path
);
2120 if (dir
->untracked
) {
2121 invalidate_directory(dir
->untracked
, untracked
);
2122 dir
->untracked
->dir_opened
++;
2129 static int read_cached_dir(struct cached_dir
*cdir
)
2132 cdir
->de
= readdir(cdir
->fdir
);
2137 while (cdir
->nr_dirs
< cdir
->untracked
->dirs_nr
) {
2138 struct untracked_cache_dir
*d
= cdir
->untracked
->dirs
[cdir
->nr_dirs
];
2148 if (cdir
->nr_files
< cdir
->untracked
->untracked_nr
) {
2149 struct untracked_cache_dir
*d
= cdir
->untracked
;
2150 cdir
->file
= d
->untracked
[cdir
->nr_files
++];
2156 static void close_cached_dir(struct cached_dir
*cdir
)
2159 closedir(cdir
->fdir
);
2161 * We have gone through this directory and found no untracked
2162 * entries. Mark it valid.
2164 if (cdir
->untracked
) {
2165 cdir
->untracked
->valid
= 1;
2166 cdir
->untracked
->recurse
= 1;
2171 * Read a directory tree. We currently ignore anything but
2172 * directories, regular files and symlinks. That's because git
2173 * doesn't handle them at all yet. Maybe that will change some
2176 * Also, we ignore the name ".git" (even if it is not a directory).
2177 * That likely will not change.
2179 * If 'stop_at_first_file' is specified, 'path_excluded' is returned
2180 * to signal that a file was found. This is the least significant value that
2181 * indicates that a file was encountered that does not depend on the order of
2182 * whether an untracked or exluded path was encountered first.
2184 * Returns the most significant path_treatment value encountered in the scan.
2185 * If 'stop_at_first_file' is specified, `path_excluded` is the most
2186 * significant path_treatment value that will be returned.
2189 static enum path_treatment
read_directory_recursive(struct dir_struct
*dir
,
2190 struct index_state
*istate
, const char *base
, int baselen
,
2191 struct untracked_cache_dir
*untracked
, int check_only
,
2192 int stop_at_first_file
, const struct pathspec
*pathspec
)
2194 struct cached_dir cdir
;
2195 enum path_treatment state
, subdir_state
, dir_state
= path_none
;
2196 struct strbuf path
= STRBUF_INIT
;
2198 strbuf_add(&path
, base
, baselen
);
2200 if (open_cached_dir(&cdir
, dir
, untracked
, istate
, &path
, check_only
))
2204 untracked
->check_only
= !!check_only
;
2206 while (!read_cached_dir(&cdir
)) {
2207 /* check how the file or directory should be treated */
2208 state
= treat_path(dir
, untracked
, &cdir
, istate
, &path
,
2211 if (state
> dir_state
)
2214 /* recurse into subdir if instructed by treat_path */
2215 if ((state
== path_recurse
) ||
2216 ((state
== path_untracked
) &&
2217 (get_dtype(cdir
.de
, istate
, path
.buf
, path
.len
) == DT_DIR
) &&
2218 ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) ||
2220 do_match_pathspec(istate
, pathspec
, path
.buf
, path
.len
,
2221 baselen
, NULL
, DO_MATCH_LEADING_PATHSPEC
) == MATCHED_RECURSIVELY_LEADING_PATHSPEC
)))) {
2222 struct untracked_cache_dir
*ud
;
2223 ud
= lookup_untracked(dir
->untracked
, untracked
,
2225 path
.len
- baselen
);
2227 read_directory_recursive(dir
, istate
, path
.buf
,
2229 check_only
, stop_at_first_file
, pathspec
);
2230 if (subdir_state
> dir_state
)
2231 dir_state
= subdir_state
;
2234 !match_pathspec(istate
, pathspec
, path
.buf
, path
.len
,
2235 0 /* prefix */, NULL
,
2236 0 /* do NOT special case dirs */))
2241 if (stop_at_first_file
) {
2243 * If stopping at first file, then
2244 * signal that a file was found by
2245 * returning `path_excluded`. This is
2246 * to return a consistent value
2247 * regardless of whether an ignored or
2248 * excluded file happened to be
2251 * In current usage, the
2252 * `stop_at_first_file` is passed when
2253 * an ancestor directory has matched
2254 * an exclude pattern, so any found
2255 * files will be excluded.
2257 if (dir_state
>= path_excluded
) {
2258 dir_state
= path_excluded
;
2263 /* abort early if maximum state has been reached */
2264 if (dir_state
== path_untracked
) {
2266 add_untracked(untracked
, path
.buf
+ baselen
);
2269 /* skip the dir_add_* part */
2273 /* add the path to the appropriate result list */
2276 if (dir
->flags
& DIR_SHOW_IGNORED
)
2277 dir_add_name(dir
, istate
, path
.buf
, path
.len
);
2278 else if ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) ||
2279 ((dir
->flags
& DIR_COLLECT_IGNORED
) &&
2280 exclude_matches_pathspec(path
.buf
, path
.len
,
2282 dir_add_ignored(dir
, istate
, path
.buf
, path
.len
);
2285 case path_untracked
:
2286 if (dir
->flags
& DIR_SHOW_IGNORED
)
2288 dir_add_name(dir
, istate
, path
.buf
, path
.len
);
2290 add_untracked(untracked
, path
.buf
+ baselen
);
2297 close_cached_dir(&cdir
);
2299 strbuf_release(&path
);
2304 int cmp_dir_entry(const void *p1
, const void *p2
)
2306 const struct dir_entry
*e1
= *(const struct dir_entry
**)p1
;
2307 const struct dir_entry
*e2
= *(const struct dir_entry
**)p2
;
2309 return name_compare(e1
->name
, e1
->len
, e2
->name
, e2
->len
);
2312 /* check if *out lexically strictly contains *in */
2313 int check_dir_entry_contains(const struct dir_entry
*out
, const struct dir_entry
*in
)
2315 return (out
->len
< in
->len
) &&
2316 (out
->name
[out
->len
- 1] == '/') &&
2317 !memcmp(out
->name
, in
->name
, out
->len
);
2320 static int treat_leading_path(struct dir_struct
*dir
,
2321 struct index_state
*istate
,
2322 const char *path
, int len
,
2323 const struct pathspec
*pathspec
)
2325 struct strbuf sb
= STRBUF_INIT
;
2326 int baselen
, rc
= 0;
2328 int old_flags
= dir
->flags
;
2330 while (len
&& path
[len
- 1] == '/')
2335 dir
->flags
&= ~DIR_SHOW_OTHER_DIRECTORIES
;
2337 cp
= path
+ baselen
+ !!baselen
;
2338 cp
= memchr(cp
, '/', path
+ len
- cp
);
2342 baselen
= cp
- path
;
2343 strbuf_setlen(&sb
, 0);
2344 strbuf_add(&sb
, path
, baselen
);
2345 if (!is_directory(sb
.buf
))
2347 if (simplify_away(sb
.buf
, sb
.len
, pathspec
))
2349 if (treat_one_path(dir
, NULL
, istate
, &sb
, baselen
, pathspec
,
2350 DT_DIR
, NULL
) == path_none
)
2351 break; /* do not recurse into it */
2352 if (len
<= baselen
) {
2354 break; /* finished checking */
2357 strbuf_release(&sb
);
2358 dir
->flags
= old_flags
;
2362 static const char *get_ident_string(void)
2364 static struct strbuf sb
= STRBUF_INIT
;
2369 if (uname(&uts
) < 0)
2370 die_errno(_("failed to get kernel name and information"));
2371 strbuf_addf(&sb
, "Location %s, system %s", get_git_work_tree(),
2376 static int ident_in_untracked(const struct untracked_cache
*uc
)
2379 * Previous git versions may have saved many NUL separated
2380 * strings in the "ident" field, but it is insane to manage
2381 * many locations, so just take care of the first one.
2384 return !strcmp(uc
->ident
.buf
, get_ident_string());
2387 static void set_untracked_ident(struct untracked_cache
*uc
)
2389 strbuf_reset(&uc
->ident
);
2390 strbuf_addstr(&uc
->ident
, get_ident_string());
2393 * This strbuf used to contain a list of NUL separated
2394 * strings, so save NUL too for backward compatibility.
2396 strbuf_addch(&uc
->ident
, 0);
2399 static void new_untracked_cache(struct index_state
*istate
)
2401 struct untracked_cache
*uc
= xcalloc(1, sizeof(*uc
));
2402 strbuf_init(&uc
->ident
, 100);
2403 uc
->exclude_per_dir
= ".gitignore";
2404 /* should be the same flags used by git-status */
2405 uc
->dir_flags
= DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
2406 set_untracked_ident(uc
);
2407 istate
->untracked
= uc
;
2408 istate
->cache_changed
|= UNTRACKED_CHANGED
;
2411 void add_untracked_cache(struct index_state
*istate
)
2413 if (!istate
->untracked
) {
2414 new_untracked_cache(istate
);
2416 if (!ident_in_untracked(istate
->untracked
)) {
2417 free_untracked_cache(istate
->untracked
);
2418 new_untracked_cache(istate
);
2423 void remove_untracked_cache(struct index_state
*istate
)
2425 if (istate
->untracked
) {
2426 free_untracked_cache(istate
->untracked
);
2427 istate
->untracked
= NULL
;
2428 istate
->cache_changed
|= UNTRACKED_CHANGED
;
2432 static struct untracked_cache_dir
*validate_untracked_cache(struct dir_struct
*dir
,
2434 const struct pathspec
*pathspec
)
2436 struct untracked_cache_dir
*root
;
2437 static int untracked_cache_disabled
= -1;
2439 if (!dir
->untracked
)
2441 if (untracked_cache_disabled
< 0)
2442 untracked_cache_disabled
= git_env_bool("GIT_DISABLE_UNTRACKED_CACHE", 0);
2443 if (untracked_cache_disabled
)
2447 * We only support $GIT_DIR/info/exclude and core.excludesfile
2448 * as the global ignore rule files. Any other additions
2449 * (e.g. from command line) invalidate the cache. This
2450 * condition also catches running setup_standard_excludes()
2451 * before setting dir->untracked!
2453 if (dir
->unmanaged_exclude_files
)
2457 * Optimize for the main use case only: whole-tree git
2458 * status. More work involved in treat_leading_path() if we
2459 * use cache on just a subset of the worktree. pathspec
2460 * support could make the matter even worse.
2462 if (base_len
|| (pathspec
&& pathspec
->nr
))
2465 /* Different set of flags may produce different results */
2466 if (dir
->flags
!= dir
->untracked
->dir_flags
||
2468 * See treat_directory(), case index_nonexistent. Without
2469 * this flag, we may need to also cache .git file content
2470 * for the resolve_gitlink_ref() call, which we don't.
2472 !(dir
->flags
& DIR_SHOW_OTHER_DIRECTORIES
) ||
2473 /* We don't support collecting ignore files */
2474 (dir
->flags
& (DIR_SHOW_IGNORED
| DIR_SHOW_IGNORED_TOO
|
2475 DIR_COLLECT_IGNORED
)))
2479 * If we use .gitignore in the cache and now you change it to
2480 * .gitexclude, everything will go wrong.
2482 if (dir
->exclude_per_dir
!= dir
->untracked
->exclude_per_dir
&&
2483 strcmp(dir
->exclude_per_dir
, dir
->untracked
->exclude_per_dir
))
2487 * EXC_CMDL is not considered in the cache. If people set it,
2490 if (dir
->exclude_list_group
[EXC_CMDL
].nr
)
2493 if (!ident_in_untracked(dir
->untracked
)) {
2494 warning(_("untracked cache is disabled on this system or location"));
2498 if (!dir
->untracked
->root
) {
2499 const int len
= sizeof(*dir
->untracked
->root
);
2500 dir
->untracked
->root
= xmalloc(len
);
2501 memset(dir
->untracked
->root
, 0, len
);
2504 /* Validate $GIT_DIR/info/exclude and core.excludesfile */
2505 root
= dir
->untracked
->root
;
2506 if (!oideq(&dir
->ss_info_exclude
.oid
,
2507 &dir
->untracked
->ss_info_exclude
.oid
)) {
2508 invalidate_gitignore(dir
->untracked
, root
);
2509 dir
->untracked
->ss_info_exclude
= dir
->ss_info_exclude
;
2511 if (!oideq(&dir
->ss_excludes_file
.oid
,
2512 &dir
->untracked
->ss_excludes_file
.oid
)) {
2513 invalidate_gitignore(dir
->untracked
, root
);
2514 dir
->untracked
->ss_excludes_file
= dir
->ss_excludes_file
;
2517 /* Make sure this directory is not dropped out at saving phase */
2522 int read_directory(struct dir_struct
*dir
, struct index_state
*istate
,
2523 const char *path
, int len
, const struct pathspec
*pathspec
)
2525 struct untracked_cache_dir
*untracked
;
2527 trace_performance_enter();
2529 if (has_symlink_leading_path(path
, len
)) {
2530 trace_performance_leave("read directory %.*s", len
, path
);
2534 untracked
= validate_untracked_cache(dir
, len
, pathspec
);
2537 * make sure untracked cache code path is disabled,
2538 * e.g. prep_exclude()
2540 dir
->untracked
= NULL
;
2541 if (!len
|| treat_leading_path(dir
, istate
, path
, len
, pathspec
))
2542 read_directory_recursive(dir
, istate
, path
, len
, untracked
, 0, 0, pathspec
);
2543 QSORT(dir
->entries
, dir
->nr
, cmp_dir_entry
);
2544 QSORT(dir
->ignored
, dir
->ignored_nr
, cmp_dir_entry
);
2547 * If DIR_SHOW_IGNORED_TOO is set, read_directory_recursive() will
2548 * also pick up untracked contents of untracked dirs; by default
2549 * we discard these, but given DIR_KEEP_UNTRACKED_CONTENTS we do not.
2551 if ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
2552 !(dir
->flags
& DIR_KEEP_UNTRACKED_CONTENTS
)) {
2555 /* remove from dir->entries untracked contents of untracked dirs */
2556 for (i
= j
= 0; j
< dir
->nr
; j
++) {
2558 check_dir_entry_contains(dir
->entries
[i
- 1], dir
->entries
[j
])) {
2559 FREE_AND_NULL(dir
->entries
[j
]);
2561 dir
->entries
[i
++] = dir
->entries
[j
];
2568 trace_performance_leave("read directory %.*s", len
, path
);
2569 if (dir
->untracked
) {
2570 static int force_untracked_cache
= -1;
2571 static struct trace_key trace_untracked_stats
= TRACE_KEY_INIT(UNTRACKED_STATS
);
2573 if (force_untracked_cache
< 0)
2574 force_untracked_cache
=
2575 git_env_bool("GIT_FORCE_UNTRACKED_CACHE", 0);
2576 trace_printf_key(&trace_untracked_stats
,
2577 "node creation: %u\n"
2578 "gitignore invalidation: %u\n"
2579 "directory invalidation: %u\n"
2581 dir
->untracked
->dir_created
,
2582 dir
->untracked
->gitignore_invalidated
,
2583 dir
->untracked
->dir_invalidated
,
2584 dir
->untracked
->dir_opened
);
2585 if (force_untracked_cache
&&
2586 dir
->untracked
== istate
->untracked
&&
2587 (dir
->untracked
->dir_opened
||
2588 dir
->untracked
->gitignore_invalidated
||
2589 dir
->untracked
->dir_invalidated
))
2590 istate
->cache_changed
|= UNTRACKED_CHANGED
;
2591 if (dir
->untracked
!= istate
->untracked
) {
2592 FREE_AND_NULL(dir
->untracked
);
2598 int file_exists(const char *f
)
2601 return lstat(f
, &sb
) == 0;
2604 int repo_file_exists(struct repository
*repo
, const char *path
)
2606 if (repo
!= the_repository
)
2607 BUG("do not know how to check file existence in arbitrary repo");
2609 return file_exists(path
);
2612 static int cmp_icase(char a
, char b
)
2617 return toupper(a
) - toupper(b
);
2622 * Given two normalized paths (a trailing slash is ok), if subdir is
2623 * outside dir, return -1. Otherwise return the offset in subdir that
2624 * can be used as relative path to dir.
2626 int dir_inside_of(const char *subdir
, const char *dir
)
2630 assert(dir
&& subdir
&& *dir
&& *subdir
);
2632 while (*dir
&& *subdir
&& !cmp_icase(*dir
, *subdir
)) {
2638 /* hel[p]/me vs hel[l]/yeah */
2639 if (*dir
&& *subdir
)
2643 return !*dir
? offset
: -1; /* same dir */
2645 /* foo/[b]ar vs foo/[] */
2646 if (is_dir_sep(dir
[-1]))
2647 return is_dir_sep(subdir
[-1]) ? offset
: -1;
2649 /* foo[/]bar vs foo[] */
2650 return is_dir_sep(*subdir
) ? offset
+ 1 : -1;
2653 int is_inside_dir(const char *dir
)
2662 rc
= (dir_inside_of(cwd
, dir
) >= 0);
2667 int is_empty_dir(const char *path
)
2669 DIR *dir
= opendir(path
);
2676 while ((e
= readdir(dir
)) != NULL
)
2677 if (!is_dot_or_dotdot(e
->d_name
)) {
2686 static int remove_dir_recurse(struct strbuf
*path
, int flag
, int *kept_up
)
2690 int ret
= 0, original_len
= path
->len
, len
, kept_down
= 0;
2691 int only_empty
= (flag
& REMOVE_DIR_EMPTY_ONLY
);
2692 int keep_toplevel
= (flag
& REMOVE_DIR_KEEP_TOPLEVEL
);
2693 struct object_id submodule_head
;
2695 if ((flag
& REMOVE_DIR_KEEP_NESTED_GIT
) &&
2696 !resolve_gitlink_ref(path
->buf
, "HEAD", &submodule_head
)) {
2697 /* Do not descend and nuke a nested git work tree. */
2703 flag
&= ~REMOVE_DIR_KEEP_TOPLEVEL
;
2704 dir
= opendir(path
->buf
);
2706 if (errno
== ENOENT
)
2707 return keep_toplevel
? -1 : 0;
2708 else if (errno
== EACCES
&& !keep_toplevel
)
2710 * An empty dir could be removable even if it
2713 return rmdir(path
->buf
);
2717 strbuf_complete(path
, '/');
2720 while ((e
= readdir(dir
)) != NULL
) {
2722 if (is_dot_or_dotdot(e
->d_name
))
2725 strbuf_setlen(path
, len
);
2726 strbuf_addstr(path
, e
->d_name
);
2727 if (lstat(path
->buf
, &st
)) {
2728 if (errno
== ENOENT
)
2730 * file disappeared, which is what we
2735 } else if (S_ISDIR(st
.st_mode
)) {
2736 if (!remove_dir_recurse(path
, flag
, &kept_down
))
2737 continue; /* happy */
2738 } else if (!only_empty
&&
2739 (!unlink(path
->buf
) || errno
== ENOENT
)) {
2740 continue; /* happy, too */
2743 /* path too long, stat fails, or non-directory still exists */
2749 strbuf_setlen(path
, original_len
);
2750 if (!ret
&& !keep_toplevel
&& !kept_down
)
2751 ret
= (!rmdir(path
->buf
) || errno
== ENOENT
) ? 0 : -1;
2754 * report the uplevel that it is not an error that we
2755 * did not rmdir() our directory.
2761 int remove_dir_recursively(struct strbuf
*path
, int flag
)
2763 return remove_dir_recurse(path
, flag
, NULL
);
2766 static GIT_PATH_FUNC(git_path_info_exclude
, "info/exclude")
2768 void setup_standard_excludes(struct dir_struct
*dir
)
2770 dir
->exclude_per_dir
= ".gitignore";
2772 /* core.excludesfile defaulting to $XDG_CONFIG_HOME/git/ignore */
2774 excludes_file
= xdg_config_home("ignore");
2775 if (excludes_file
&& !access_or_warn(excludes_file
, R_OK
, 0))
2776 add_patterns_from_file_1(dir
, excludes_file
,
2777 dir
->untracked
? &dir
->ss_excludes_file
: NULL
);
2779 /* per repository user preference */
2780 if (startup_info
->have_repository
) {
2781 const char *path
= git_path_info_exclude();
2782 if (!access_or_warn(path
, R_OK
, 0))
2783 add_patterns_from_file_1(dir
, path
,
2784 dir
->untracked
? &dir
->ss_info_exclude
: NULL
);
2788 int remove_path(const char *name
)
2792 if (unlink(name
) && !is_missing_file_error(errno
))
2795 slash
= strrchr(name
, '/');
2797 char *dirs
= xstrdup(name
);
2798 slash
= dirs
+ (slash
- name
);
2801 } while (rmdir(dirs
) == 0 && (slash
= strrchr(dirs
, '/')));
2808 * Frees memory within dir which was allocated for exclude lists and
2809 * the exclude_stack. Does not free dir itself.
2811 void clear_directory(struct dir_struct
*dir
)
2814 struct exclude_list_group
*group
;
2815 struct pattern_list
*pl
;
2816 struct exclude_stack
*stk
;
2818 for (i
= EXC_CMDL
; i
<= EXC_FILE
; i
++) {
2819 group
= &dir
->exclude_list_group
[i
];
2820 for (j
= 0; j
< group
->nr
; j
++) {
2823 free((char *)pl
->src
);
2824 clear_pattern_list(pl
);
2829 stk
= dir
->exclude_stack
;
2831 struct exclude_stack
*prev
= stk
->prev
;
2835 strbuf_release(&dir
->basebuf
);
2838 struct ondisk_untracked_cache
{
2839 struct stat_data info_exclude_stat
;
2840 struct stat_data excludes_file_stat
;
2844 #define ouc_offset(x) offsetof(struct ondisk_untracked_cache, x)
2847 int index
; /* number of written untracked_cache_dir */
2848 struct ewah_bitmap
*check_only
; /* from untracked_cache_dir */
2849 struct ewah_bitmap
*valid
; /* from untracked_cache_dir */
2850 struct ewah_bitmap
*sha1_valid
; /* set if exclude_sha1 is not null */
2852 struct strbuf sb_stat
;
2853 struct strbuf sb_sha1
;
2856 static void stat_data_to_disk(struct stat_data
*to
, const struct stat_data
*from
)
2858 to
->sd_ctime
.sec
= htonl(from
->sd_ctime
.sec
);
2859 to
->sd_ctime
.nsec
= htonl(from
->sd_ctime
.nsec
);
2860 to
->sd_mtime
.sec
= htonl(from
->sd_mtime
.sec
);
2861 to
->sd_mtime
.nsec
= htonl(from
->sd_mtime
.nsec
);
2862 to
->sd_dev
= htonl(from
->sd_dev
);
2863 to
->sd_ino
= htonl(from
->sd_ino
);
2864 to
->sd_uid
= htonl(from
->sd_uid
);
2865 to
->sd_gid
= htonl(from
->sd_gid
);
2866 to
->sd_size
= htonl(from
->sd_size
);
2869 static void write_one_dir(struct untracked_cache_dir
*untracked
,
2870 struct write_data
*wd
)
2872 struct stat_data stat_data
;
2873 struct strbuf
*out
= &wd
->out
;
2874 unsigned char intbuf
[16];
2875 unsigned int intlen
, value
;
2876 int i
= wd
->index
++;
2879 * untracked_nr should be reset whenever valid is clear, but
2882 if (!untracked
->valid
) {
2883 untracked
->untracked_nr
= 0;
2884 untracked
->check_only
= 0;
2887 if (untracked
->check_only
)
2888 ewah_set(wd
->check_only
, i
);
2889 if (untracked
->valid
) {
2890 ewah_set(wd
->valid
, i
);
2891 stat_data_to_disk(&stat_data
, &untracked
->stat_data
);
2892 strbuf_add(&wd
->sb_stat
, &stat_data
, sizeof(stat_data
));
2894 if (!is_null_oid(&untracked
->exclude_oid
)) {
2895 ewah_set(wd
->sha1_valid
, i
);
2896 strbuf_add(&wd
->sb_sha1
, untracked
->exclude_oid
.hash
,
2897 the_hash_algo
->rawsz
);
2900 intlen
= encode_varint(untracked
->untracked_nr
, intbuf
);
2901 strbuf_add(out
, intbuf
, intlen
);
2903 /* skip non-recurse directories */
2904 for (i
= 0, value
= 0; i
< untracked
->dirs_nr
; i
++)
2905 if (untracked
->dirs
[i
]->recurse
)
2907 intlen
= encode_varint(value
, intbuf
);
2908 strbuf_add(out
, intbuf
, intlen
);
2910 strbuf_add(out
, untracked
->name
, strlen(untracked
->name
) + 1);
2912 for (i
= 0; i
< untracked
->untracked_nr
; i
++)
2913 strbuf_add(out
, untracked
->untracked
[i
],
2914 strlen(untracked
->untracked
[i
]) + 1);
2916 for (i
= 0; i
< untracked
->dirs_nr
; i
++)
2917 if (untracked
->dirs
[i
]->recurse
)
2918 write_one_dir(untracked
->dirs
[i
], wd
);
2921 void write_untracked_extension(struct strbuf
*out
, struct untracked_cache
*untracked
)
2923 struct ondisk_untracked_cache
*ouc
;
2924 struct write_data wd
;
2925 unsigned char varbuf
[16];
2927 const unsigned hashsz
= the_hash_algo
->rawsz
;
2929 ouc
= xcalloc(1, sizeof(*ouc
));
2930 stat_data_to_disk(&ouc
->info_exclude_stat
, &untracked
->ss_info_exclude
.stat
);
2931 stat_data_to_disk(&ouc
->excludes_file_stat
, &untracked
->ss_excludes_file
.stat
);
2932 ouc
->dir_flags
= htonl(untracked
->dir_flags
);
2934 varint_len
= encode_varint(untracked
->ident
.len
, varbuf
);
2935 strbuf_add(out
, varbuf
, varint_len
);
2936 strbuf_addbuf(out
, &untracked
->ident
);
2938 strbuf_add(out
, ouc
, sizeof(*ouc
));
2939 strbuf_add(out
, untracked
->ss_info_exclude
.oid
.hash
, hashsz
);
2940 strbuf_add(out
, untracked
->ss_excludes_file
.oid
.hash
, hashsz
);
2941 strbuf_add(out
, untracked
->exclude_per_dir
, strlen(untracked
->exclude_per_dir
) + 1);
2944 if (!untracked
->root
) {
2945 varint_len
= encode_varint(0, varbuf
);
2946 strbuf_add(out
, varbuf
, varint_len
);
2951 wd
.check_only
= ewah_new();
2952 wd
.valid
= ewah_new();
2953 wd
.sha1_valid
= ewah_new();
2954 strbuf_init(&wd
.out
, 1024);
2955 strbuf_init(&wd
.sb_stat
, 1024);
2956 strbuf_init(&wd
.sb_sha1
, 1024);
2957 write_one_dir(untracked
->root
, &wd
);
2959 varint_len
= encode_varint(wd
.index
, varbuf
);
2960 strbuf_add(out
, varbuf
, varint_len
);
2961 strbuf_addbuf(out
, &wd
.out
);
2962 ewah_serialize_strbuf(wd
.valid
, out
);
2963 ewah_serialize_strbuf(wd
.check_only
, out
);
2964 ewah_serialize_strbuf(wd
.sha1_valid
, out
);
2965 strbuf_addbuf(out
, &wd
.sb_stat
);
2966 strbuf_addbuf(out
, &wd
.sb_sha1
);
2967 strbuf_addch(out
, '\0'); /* safe guard for string lists */
2969 ewah_free(wd
.valid
);
2970 ewah_free(wd
.check_only
);
2971 ewah_free(wd
.sha1_valid
);
2972 strbuf_release(&wd
.out
);
2973 strbuf_release(&wd
.sb_stat
);
2974 strbuf_release(&wd
.sb_sha1
);
2977 static void free_untracked(struct untracked_cache_dir
*ucd
)
2982 for (i
= 0; i
< ucd
->dirs_nr
; i
++)
2983 free_untracked(ucd
->dirs
[i
]);
2984 for (i
= 0; i
< ucd
->untracked_nr
; i
++)
2985 free(ucd
->untracked
[i
]);
2986 free(ucd
->untracked
);
2991 void free_untracked_cache(struct untracked_cache
*uc
)
2994 free_untracked(uc
->root
);
3000 struct untracked_cache_dir
**ucd
;
3001 struct ewah_bitmap
*check_only
;
3002 struct ewah_bitmap
*valid
;
3003 struct ewah_bitmap
*sha1_valid
;
3004 const unsigned char *data
;
3005 const unsigned char *end
;
3008 static void stat_data_from_disk(struct stat_data
*to
, const unsigned char *data
)
3010 memcpy(to
, data
, sizeof(*to
));
3011 to
->sd_ctime
.sec
= ntohl(to
->sd_ctime
.sec
);
3012 to
->sd_ctime
.nsec
= ntohl(to
->sd_ctime
.nsec
);
3013 to
->sd_mtime
.sec
= ntohl(to
->sd_mtime
.sec
);
3014 to
->sd_mtime
.nsec
= ntohl(to
->sd_mtime
.nsec
);
3015 to
->sd_dev
= ntohl(to
->sd_dev
);
3016 to
->sd_ino
= ntohl(to
->sd_ino
);
3017 to
->sd_uid
= ntohl(to
->sd_uid
);
3018 to
->sd_gid
= ntohl(to
->sd_gid
);
3019 to
->sd_size
= ntohl(to
->sd_size
);
3022 static int read_one_dir(struct untracked_cache_dir
**untracked_
,
3023 struct read_data
*rd
)
3025 struct untracked_cache_dir ud
, *untracked
;
3026 const unsigned char *data
= rd
->data
, *end
= rd
->end
;
3027 const unsigned char *eos
;
3031 memset(&ud
, 0, sizeof(ud
));
3033 value
= decode_varint(&data
);
3037 ud
.untracked_alloc
= value
;
3038 ud
.untracked_nr
= value
;
3039 if (ud
.untracked_nr
)
3040 ALLOC_ARRAY(ud
.untracked
, ud
.untracked_nr
);
3042 ud
.dirs_alloc
= ud
.dirs_nr
= decode_varint(&data
);
3045 ALLOC_ARRAY(ud
.dirs
, ud
.dirs_nr
);
3047 eos
= memchr(data
, '\0', end
- data
);
3048 if (!eos
|| eos
== end
)
3051 *untracked_
= untracked
= xmalloc(st_add3(sizeof(*untracked
), eos
- data
, 1));
3052 memcpy(untracked
, &ud
, sizeof(ud
));
3053 memcpy(untracked
->name
, data
, eos
- data
+ 1);
3056 for (i
= 0; i
< untracked
->untracked_nr
; i
++) {
3057 eos
= memchr(data
, '\0', end
- data
);
3058 if (!eos
|| eos
== end
)
3060 untracked
->untracked
[i
] = xmemdupz(data
, eos
- data
);
3064 rd
->ucd
[rd
->index
++] = untracked
;
3067 for (i
= 0; i
< untracked
->dirs_nr
; i
++) {
3068 if (read_one_dir(untracked
->dirs
+ i
, rd
) < 0)
3074 static void set_check_only(size_t pos
, void *cb
)
3076 struct read_data
*rd
= cb
;
3077 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
3081 static void read_stat(size_t pos
, void *cb
)
3083 struct read_data
*rd
= cb
;
3084 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
3085 if (rd
->data
+ sizeof(struct stat_data
) > rd
->end
) {
3086 rd
->data
= rd
->end
+ 1;
3089 stat_data_from_disk(&ud
->stat_data
, rd
->data
);
3090 rd
->data
+= sizeof(struct stat_data
);
3094 static void read_oid(size_t pos
, void *cb
)
3096 struct read_data
*rd
= cb
;
3097 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
3098 if (rd
->data
+ the_hash_algo
->rawsz
> rd
->end
) {
3099 rd
->data
= rd
->end
+ 1;
3102 hashcpy(ud
->exclude_oid
.hash
, rd
->data
);
3103 rd
->data
+= the_hash_algo
->rawsz
;
3106 static void load_oid_stat(struct oid_stat
*oid_stat
, const unsigned char *data
,
3107 const unsigned char *sha1
)
3109 stat_data_from_disk(&oid_stat
->stat
, data
);
3110 hashcpy(oid_stat
->oid
.hash
, sha1
);
3111 oid_stat
->valid
= 1;
3114 struct untracked_cache
*read_untracked_extension(const void *data
, unsigned long sz
)
3116 struct untracked_cache
*uc
;
3117 struct read_data rd
;
3118 const unsigned char *next
= data
, *end
= (const unsigned char *)data
+ sz
;
3122 const char *exclude_per_dir
;
3123 const unsigned hashsz
= the_hash_algo
->rawsz
;
3124 const unsigned offset
= sizeof(struct ondisk_untracked_cache
);
3125 const unsigned exclude_per_dir_offset
= offset
+ 2 * hashsz
;
3127 if (sz
<= 1 || end
[-1] != '\0')
3131 ident_len
= decode_varint(&next
);
3132 if (next
+ ident_len
> end
)
3134 ident
= (const char *)next
;
3137 if (next
+ exclude_per_dir_offset
+ 1 > end
)
3140 uc
= xcalloc(1, sizeof(*uc
));
3141 strbuf_init(&uc
->ident
, ident_len
);
3142 strbuf_add(&uc
->ident
, ident
, ident_len
);
3143 load_oid_stat(&uc
->ss_info_exclude
,
3144 next
+ ouc_offset(info_exclude_stat
),
3146 load_oid_stat(&uc
->ss_excludes_file
,
3147 next
+ ouc_offset(excludes_file_stat
),
3148 next
+ offset
+ hashsz
);
3149 uc
->dir_flags
= get_be32(next
+ ouc_offset(dir_flags
));
3150 exclude_per_dir
= (const char *)next
+ exclude_per_dir_offset
;
3151 uc
->exclude_per_dir
= xstrdup(exclude_per_dir
);
3152 /* NUL after exclude_per_dir is covered by sizeof(*ouc) */
3153 next
+= exclude_per_dir_offset
+ strlen(exclude_per_dir
) + 1;
3157 len
= decode_varint(&next
);
3158 if (next
> end
|| len
== 0)
3161 rd
.valid
= ewah_new();
3162 rd
.check_only
= ewah_new();
3163 rd
.sha1_valid
= ewah_new();
3167 ALLOC_ARRAY(rd
.ucd
, len
);
3169 if (read_one_dir(&uc
->root
, &rd
) || rd
.index
!= len
)
3173 len
= ewah_read_mmap(rd
.valid
, next
, end
- next
);
3178 len
= ewah_read_mmap(rd
.check_only
, next
, end
- next
);
3183 len
= ewah_read_mmap(rd
.sha1_valid
, next
, end
- next
);
3187 ewah_each_bit(rd
.check_only
, set_check_only
, &rd
);
3188 rd
.data
= next
+ len
;
3189 ewah_each_bit(rd
.valid
, read_stat
, &rd
);
3190 ewah_each_bit(rd
.sha1_valid
, read_oid
, &rd
);
3195 ewah_free(rd
.valid
);
3196 ewah_free(rd
.check_only
);
3197 ewah_free(rd
.sha1_valid
);
3200 free_untracked_cache(uc
);
3206 static void invalidate_one_directory(struct untracked_cache
*uc
,
3207 struct untracked_cache_dir
*ucd
)
3209 uc
->dir_invalidated
++;
3211 ucd
->untracked_nr
= 0;
3215 * Normally when an entry is added or removed from a directory,
3216 * invalidating that directory is enough. No need to touch its
3217 * ancestors. When a directory is shown as "foo/bar/" in git-status
3218 * however, deleting or adding an entry may have cascading effect.
3220 * Say the "foo/bar/file" has become untracked, we need to tell the
3221 * untracked_cache_dir of "foo" that "bar/" is not an untracked
3222 * directory any more (because "bar" is managed by foo as an untracked
3225 * Similarly, if "foo/bar/file" moves from untracked to tracked and it
3226 * was the last untracked entry in the entire "foo", we should show
3227 * "foo/" instead. Which means we have to invalidate past "bar" up to
3230 * This function traverses all directories from root to leaf. If there
3231 * is a chance of one of the above cases happening, we invalidate back
3232 * to root. Otherwise we just invalidate the leaf. There may be a more
3233 * sophisticated way than checking for SHOW_OTHER_DIRECTORIES to
3234 * detect these cases and avoid unnecessary invalidation, for example,
3235 * checking for the untracked entry named "bar/" in "foo", but for now
3236 * stick to something safe and simple.
3238 static int invalidate_one_component(struct untracked_cache
*uc
,
3239 struct untracked_cache_dir
*dir
,
3240 const char *path
, int len
)
3242 const char *rest
= strchr(path
, '/');
3245 int component_len
= rest
- path
;
3246 struct untracked_cache_dir
*d
=
3247 lookup_untracked(uc
, dir
, path
, component_len
);
3249 invalidate_one_component(uc
, d
, rest
+ 1,
3250 len
- (component_len
+ 1));
3252 invalidate_one_directory(uc
, dir
);
3256 invalidate_one_directory(uc
, dir
);
3257 return uc
->dir_flags
& DIR_SHOW_OTHER_DIRECTORIES
;
3260 void untracked_cache_invalidate_path(struct index_state
*istate
,
3261 const char *path
, int safe_path
)
3263 if (!istate
->untracked
|| !istate
->untracked
->root
)
3265 if (!safe_path
&& !verify_path(path
, 0))
3267 invalidate_one_component(istate
->untracked
, istate
->untracked
->root
,
3268 path
, strlen(path
));
3271 void untracked_cache_remove_from_index(struct index_state
*istate
,
3274 untracked_cache_invalidate_path(istate
, path
, 1);
3277 void untracked_cache_add_to_index(struct index_state
*istate
,
3280 untracked_cache_invalidate_path(istate
, path
, 1);
3283 static void connect_wt_gitdir_in_nested(const char *sub_worktree
,
3284 const char *sub_gitdir
)
3287 struct repository subrepo
;
3288 struct strbuf sub_wt
= STRBUF_INIT
;
3289 struct strbuf sub_gd
= STRBUF_INIT
;
3291 const struct submodule
*sub
;
3293 /* If the submodule has no working tree, we can ignore it. */
3294 if (repo_init(&subrepo
, sub_gitdir
, sub_worktree
))
3297 if (repo_read_index(&subrepo
) < 0)
3298 die(_("index file corrupt in repo %s"), subrepo
.gitdir
);
3300 for (i
= 0; i
< subrepo
.index
->cache_nr
; i
++) {
3301 const struct cache_entry
*ce
= subrepo
.index
->cache
[i
];
3303 if (!S_ISGITLINK(ce
->ce_mode
))
3306 while (i
+ 1 < subrepo
.index
->cache_nr
&&
3307 !strcmp(ce
->name
, subrepo
.index
->cache
[i
+ 1]->name
))
3309 * Skip entries with the same name in different stages
3310 * to make sure an entry is returned only once.
3314 sub
= submodule_from_path(&subrepo
, &null_oid
, ce
->name
);
3315 if (!sub
|| !is_submodule_active(&subrepo
, ce
->name
))
3316 /* .gitmodules broken or inactive sub */
3319 strbuf_reset(&sub_wt
);
3320 strbuf_reset(&sub_gd
);
3321 strbuf_addf(&sub_wt
, "%s/%s", sub_worktree
, sub
->path
);
3322 strbuf_addf(&sub_gd
, "%s/modules/%s", sub_gitdir
, sub
->name
);
3324 connect_work_tree_and_git_dir(sub_wt
.buf
, sub_gd
.buf
, 1);
3326 strbuf_release(&sub_wt
);
3327 strbuf_release(&sub_gd
);
3328 repo_clear(&subrepo
);
3331 void connect_work_tree_and_git_dir(const char *work_tree_
,
3332 const char *git_dir_
,
3333 int recurse_into_nested
)
3335 struct strbuf gitfile_sb
= STRBUF_INIT
;
3336 struct strbuf cfg_sb
= STRBUF_INIT
;
3337 struct strbuf rel_path
= STRBUF_INIT
;
3338 char *git_dir
, *work_tree
;
3340 /* Prepare .git file */
3341 strbuf_addf(&gitfile_sb
, "%s/.git", work_tree_
);
3342 if (safe_create_leading_directories_const(gitfile_sb
.buf
))
3343 die(_("could not create directories for %s"), gitfile_sb
.buf
);
3345 /* Prepare config file */
3346 strbuf_addf(&cfg_sb
, "%s/config", git_dir_
);
3347 if (safe_create_leading_directories_const(cfg_sb
.buf
))
3348 die(_("could not create directories for %s"), cfg_sb
.buf
);
3350 git_dir
= real_pathdup(git_dir_
, 1);
3351 work_tree
= real_pathdup(work_tree_
, 1);
3353 /* Write .git file */
3354 write_file(gitfile_sb
.buf
, "gitdir: %s",
3355 relative_path(git_dir
, work_tree
, &rel_path
));
3356 /* Update core.worktree setting */
3357 git_config_set_in_file(cfg_sb
.buf
, "core.worktree",
3358 relative_path(work_tree
, git_dir
, &rel_path
));
3360 strbuf_release(&gitfile_sb
);
3361 strbuf_release(&cfg_sb
);
3362 strbuf_release(&rel_path
);
3364 if (recurse_into_nested
)
3365 connect_wt_gitdir_in_nested(work_tree
, git_dir
);
3372 * Migrate the git directory of the given path from old_git_dir to new_git_dir.
3374 void relocate_gitdir(const char *path
, const char *old_git_dir
, const char *new_git_dir
)
3376 if (rename(old_git_dir
, new_git_dir
) < 0)
3377 die_errno(_("could not migrate git directory from '%s' to '%s'"),
3378 old_git_dir
, new_git_dir
);
3380 connect_work_tree_and_git_dir(path
, new_git_dir
, 0);