2 * This handles recursive filename detection with exclude
3 * files, index knowledge etc..
5 * Copyright (C) Linus Torvalds, 2005-2006
6 * Junio Hamano, 2005-2006
9 #define USE_THE_REPOSITORY_VARIABLE
11 #include "git-compat-util.h"
16 #include "environment.h"
18 #include "name-hash.h"
19 #include "object-file.h"
20 #include "object-store-ll.h"
23 #include "wildmatch.h"
27 #include "ewah/ewok.h"
28 #include "fsmonitor-ll.h"
29 #include "read-cache-ll.h"
31 #include "sparse-index.h"
32 #include "submodule-config.h"
39 * The maximum size of a pattern/exclude file. If the file exceeds this size
42 #define PATTERN_MAX_FILE_SIZE (100 * 1024 * 1024)
45 * Tells read_directory_recursive how a file or directory should be treated.
46 * Values are ordered by significance, e.g. if a directory contains both
47 * excluded and untracked files, it is listed as untracked because
48 * path_untracked > path_excluded.
58 * Support data structure for our opendir/readdir/closedir wrappers
62 struct untracked_cache_dir
*untracked
;
69 struct untracked_cache_dir
*ucd
;
72 static enum path_treatment
read_directory_recursive(struct dir_struct
*dir
,
73 struct index_state
*istate
, const char *path
, int len
,
74 struct untracked_cache_dir
*untracked
,
75 int check_only
, int stop_at_first_file
, const struct pathspec
*pathspec
);
76 static int resolve_dtype(int dtype
, struct index_state
*istate
,
77 const char *path
, int len
);
78 struct dirent
*readdir_skip_dot_and_dotdot(DIR *dirp
)
82 while ((e
= readdir(dirp
)) != NULL
) {
83 if (!is_dot_or_dotdot(e
->d_name
))
89 int count_slashes(const char *s
)
98 int git_fspathcmp(const char *a
, const char *b
)
100 return ignore_case
? strcasecmp(a
, b
) : strcmp(a
, b
);
103 int fspatheq(const char *a
, const char *b
)
105 return !fspathcmp(a
, b
);
108 int git_fspathncmp(const char *a
, const char *b
, size_t count
)
110 return ignore_case
? strncasecmp(a
, b
, count
) : strncmp(a
, b
, count
);
113 int paths_collide(const char *a
, const char *b
)
115 size_t len_a
= strlen(a
), len_b
= strlen(b
);
118 return fspatheq(a
, b
);
121 return is_dir_sep(b
[len_a
]) && !fspathncmp(a
, b
, len_a
);
122 return is_dir_sep(a
[len_b
]) && !fspathncmp(a
, b
, len_b
);
125 unsigned int fspathhash(const char *str
)
127 return ignore_case
? strihash(str
) : strhash(str
);
130 int git_fnmatch(const struct pathspec_item
*item
,
131 const char *pattern
, const char *string
,
135 if (ps_strncmp(item
, pattern
, string
, prefix
))
140 if (item
->flags
& PATHSPEC_ONESTAR
) {
141 int pattern_len
= strlen(++pattern
);
142 int string_len
= strlen(string
);
143 return string_len
< pattern_len
||
144 ps_strcmp(item
, pattern
,
145 string
+ string_len
- pattern_len
);
147 if (item
->magic
& PATHSPEC_GLOB
)
148 return wildmatch(pattern
, string
,
150 (item
->magic
& PATHSPEC_ICASE
? WM_CASEFOLD
: 0));
152 /* wildmatch has not learned no FNM_PATHNAME mode yet */
153 return wildmatch(pattern
, string
,
154 item
->magic
& PATHSPEC_ICASE
? WM_CASEFOLD
: 0);
157 static int fnmatch_icase_mem(const char *pattern
, int patternlen
,
158 const char *string
, int stringlen
,
162 struct strbuf pat_buf
= STRBUF_INIT
;
163 struct strbuf str_buf
= STRBUF_INIT
;
164 const char *use_pat
= pattern
;
165 const char *use_str
= string
;
167 if (pattern
[patternlen
]) {
168 strbuf_add(&pat_buf
, pattern
, patternlen
);
169 use_pat
= pat_buf
.buf
;
171 if (string
[stringlen
]) {
172 strbuf_add(&str_buf
, string
, stringlen
);
173 use_str
= str_buf
.buf
;
177 flags
|= WM_CASEFOLD
;
178 match_status
= wildmatch(use_pat
, use_str
, flags
);
180 strbuf_release(&pat_buf
);
181 strbuf_release(&str_buf
);
186 static size_t common_prefix_len(const struct pathspec
*pathspec
)
192 * ":(icase)path" is treated as a pathspec full of
193 * wildcard. In other words, only prefix is considered common
194 * prefix. If the pathspec is abc/foo abc/bar, running in
195 * subdir xyz, the common prefix is still xyz, not xyz/abc as
198 GUARD_PATHSPEC(pathspec
,
207 for (n
= 0; n
< pathspec
->nr
; n
++) {
208 size_t i
= 0, len
= 0, item_len
;
209 if (pathspec
->items
[n
].magic
& PATHSPEC_EXCLUDE
)
211 if (pathspec
->items
[n
].magic
& PATHSPEC_ICASE
)
212 item_len
= pathspec
->items
[n
].prefix
;
214 item_len
= pathspec
->items
[n
].nowildcard_len
;
215 while (i
< item_len
&& (n
== 0 || i
< max
)) {
216 char c
= pathspec
->items
[n
].match
[i
];
217 if (c
!= pathspec
->items
[0].match
[i
])
223 if (n
== 0 || len
< max
) {
233 * Returns a copy of the longest leading path common among all
236 char *common_prefix(const struct pathspec
*pathspec
)
238 unsigned long len
= common_prefix_len(pathspec
);
240 return len
? xmemdupz(pathspec
->items
[0].match
, len
) : NULL
;
243 int fill_directory(struct dir_struct
*dir
,
244 struct index_state
*istate
,
245 const struct pathspec
*pathspec
)
250 unsigned exclusive_flags
= DIR_SHOW_IGNORED
| DIR_SHOW_IGNORED_TOO
;
251 if ((dir
->flags
& exclusive_flags
) == exclusive_flags
)
252 BUG("DIR_SHOW_IGNORED and DIR_SHOW_IGNORED_TOO are exclusive");
255 * Calculate common prefix for the pathspec, and
256 * use that to optimize the directory walk
258 prefix_len
= common_prefix_len(pathspec
);
259 prefix
= prefix_len
? pathspec
->items
[0].match
: "";
261 /* Read the directory and prune it */
262 read_directory(dir
, istate
, prefix
, prefix_len
, pathspec
);
267 int within_depth(const char *name
, int namelen
,
268 int depth
, int max_depth
)
270 const char *cp
= name
, *cpe
= name
+ namelen
;
276 if (depth
> max_depth
)
283 * Read the contents of the blob with the given OID into a buffer.
284 * Append a trailing LF to the end if the last line doesn't have one.
287 * -1 when the OID is invalid or unknown or does not refer to a blob.
288 * 0 when the blob is empty.
289 * 1 along with { data, size } of the (possibly augmented) buffer
292 * Optionally updates the given oid_stat with the given OID (when valid).
294 static int do_read_blob(const struct object_id
*oid
, struct oid_stat
*oid_stat
,
295 size_t *size_out
, char **data_out
)
297 enum object_type type
;
304 data
= repo_read_object_file(the_repository
, oid
, &type
, &sz
);
305 if (!data
|| type
!= OBJ_BLOB
) {
311 memset(&oid_stat
->stat
, 0, sizeof(oid_stat
->stat
));
312 oidcpy(&oid_stat
->oid
, oid
);
320 if (data
[sz
- 1] != '\n') {
321 data
= xrealloc(data
, st_add(sz
, 1));
325 *size_out
= xsize_t(sz
);
331 #define DO_MATCH_EXCLUDE (1<<0)
332 #define DO_MATCH_DIRECTORY (1<<1)
333 #define DO_MATCH_LEADING_PATHSPEC (1<<2)
336 * Does the given pathspec match the given name? A match is found if
338 * (1) the pathspec string is leading directory of 'name' ("RECURSIVELY"), or
339 * (2) the pathspec string has a leading part matching 'name' ("LEADING"), or
340 * (3) the pathspec string is a wildcard and matches 'name' ("WILDCARD"), or
341 * (4) the pathspec string is exactly the same as 'name' ("EXACT").
343 * Return value tells which case it was (1-4), or 0 when there is no match.
345 * It may be instructive to look at a small table of concrete examples
346 * to understand the differences between 1, 2, and 4:
349 * | a/b | a/b/ | a/b/c
350 * ------+-----------+-----------+------------
351 * a/b | EXACT | EXACT[1] | LEADING[2]
352 * Names a/b/ | RECURSIVE | EXACT | LEADING[2]
353 * a/b/c | RECURSIVE | RECURSIVE | EXACT
355 * [1] Only if DO_MATCH_DIRECTORY is passed; otherwise, this is NOT a match.
356 * [2] Only if DO_MATCH_LEADING_PATHSPEC is passed; otherwise, not a match.
358 static int match_pathspec_item(struct index_state
*istate
,
359 const struct pathspec_item
*item
, int prefix
,
360 const char *name
, int namelen
, unsigned flags
)
362 /* name/namelen has prefix cut off by caller */
363 const char *match
= item
->match
+ prefix
;
364 int matchlen
= item
->len
- prefix
;
367 * The normal call pattern is:
368 * 1. prefix = common_prefix_len(ps);
369 * 2. prune something, or fill_directory
370 * 3. match_pathspec()
372 * 'prefix' at #1 may be shorter than the command's prefix and
373 * it's ok for #2 to match extra files. Those extras will be
376 * Suppose the pathspec is 'foo' and '../bar' running from
377 * subdir 'xyz'. The common prefix at #1 will be empty, thanks
378 * to "../". We may have xyz/foo _and_ XYZ/foo after #2. The
379 * user does not want XYZ/foo, only the "foo" part should be
380 * case-insensitive. We need to filter out XYZ/foo here. In
381 * other words, we do not trust the caller on comparing the
382 * prefix part when :(icase) is involved. We do exact
383 * comparison ourselves.
385 * Normally the caller (common_prefix_len() in fact) does
386 * _exact_ matching on name[-prefix+1..-1] and we do not need
387 * to check that part. Be defensive and check it anyway, in
388 * case common_prefix_len is changed, or a new caller is
389 * introduced that does not use common_prefix_len.
391 * If the penalty turns out too high when prefix is really
392 * long, maybe change it to
393 * strncmp(match, name, item->prefix - prefix)
395 if (item
->prefix
&& (item
->magic
& PATHSPEC_ICASE
) &&
396 strncmp(item
->match
, name
- prefix
, item
->prefix
))
399 if (item
->attr_match_nr
&&
400 !match_pathspec_attrs(istate
, name
- prefix
, namelen
+ prefix
, item
))
403 /* If the match was just the prefix, we matched */
405 return MATCHED_RECURSIVELY
;
407 if (matchlen
<= namelen
&& !ps_strncmp(item
, match
, name
, matchlen
)) {
408 if (matchlen
== namelen
)
409 return MATCHED_EXACTLY
;
411 if (match
[matchlen
-1] == '/' || name
[matchlen
] == '/')
412 return MATCHED_RECURSIVELY
;
413 } else if ((flags
& DO_MATCH_DIRECTORY
) &&
414 match
[matchlen
- 1] == '/' &&
415 namelen
== matchlen
- 1 &&
416 !ps_strncmp(item
, match
, name
, namelen
))
417 return MATCHED_EXACTLY
;
419 if (item
->nowildcard_len
< item
->len
&&
420 !git_fnmatch(item
, match
, name
,
421 item
->nowildcard_len
- prefix
))
422 return MATCHED_FNMATCH
;
424 /* Perform checks to see if "name" is a leading string of the pathspec */
425 if ( (flags
& DO_MATCH_LEADING_PATHSPEC
) &&
426 !(flags
& DO_MATCH_EXCLUDE
)) {
427 /* name is a literal prefix of the pathspec */
428 int offset
= name
[namelen
-1] == '/' ? 1 : 0;
429 if ((namelen
< matchlen
) &&
430 (match
[namelen
-offset
] == '/') &&
431 !ps_strncmp(item
, match
, name
, namelen
))
432 return MATCHED_RECURSIVELY_LEADING_PATHSPEC
;
434 /* name doesn't match up to the first wild character */
435 if (item
->nowildcard_len
< item
->len
&&
436 ps_strncmp(item
, match
, name
,
437 item
->nowildcard_len
- prefix
))
441 * name has no wildcard, and it didn't match as a leading
442 * pathspec so return.
444 if (item
->nowildcard_len
== item
->len
)
448 * Here is where we would perform a wildmatch to check if
449 * "name" can be matched as a directory (or a prefix) against
450 * the pathspec. Since wildmatch doesn't have this capability
451 * at the present we have to punt and say that it is a match,
452 * potentially returning a false positive
453 * The submodules themselves will be able to perform more
454 * accurate matching to determine if the pathspec matches.
456 return MATCHED_RECURSIVELY_LEADING_PATHSPEC
;
463 * do_match_pathspec() is meant to ONLY be called by
464 * match_pathspec_with_flags(); calling it directly risks pathspecs
465 * like ':!unwanted_path' being ignored.
467 * Given a name and a list of pathspecs, returns the nature of the
468 * closest (i.e. most specific) match of the name to any of the
471 * The caller typically calls this multiple times with the same
472 * pathspec and seen[] array but with different name/namelen
473 * (e.g. entries from the index) and is interested in seeing if and
474 * how each pathspec matches all the names it calls this function
475 * with. A mark is left in the seen[] array for each pathspec element
476 * indicating the closest type of match that element achieved, so if
477 * seen[n] remains zero after multiple invocations, that means the nth
478 * pathspec did not match any names, which could indicate that the
479 * user mistyped the nth pathspec.
481 static int do_match_pathspec(struct index_state
*istate
,
482 const struct pathspec
*ps
,
483 const char *name
, int namelen
,
484 int prefix
, char *seen
,
487 int i
, retval
= 0, exclude
= flags
& DO_MATCH_EXCLUDE
;
499 if (!ps
->recursive
||
500 !(ps
->magic
& PATHSPEC_MAXDEPTH
) ||
502 return MATCHED_RECURSIVELY
;
504 if (within_depth(name
, namelen
, 0, ps
->max_depth
))
505 return MATCHED_EXACTLY
;
513 for (i
= ps
->nr
- 1; i
>= 0; i
--) {
516 if ((!exclude
&& ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
) ||
517 ( exclude
&& !(ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
)))
520 if (seen
&& seen
[i
] == MATCHED_EXACTLY
)
523 * Make exclude patterns optional and never report
524 * "pathspec ':(exclude)foo' matches no files"
526 if (seen
&& ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
)
527 seen
[i
] = MATCHED_FNMATCH
;
528 how
= match_pathspec_item(istate
, ps
->items
+i
, prefix
, name
,
531 (ps
->magic
& PATHSPEC_MAXDEPTH
) &&
532 ps
->max_depth
!= -1 &&
533 how
&& how
!= MATCHED_FNMATCH
) {
534 int len
= ps
->items
[i
].len
;
535 if (name
[len
] == '/')
537 if (within_depth(name
+len
, namelen
-len
, 0, ps
->max_depth
))
538 how
= MATCHED_EXACTLY
;
545 if (seen
&& seen
[i
] < how
)
552 static int match_pathspec_with_flags(struct index_state
*istate
,
553 const struct pathspec
*ps
,
554 const char *name
, int namelen
,
555 int prefix
, char *seen
, unsigned flags
)
557 int positive
, negative
;
558 positive
= do_match_pathspec(istate
, ps
, name
, namelen
,
559 prefix
, seen
, flags
);
560 if (!(ps
->magic
& PATHSPEC_EXCLUDE
) || !positive
)
562 negative
= do_match_pathspec(istate
, ps
, name
, namelen
,
564 flags
| DO_MATCH_EXCLUDE
);
565 return negative
? 0 : positive
;
568 int match_pathspec(struct index_state
*istate
,
569 const struct pathspec
*ps
,
570 const char *name
, int namelen
,
571 int prefix
, char *seen
, int is_dir
)
573 unsigned flags
= is_dir
? DO_MATCH_DIRECTORY
: 0;
574 return match_pathspec_with_flags(istate
, ps
, name
, namelen
,
575 prefix
, seen
, flags
);
579 * Check if a submodule is a superset of the pathspec
581 int submodule_path_match(struct index_state
*istate
,
582 const struct pathspec
*ps
,
583 const char *submodule_name
,
586 int matched
= match_pathspec_with_flags(istate
, ps
, submodule_name
,
587 strlen(submodule_name
),
590 DO_MATCH_LEADING_PATHSPEC
);
594 int report_path_error(const char *ps_matched
,
595 const struct pathspec
*pathspec
)
598 * Make sure all pathspec matched; otherwise it is an error.
601 for (num
= 0; num
< pathspec
->nr
; num
++) {
602 int other
, found_dup
;
607 * The caller might have fed identical pathspec
608 * twice. Do not barf on such a mistake.
609 * FIXME: parse_pathspec should have eliminated
610 * duplicate pathspec.
612 for (found_dup
= other
= 0;
613 !found_dup
&& other
< pathspec
->nr
;
615 if (other
== num
|| !ps_matched
[other
])
617 if (!strcmp(pathspec
->items
[other
].original
,
618 pathspec
->items
[num
].original
))
620 * Ok, we have a match already.
627 error(_("pathspec '%s' did not match any file(s) known to git"),
628 pathspec
->items
[num
].original
);
635 * Return the length of the "simple" part of a path match limiter.
637 int simple_length(const char *match
)
642 unsigned char c
= *match
++;
644 if (c
== '\0' || is_glob_special(c
))
649 int no_wildcard(const char *string
)
651 return string
[simple_length(string
)] == '\0';
654 void parse_path_pattern(const char **pattern
,
659 const char *p
= *pattern
;
664 *flags
|= PATTERN_FLAG_NEGATIVE
;
668 if (len
&& p
[len
- 1] == '/') {
670 *flags
|= PATTERN_FLAG_MUSTBEDIR
;
672 for (i
= 0; i
< len
; i
++) {
677 *flags
|= PATTERN_FLAG_NODIR
;
678 *nowildcardlen
= simple_length(p
);
680 * we should have excluded the trailing slash from 'p' too,
681 * but that's one more allocation. Instead just make sure
682 * nowildcardlen does not exceed real patternlen
684 if (*nowildcardlen
> len
)
685 *nowildcardlen
= len
;
686 if (*p
== '*' && no_wildcard(p
+ 1))
687 *flags
|= PATTERN_FLAG_ENDSWITH
;
692 int pl_hashmap_cmp(const void *cmp_data UNUSED
,
693 const struct hashmap_entry
*a
,
694 const struct hashmap_entry
*b
,
695 const void *key UNUSED
)
697 const struct pattern_entry
*ee1
=
698 container_of(a
, struct pattern_entry
, ent
);
699 const struct pattern_entry
*ee2
=
700 container_of(b
, struct pattern_entry
, ent
);
702 size_t min_len
= ee1
->patternlen
<= ee2
->patternlen
706 return fspathncmp(ee1
->pattern
, ee2
->pattern
, min_len
);
709 static char *dup_and_filter_pattern(const char *pattern
)
713 char *result
= xstrdup(pattern
);
719 /* skip escape characters (once) */
739 static void clear_pattern_entry_hashmap(struct hashmap
*map
)
741 struct hashmap_iter iter
;
742 struct pattern_entry
*entry
;
744 hashmap_for_each_entry(map
, &iter
, entry
, ent
) {
745 free(entry
->pattern
);
747 hashmap_clear_and_free(map
, struct pattern_entry
, ent
);
750 static void add_pattern_to_hashsets(struct pattern_list
*pl
, struct path_pattern
*given
)
752 struct pattern_entry
*translated
;
755 const char *prev
, *cur
, *next
;
757 if (!pl
->use_cone_patterns
)
760 if (given
->flags
& PATTERN_FLAG_NEGATIVE
&&
761 given
->flags
& PATTERN_FLAG_MUSTBEDIR
&&
762 !strcmp(given
->pattern
, "/*")) {
767 if (!given
->flags
&& !strcmp(given
->pattern
, "/*")) {
772 if (given
->patternlen
< 2 ||
773 *given
->pattern
!= '/' ||
774 strstr(given
->pattern
, "**")) {
775 /* Not a cone pattern. */
776 warning(_("unrecognized pattern: '%s'"), given
->pattern
);
780 if (!(given
->flags
& PATTERN_FLAG_MUSTBEDIR
) &&
781 strcmp(given
->pattern
, "/*")) {
782 /* Not a cone pattern. */
783 warning(_("unrecognized pattern: '%s'"), given
->pattern
);
787 prev
= given
->pattern
;
788 cur
= given
->pattern
+ 1;
789 next
= given
->pattern
+ 2;
792 /* Watch for glob characters '*', '\', '[', '?' */
793 if (!is_glob_special(*cur
))
796 /* But only if *prev != '\\' */
800 /* But allow the initial '\' */
802 is_glob_special(*next
))
805 /* But a trailing '/' then '*' is fine */
811 /* Not a cone pattern. */
812 warning(_("unrecognized pattern: '%s'"), given
->pattern
);
821 if (given
->patternlen
> 2 &&
822 !strcmp(given
->pattern
+ given
->patternlen
- 2, "/*")) {
823 struct pattern_entry
*old
;
825 if (!(given
->flags
& PATTERN_FLAG_NEGATIVE
)) {
826 /* Not a cone pattern. */
827 warning(_("unrecognized pattern: '%s'"), given
->pattern
);
831 truncated
= dup_and_filter_pattern(given
->pattern
);
833 translated
= xmalloc(sizeof(struct pattern_entry
));
834 translated
->pattern
= truncated
;
835 translated
->patternlen
= given
->patternlen
- 2;
836 hashmap_entry_init(&translated
->ent
,
837 fspathhash(translated
->pattern
));
839 if (!hashmap_get_entry(&pl
->recursive_hashmap
,
840 translated
, ent
, NULL
)) {
841 /* We did not see the "parent" included */
842 warning(_("unrecognized negative pattern: '%s'"),
849 hashmap_add(&pl
->parent_hashmap
, &translated
->ent
);
850 old
= hashmap_remove_entry(&pl
->recursive_hashmap
, translated
, ent
, &data
);
859 if (given
->flags
& PATTERN_FLAG_NEGATIVE
) {
860 warning(_("unrecognized negative pattern: '%s'"),
865 translated
= xmalloc(sizeof(struct pattern_entry
));
867 translated
->pattern
= dup_and_filter_pattern(given
->pattern
);
868 translated
->patternlen
= given
->patternlen
;
869 hashmap_entry_init(&translated
->ent
,
870 fspathhash(translated
->pattern
));
872 hashmap_add(&pl
->recursive_hashmap
, &translated
->ent
);
874 if (hashmap_get_entry(&pl
->parent_hashmap
, translated
, ent
, NULL
)) {
875 /* we already included this at the parent level */
876 warning(_("your sparse-checkout file may have issues: pattern '%s' is repeated"),
884 warning(_("disabling cone pattern matching"));
885 clear_pattern_entry_hashmap(&pl
->recursive_hashmap
);
886 clear_pattern_entry_hashmap(&pl
->parent_hashmap
);
887 pl
->use_cone_patterns
= 0;
890 static int hashmap_contains_path(struct hashmap
*map
,
891 struct strbuf
*pattern
)
893 struct pattern_entry p
;
895 /* Check straight mapping */
896 p
.pattern
= pattern
->buf
;
897 p
.patternlen
= pattern
->len
;
898 hashmap_entry_init(&p
.ent
, fspathhash(p
.pattern
));
899 return !!hashmap_get_entry(map
, &p
, ent
, NULL
);
902 int hashmap_contains_parent(struct hashmap
*map
,
904 struct strbuf
*buffer
)
908 strbuf_setlen(buffer
, 0);
911 strbuf_addch(buffer
, '/');
913 strbuf_addstr(buffer
, path
);
915 slash_pos
= strrchr(buffer
->buf
, '/');
917 while (slash_pos
> buffer
->buf
) {
918 strbuf_setlen(buffer
, slash_pos
- buffer
->buf
);
920 if (hashmap_contains_path(map
, buffer
))
923 slash_pos
= strrchr(buffer
->buf
, '/');
929 void add_pattern(const char *string
, const char *base
,
930 int baselen
, struct pattern_list
*pl
, int srcpos
)
932 struct path_pattern
*pattern
;
937 parse_path_pattern(&string
, &patternlen
, &flags
, &nowildcardlen
);
938 FLEX_ALLOC_MEM(pattern
, pattern
, string
, patternlen
);
939 pattern
->patternlen
= patternlen
;
940 pattern
->nowildcardlen
= nowildcardlen
;
941 pattern
->base
= base
;
942 pattern
->baselen
= baselen
;
943 pattern
->flags
= flags
;
944 pattern
->srcpos
= srcpos
;
945 ALLOC_GROW(pl
->patterns
, pl
->nr
+ 1, pl
->alloc
);
946 pl
->patterns
[pl
->nr
++] = pattern
;
949 add_pattern_to_hashsets(pl
, pattern
);
952 static int read_skip_worktree_file_from_index(struct index_state
*istate
,
954 size_t *size_out
, char **data_out
,
955 struct oid_stat
*oid_stat
)
960 pos
= index_name_pos(istate
, path
, len
);
963 if (!ce_skip_worktree(istate
->cache
[pos
]))
966 return do_read_blob(&istate
->cache
[pos
]->oid
, oid_stat
, size_out
, data_out
);
970 * Frees memory within pl which was allocated for exclude patterns and
971 * the file buffer. Does not free pl itself.
973 void clear_pattern_list(struct pattern_list
*pl
)
977 for (i
= 0; i
< pl
->nr
; i
++)
978 free(pl
->patterns
[i
]);
980 clear_pattern_entry_hashmap(&pl
->recursive_hashmap
);
981 clear_pattern_entry_hashmap(&pl
->parent_hashmap
);
983 memset(pl
, 0, sizeof(*pl
));
986 static void trim_trailing_spaces(char *buf
)
988 char *p
, *last_space
= NULL
;
990 for (p
= buf
; *p
; p
++)
1010 * Given a subdirectory name and "dir" of the current directory,
1011 * search the subdir in "dir" and return it, or create a new one if it
1012 * does not exist in "dir".
1014 * If "name" has the trailing slash, it'll be excluded in the search.
1016 static struct untracked_cache_dir
*lookup_untracked(struct untracked_cache
*uc
,
1017 struct untracked_cache_dir
*dir
,
1018 const char *name
, int len
)
1021 struct untracked_cache_dir
*d
;
1024 if (len
&& name
[len
- 1] == '/')
1027 last
= dir
->dirs_nr
;
1028 while (last
> first
) {
1029 int cmp
, next
= first
+ ((last
- first
) >> 1);
1030 d
= dir
->dirs
[next
];
1031 cmp
= strncmp(name
, d
->name
, len
);
1032 if (!cmp
&& strlen(d
->name
) > len
)
1044 FLEX_ALLOC_MEM(d
, name
, name
, len
);
1046 ALLOC_GROW(dir
->dirs
, dir
->dirs_nr
+ 1, dir
->dirs_alloc
);
1047 MOVE_ARRAY(dir
->dirs
+ first
+ 1, dir
->dirs
+ first
,
1048 dir
->dirs_nr
- first
);
1050 dir
->dirs
[first
] = d
;
1054 static void do_invalidate_gitignore(struct untracked_cache_dir
*dir
)
1058 dir
->untracked_nr
= 0;
1059 for (i
= 0; i
< dir
->dirs_nr
; i
++)
1060 do_invalidate_gitignore(dir
->dirs
[i
]);
1063 static void invalidate_gitignore(struct untracked_cache
*uc
,
1064 struct untracked_cache_dir
*dir
)
1066 uc
->gitignore_invalidated
++;
1067 do_invalidate_gitignore(dir
);
1070 static void invalidate_directory(struct untracked_cache
*uc
,
1071 struct untracked_cache_dir
*dir
)
1076 * Invalidation increment here is just roughly correct. If
1077 * untracked_nr or any of dirs[].recurse is non-zero, we
1078 * should increment dir_invalidated too. But that's more
1082 uc
->dir_invalidated
++;
1085 dir
->untracked_nr
= 0;
1086 for (i
= 0; i
< dir
->dirs_nr
; i
++)
1087 dir
->dirs
[i
]->recurse
= 0;
1090 static int add_patterns_from_buffer(char *buf
, size_t size
,
1091 const char *base
, int baselen
,
1092 struct pattern_list
*pl
);
1094 /* Flags for add_patterns() */
1095 #define PATTERN_NOFOLLOW (1<<0)
1098 * Given a file with name "fname", read it (either from disk, or from
1099 * an index if 'istate' is non-null), parse it and store the
1100 * exclude rules in "pl".
1102 * If "oid_stat" is not NULL, compute oid of the exclude file and fill
1103 * stat data from disk (only valid if add_patterns returns zero). If
1104 * oid_stat.valid is non-zero, "oid_stat" must contain good value as input.
1106 static int add_patterns(const char *fname
, const char *base
, int baselen
,
1107 struct pattern_list
*pl
, struct index_state
*istate
,
1108 unsigned flags
, struct oid_stat
*oid_stat
)
1116 if (flags
& PATTERN_NOFOLLOW
)
1117 fd
= open_nofollow(fname
, O_RDONLY
);
1119 fd
= open(fname
, O_RDONLY
);
1121 if (fd
< 0 || fstat(fd
, &st
) < 0) {
1123 warn_on_fopen_errors(fname
);
1128 r
= read_skip_worktree_file_from_index(istate
, fname
,
1134 size
= xsize_t(st
.st_size
);
1137 fill_stat_data(&oid_stat
->stat
, &st
);
1138 oidcpy(&oid_stat
->oid
, the_hash_algo
->empty_blob
);
1139 oid_stat
->valid
= 1;
1144 buf
= xmallocz(size
);
1145 if (read_in_full(fd
, buf
, size
) != size
) {
1154 if (oid_stat
->valid
&&
1155 !match_stat_data_racy(istate
, &oid_stat
->stat
, &st
))
1156 ; /* no content change, oid_stat->oid still good */
1158 (pos
= index_name_pos(istate
, fname
, strlen(fname
))) >= 0 &&
1159 !ce_stage(istate
->cache
[pos
]) &&
1160 ce_uptodate(istate
->cache
[pos
]) &&
1161 !would_convert_to_git(istate
, fname
))
1162 oidcpy(&oid_stat
->oid
,
1163 &istate
->cache
[pos
]->oid
);
1165 hash_object_file(the_hash_algo
, buf
, size
,
1166 OBJ_BLOB
, &oid_stat
->oid
);
1167 fill_stat_data(&oid_stat
->stat
, &st
);
1168 oid_stat
->valid
= 1;
1172 if (size
> PATTERN_MAX_FILE_SIZE
) {
1173 warning("ignoring excessively large pattern file: %s", fname
);
1178 add_patterns_from_buffer(buf
, size
, base
, baselen
, pl
);
1183 static int add_patterns_from_buffer(char *buf
, size_t size
,
1184 const char *base
, int baselen
,
1185 struct pattern_list
*pl
)
1191 hashmap_init(&pl
->recursive_hashmap
, pl_hashmap_cmp
, NULL
, 0);
1192 hashmap_init(&pl
->parent_hashmap
, pl_hashmap_cmp
, NULL
, 0);
1194 if (skip_utf8_bom(&buf
, size
))
1199 for (i
= 0; i
< size
; i
++) {
1200 if (buf
[i
] == '\n') {
1201 if (entry
!= buf
+ i
&& entry
[0] != '#') {
1202 buf
[i
- (i
&& buf
[i
-1] == '\r')] = 0;
1203 trim_trailing_spaces(entry
);
1204 add_pattern(entry
, base
, baselen
, pl
, lineno
);
1207 entry
= buf
+ i
+ 1;
1213 int add_patterns_from_file_to_list(const char *fname
, const char *base
,
1214 int baselen
, struct pattern_list
*pl
,
1215 struct index_state
*istate
,
1218 return add_patterns(fname
, base
, baselen
, pl
, istate
, flags
, NULL
);
1221 int add_patterns_from_blob_to_list(
1222 struct object_id
*oid
,
1223 const char *base
, int baselen
,
1224 struct pattern_list
*pl
)
1230 r
= do_read_blob(oid
, NULL
, &size
, &buf
);
1234 if (size
> PATTERN_MAX_FILE_SIZE
) {
1235 warning("ignoring excessively large pattern blob: %s",
1241 add_patterns_from_buffer(buf
, size
, base
, baselen
, pl
);
1246 struct pattern_list
*add_pattern_list(struct dir_struct
*dir
,
1247 int group_type
, const char *src
)
1249 struct pattern_list
*pl
;
1250 struct exclude_list_group
*group
;
1252 group
= &dir
->internal
.exclude_list_group
[group_type
];
1253 ALLOC_GROW(group
->pl
, group
->nr
+ 1, group
->alloc
);
1254 pl
= &group
->pl
[group
->nr
++];
1255 memset(pl
, 0, sizeof(*pl
));
1261 * Used to set up core.excludesfile and .git/info/exclude lists.
1263 static void add_patterns_from_file_1(struct dir_struct
*dir
, const char *fname
,
1264 struct oid_stat
*oid_stat
)
1266 struct pattern_list
*pl
;
1268 * catch setup_standard_excludes() that's called before
1269 * dir->untracked is assigned. That function behaves
1270 * differently when dir->untracked is non-NULL.
1272 if (!dir
->untracked
)
1273 dir
->internal
.unmanaged_exclude_files
++;
1274 pl
= add_pattern_list(dir
, EXC_FILE
, fname
);
1275 if (add_patterns(fname
, "", 0, pl
, NULL
, 0, oid_stat
) < 0)
1276 die(_("cannot use %s as an exclude file"), fname
);
1279 void add_patterns_from_file(struct dir_struct
*dir
, const char *fname
)
1281 dir
->internal
.unmanaged_exclude_files
++; /* see validate_untracked_cache() */
1282 add_patterns_from_file_1(dir
, fname
, NULL
);
1285 int match_basename(const char *basename
, int basenamelen
,
1286 const char *pattern
, int prefix
, int patternlen
,
1289 if (prefix
== patternlen
) {
1290 if (patternlen
== basenamelen
&&
1291 !fspathncmp(pattern
, basename
, basenamelen
))
1293 } else if (flags
& PATTERN_FLAG_ENDSWITH
) {
1294 /* "*literal" matching against "fooliteral" */
1295 if (patternlen
- 1 <= basenamelen
&&
1296 !fspathncmp(pattern
+ 1,
1297 basename
+ basenamelen
- (patternlen
- 1),
1301 if (fnmatch_icase_mem(pattern
, patternlen
,
1302 basename
, basenamelen
,
1309 int match_pathname(const char *pathname
, int pathlen
,
1310 const char *base
, int baselen
,
1311 const char *pattern
, int prefix
, int patternlen
)
1317 * match with FNM_PATHNAME; the pattern has base implicitly
1320 if (*pattern
== '/') {
1327 * baselen does not count the trailing slash. base[] may or
1328 * may not end with a trailing slash though.
1330 if (pathlen
< baselen
+ 1 ||
1331 (baselen
&& pathname
[baselen
] != '/') ||
1332 fspathncmp(pathname
, base
, baselen
))
1335 namelen
= baselen
? pathlen
- baselen
- 1 : pathlen
;
1336 name
= pathname
+ pathlen
- namelen
;
1340 * if the non-wildcard part is longer than the
1341 * remaining pathname, surely it cannot match.
1343 if (prefix
> namelen
)
1346 if (fspathncmp(pattern
, name
, prefix
))
1349 patternlen
-= prefix
;
1354 * If the whole pattern did not have a wildcard,
1355 * then our prefix match is all we need; we
1356 * do not need to call fnmatch at all.
1358 if (!patternlen
&& !namelen
)
1362 return fnmatch_icase_mem(pattern
, patternlen
,
1368 * Scan the given exclude list in reverse to see whether pathname
1369 * should be ignored. The first match (i.e. the last on the list), if
1370 * any, determines the fate. Returns the exclude_list element which
1371 * matched, or NULL for undecided.
1373 static struct path_pattern
*last_matching_pattern_from_list(const char *pathname
,
1375 const char *basename
,
1377 struct pattern_list
*pl
,
1378 struct index_state
*istate
)
1380 struct path_pattern
*res
= NULL
; /* undecided */
1384 return NULL
; /* undefined */
1386 for (i
= pl
->nr
- 1; 0 <= i
; i
--) {
1387 struct path_pattern
*pattern
= pl
->patterns
[i
];
1388 const char *exclude
= pattern
->pattern
;
1389 int prefix
= pattern
->nowildcardlen
;
1391 if (pattern
->flags
& PATTERN_FLAG_MUSTBEDIR
) {
1392 *dtype
= resolve_dtype(*dtype
, istate
, pathname
, pathlen
);
1393 if (*dtype
!= DT_DIR
)
1397 if (pattern
->flags
& PATTERN_FLAG_NODIR
) {
1398 if (match_basename(basename
,
1399 pathlen
- (basename
- pathname
),
1400 exclude
, prefix
, pattern
->patternlen
,
1408 assert(pattern
->baselen
== 0 ||
1409 pattern
->base
[pattern
->baselen
- 1] == '/');
1410 if (match_pathname(pathname
, pathlen
,
1412 pattern
->baselen
? pattern
->baselen
- 1 : 0,
1413 exclude
, prefix
, pattern
->patternlen
)) {
1422 * Scan the list of patterns to determine if the ordered list
1423 * of patterns matches on 'pathname'.
1425 * Return 1 for a match, 0 for not matched and -1 for undecided.
1427 enum pattern_match_result
path_matches_pattern_list(
1428 const char *pathname
, int pathlen
,
1429 const char *basename
, int *dtype
,
1430 struct pattern_list
*pl
,
1431 struct index_state
*istate
)
1433 struct path_pattern
*pattern
;
1434 struct strbuf parent_pathname
= STRBUF_INIT
;
1435 int result
= NOT_MATCHED
;
1438 if (!pl
->use_cone_patterns
) {
1439 pattern
= last_matching_pattern_from_list(pathname
, pathlen
, basename
,
1442 if (pattern
->flags
& PATTERN_FLAG_NEGATIVE
)
1454 strbuf_addch(&parent_pathname
, '/');
1455 strbuf_add(&parent_pathname
, pathname
, pathlen
);
1458 * Directory entries are matched if and only if a file
1459 * contained immediately within them is matched. For the
1460 * case of a directory entry, modify the path to create
1461 * a fake filename within this directory, allowing us to
1462 * use the file-base matching logic in an equivalent way.
1464 if (parent_pathname
.len
> 0 &&
1465 parent_pathname
.buf
[parent_pathname
.len
- 1] == '/') {
1466 slash_pos
= parent_pathname
.len
- 1;
1467 strbuf_add(&parent_pathname
, "-", 1);
1469 const char *slash_ptr
= strrchr(parent_pathname
.buf
, '/');
1470 slash_pos
= slash_ptr
? slash_ptr
- parent_pathname
.buf
: 0;
1473 if (hashmap_contains_path(&pl
->recursive_hashmap
,
1474 &parent_pathname
)) {
1475 result
= MATCHED_RECURSIVE
;
1480 /* include every file in root */
1485 strbuf_setlen(&parent_pathname
, slash_pos
);
1487 if (hashmap_contains_path(&pl
->parent_hashmap
, &parent_pathname
)) {
1492 if (hashmap_contains_parent(&pl
->recursive_hashmap
,
1495 result
= MATCHED_RECURSIVE
;
1498 strbuf_release(&parent_pathname
);
1502 int init_sparse_checkout_patterns(struct index_state
*istate
)
1504 if (!core_apply_sparse_checkout
)
1506 if (istate
->sparse_checkout_patterns
)
1509 CALLOC_ARRAY(istate
->sparse_checkout_patterns
, 1);
1511 if (get_sparse_checkout_patterns(istate
->sparse_checkout_patterns
) < 0) {
1512 FREE_AND_NULL(istate
->sparse_checkout_patterns
);
1519 static int path_in_sparse_checkout_1(const char *path
,
1520 struct index_state
*istate
,
1521 int require_cone_mode
)
1524 enum pattern_match_result match
= UNDECIDED
;
1525 const char *end
, *slash
;
1528 * We default to accepting a path if the path is empty, there are no
1529 * patterns, or the patterns are of the wrong type.
1532 init_sparse_checkout_patterns(istate
) ||
1533 (require_cone_mode
&&
1534 !istate
->sparse_checkout_patterns
->use_cone_patterns
))
1538 * If UNDECIDED, use the match from the parent dir (recursively), or
1539 * fall back to NOT_MATCHED at the topmost level. Note that cone mode
1540 * never returns UNDECIDED, so we will execute only one iteration in
1543 for (end
= path
+ strlen(path
);
1544 end
> path
&& match
== UNDECIDED
;
1547 for (slash
= end
- 1; slash
> path
&& *slash
!= '/'; slash
--)
1550 match
= path_matches_pattern_list(path
, end
- path
,
1551 slash
> path
? slash
+ 1 : path
, &dtype
,
1552 istate
->sparse_checkout_patterns
, istate
);
1554 /* We are going to match the parent dir now */
1560 int path_in_sparse_checkout(const char *path
,
1561 struct index_state
*istate
)
1563 return path_in_sparse_checkout_1(path
, istate
, 0);
1566 int path_in_cone_mode_sparse_checkout(const char *path
,
1567 struct index_state
*istate
)
1569 return path_in_sparse_checkout_1(path
, istate
, 1);
1572 static struct path_pattern
*last_matching_pattern_from_lists(
1573 struct dir_struct
*dir
, struct index_state
*istate
,
1574 const char *pathname
, int pathlen
,
1575 const char *basename
, int *dtype_p
)
1578 struct exclude_list_group
*group
;
1579 struct path_pattern
*pattern
;
1580 for (i
= EXC_CMDL
; i
<= EXC_FILE
; i
++) {
1581 group
= &dir
->internal
.exclude_list_group
[i
];
1582 for (j
= group
->nr
- 1; j
>= 0; j
--) {
1583 pattern
= last_matching_pattern_from_list(
1584 pathname
, pathlen
, basename
, dtype_p
,
1585 &group
->pl
[j
], istate
);
1594 * Loads the per-directory exclude list for the substring of base
1595 * which has a char length of baselen.
1597 static void prep_exclude(struct dir_struct
*dir
,
1598 struct index_state
*istate
,
1599 const char *base
, int baselen
)
1601 struct exclude_list_group
*group
;
1602 struct pattern_list
*pl
;
1603 struct exclude_stack
*stk
= NULL
;
1604 struct untracked_cache_dir
*untracked
;
1607 group
= &dir
->internal
.exclude_list_group
[EXC_DIRS
];
1610 * Pop the exclude lists from the EXCL_DIRS exclude_list_group
1611 * which originate from directories not in the prefix of the
1612 * path being checked.
1614 while ((stk
= dir
->internal
.exclude_stack
) != NULL
) {
1615 if (stk
->baselen
<= baselen
&&
1616 !strncmp(dir
->internal
.basebuf
.buf
, base
, stk
->baselen
))
1618 pl
= &group
->pl
[dir
->internal
.exclude_stack
->exclude_ix
];
1619 dir
->internal
.exclude_stack
= stk
->prev
;
1620 dir
->internal
.pattern
= NULL
;
1621 free((char *)pl
->src
); /* see strbuf_detach() below */
1622 clear_pattern_list(pl
);
1627 /* Skip traversing into sub directories if the parent is excluded */
1628 if (dir
->internal
.pattern
)
1632 * Lazy initialization. All call sites currently just
1633 * memset(dir, 0, sizeof(*dir)) before use. Changing all of
1634 * them seems lots of work for little benefit.
1636 if (!dir
->internal
.basebuf
.buf
)
1637 strbuf_init(&dir
->internal
.basebuf
, PATH_MAX
);
1639 /* Read from the parent directories and push them down. */
1640 current
= stk
? stk
->baselen
: -1;
1641 strbuf_setlen(&dir
->internal
.basebuf
, current
< 0 ? 0 : current
);
1643 untracked
= stk
? stk
->ucd
: dir
->untracked
->root
;
1647 while (current
< baselen
) {
1649 struct oid_stat oid_stat
;
1651 CALLOC_ARRAY(stk
, 1);
1656 cp
= strchr(base
+ current
+ 1, '/');
1658 die("oops in prep_exclude");
1661 lookup_untracked(dir
->untracked
,
1664 cp
- base
- current
);
1666 stk
->prev
= dir
->internal
.exclude_stack
;
1667 stk
->baselen
= cp
- base
;
1668 stk
->exclude_ix
= group
->nr
;
1669 stk
->ucd
= untracked
;
1670 pl
= add_pattern_list(dir
, EXC_DIRS
, NULL
);
1671 strbuf_add(&dir
->internal
.basebuf
, base
+ current
, stk
->baselen
- current
);
1672 assert(stk
->baselen
== dir
->internal
.basebuf
.len
);
1674 /* Abort if the directory is excluded */
1677 dir
->internal
.basebuf
.buf
[stk
->baselen
- 1] = 0;
1678 dir
->internal
.pattern
= last_matching_pattern_from_lists(dir
,
1680 dir
->internal
.basebuf
.buf
, stk
->baselen
- 1,
1681 dir
->internal
.basebuf
.buf
+ current
, &dt
);
1682 dir
->internal
.basebuf
.buf
[stk
->baselen
- 1] = '/';
1683 if (dir
->internal
.pattern
&&
1684 dir
->internal
.pattern
->flags
& PATTERN_FLAG_NEGATIVE
)
1685 dir
->internal
.pattern
= NULL
;
1686 if (dir
->internal
.pattern
) {
1687 dir
->internal
.exclude_stack
= stk
;
1692 /* Try to read per-directory file */
1693 oidclr(&oid_stat
.oid
, the_repository
->hash_algo
);
1695 if (dir
->exclude_per_dir
&&
1697 * If we know that no files have been added in
1698 * this directory (i.e. valid_cached_dir() has
1699 * been executed and set untracked->valid) ..
1701 (!untracked
|| !untracked
->valid
||
1703 * .. and .gitignore does not exist before
1704 * (i.e. null exclude_oid). Then we can skip
1705 * loading .gitignore, which would result in
1708 !is_null_oid(&untracked
->exclude_oid
))) {
1710 * dir->internal.basebuf gets reused by the traversal,
1711 * but we need fname to remain unchanged to ensure the
1712 * src member of each struct path_pattern correctly
1713 * back-references its source file. Other invocations
1714 * of add_pattern_list provide stable strings, so we
1715 * strbuf_detach() and free() here in the caller.
1717 struct strbuf sb
= STRBUF_INIT
;
1718 strbuf_addbuf(&sb
, &dir
->internal
.basebuf
);
1719 strbuf_addstr(&sb
, dir
->exclude_per_dir
);
1720 pl
->src
= strbuf_detach(&sb
, NULL
);
1721 add_patterns(pl
->src
, pl
->src
, stk
->baselen
, pl
, istate
,
1723 untracked
? &oid_stat
: NULL
);
1726 * NEEDSWORK: when untracked cache is enabled, prep_exclude()
1727 * will first be called in valid_cached_dir() then maybe many
1728 * times more in last_matching_pattern(). When the cache is
1729 * used, last_matching_pattern() will not be called and
1730 * reading .gitignore content will be a waste.
1732 * So when it's called by valid_cached_dir() and we can get
1733 * .gitignore SHA-1 from the index (i.e. .gitignore is not
1734 * modified on work tree), we could delay reading the
1735 * .gitignore content until we absolutely need it in
1736 * last_matching_pattern(). Be careful about ignore rule
1737 * order, though, if you do that.
1740 !oideq(&oid_stat
.oid
, &untracked
->exclude_oid
)) {
1741 invalidate_gitignore(dir
->untracked
, untracked
);
1742 oidcpy(&untracked
->exclude_oid
, &oid_stat
.oid
);
1744 dir
->internal
.exclude_stack
= stk
;
1745 current
= stk
->baselen
;
1747 strbuf_setlen(&dir
->internal
.basebuf
, baselen
);
1751 * Loads the exclude lists for the directory containing pathname, then
1752 * scans all exclude lists to determine whether pathname is excluded.
1753 * Returns the exclude_list element which matched, or NULL for
1756 struct path_pattern
*last_matching_pattern(struct dir_struct
*dir
,
1757 struct index_state
*istate
,
1758 const char *pathname
,
1761 int pathlen
= strlen(pathname
);
1762 const char *basename
= strrchr(pathname
, '/');
1763 basename
= (basename
) ? basename
+1 : pathname
;
1765 prep_exclude(dir
, istate
, pathname
, basename
-pathname
);
1767 if (dir
->internal
.pattern
)
1768 return dir
->internal
.pattern
;
1770 return last_matching_pattern_from_lists(dir
, istate
, pathname
, pathlen
,
1775 * Loads the exclude lists for the directory containing pathname, then
1776 * scans all exclude lists to determine whether pathname is excluded.
1777 * Returns 1 if true, otherwise 0.
1779 int is_excluded(struct dir_struct
*dir
, struct index_state
*istate
,
1780 const char *pathname
, int *dtype_p
)
1782 struct path_pattern
*pattern
=
1783 last_matching_pattern(dir
, istate
, pathname
, dtype_p
);
1785 return pattern
->flags
& PATTERN_FLAG_NEGATIVE
? 0 : 1;
1789 static struct dir_entry
*dir_entry_new(const char *pathname
, int len
)
1791 struct dir_entry
*ent
;
1793 FLEX_ALLOC_MEM(ent
, name
, pathname
, len
);
1798 static struct dir_entry
*dir_add_name(struct dir_struct
*dir
,
1799 struct index_state
*istate
,
1800 const char *pathname
, int len
)
1802 if (index_file_exists(istate
, pathname
, len
, ignore_case
))
1805 ALLOC_GROW(dir
->entries
, dir
->nr
+1, dir
->internal
.alloc
);
1806 return dir
->entries
[dir
->nr
++] = dir_entry_new(pathname
, len
);
1809 struct dir_entry
*dir_add_ignored(struct dir_struct
*dir
,
1810 struct index_state
*istate
,
1811 const char *pathname
, int len
)
1813 if (!index_name_is_other(istate
, pathname
, len
))
1816 ALLOC_GROW(dir
->ignored
, dir
->ignored_nr
+1, dir
->internal
.ignored_alloc
);
1817 return dir
->ignored
[dir
->ignored_nr
++] = dir_entry_new(pathname
, len
);
1821 index_nonexistent
= 0,
1827 * Do not use the alphabetically sorted index to look up
1828 * the directory name; instead, use the case insensitive
1831 static enum exist_status
directory_exists_in_index_icase(struct index_state
*istate
,
1832 const char *dirname
, int len
)
1834 struct cache_entry
*ce
;
1836 if (index_dir_exists(istate
, dirname
, len
))
1837 return index_directory
;
1839 ce
= index_file_exists(istate
, dirname
, len
, ignore_case
);
1840 if (ce
&& S_ISGITLINK(ce
->ce_mode
))
1841 return index_gitdir
;
1843 return index_nonexistent
;
1847 * The index sorts alphabetically by entry name, which
1848 * means that a gitlink sorts as '\0' at the end, while
1849 * a directory (which is defined not as an entry, but as
1850 * the files it contains) will sort with the '/' at the
1853 static enum exist_status
directory_exists_in_index(struct index_state
*istate
,
1854 const char *dirname
, int len
)
1859 return directory_exists_in_index_icase(istate
, dirname
, len
);
1861 pos
= index_name_pos(istate
, dirname
, len
);
1864 while (pos
< istate
->cache_nr
) {
1865 const struct cache_entry
*ce
= istate
->cache
[pos
++];
1866 unsigned char endchar
;
1868 if (strncmp(ce
->name
, dirname
, len
))
1870 endchar
= ce
->name
[len
];
1874 return index_directory
;
1875 if (!endchar
&& S_ISGITLINK(ce
->ce_mode
))
1876 return index_gitdir
;
1878 return index_nonexistent
;
1882 * When we find a directory when traversing the filesystem, we
1883 * have three distinct cases:
1886 * - see it as a directory
1889 * and which one we choose depends on a combination of existing
1890 * git index contents and the flags passed into the directory
1891 * traversal routine.
1893 * Case 1: If we *already* have entries in the index under that
1894 * directory name, we always recurse into the directory to see
1897 * Case 2: If we *already* have that directory name as a gitlink,
1898 * we always continue to see it as a gitlink, regardless of whether
1899 * there is an actual git directory there or not (it might not
1900 * be checked out as a subproject!)
1902 * Case 3: if we didn't have it in the index previously, we
1903 * have a few sub-cases:
1905 * (a) if DIR_SHOW_OTHER_DIRECTORIES flag is set, we show it as
1906 * just a directory, unless DIR_HIDE_EMPTY_DIRECTORIES is
1907 * also true, in which case we need to check if it contains any
1908 * untracked and / or ignored files.
1909 * (b) if it looks like a git directory and we don't have the
1910 * DIR_NO_GITLINKS flag, then we treat it as a gitlink, and
1911 * show it as a directory.
1912 * (c) otherwise, we recurse into it.
1914 static enum path_treatment
treat_directory(struct dir_struct
*dir
,
1915 struct index_state
*istate
,
1916 struct untracked_cache_dir
*untracked
,
1917 const char *dirname
, int len
, int baselen
, int excluded
,
1918 const struct pathspec
*pathspec
)
1921 * WARNING: From this function, you can return path_recurse or you
1922 * can call read_directory_recursive() (or neither), but
1923 * you CAN'T DO BOTH.
1925 enum path_treatment state
;
1926 int matches_how
= 0;
1927 int check_only
, stop_early
;
1928 int old_ignored_nr
, old_untracked_nr
;
1929 /* The "len-1" is to strip the final '/' */
1930 enum exist_status status
= directory_exists_in_index(istate
, dirname
, len
-1);
1932 if (status
== index_directory
)
1933 return path_recurse
;
1934 if (status
== index_gitdir
)
1936 if (status
!= index_nonexistent
)
1937 BUG("Unhandled value for directory_exists_in_index: %d\n", status
);
1940 * We don't want to descend into paths that don't match the necessary
1941 * patterns. Clearly, if we don't have a pathspec, then we can't check
1942 * for matching patterns. Also, if (excluded) then we know we matched
1943 * the exclusion patterns so as an optimization we can skip checking
1944 * for matching patterns.
1946 if (pathspec
&& !excluded
) {
1947 matches_how
= match_pathspec_with_flags(istate
, pathspec
,
1951 DO_MATCH_LEADING_PATHSPEC
);
1957 if ((dir
->flags
& DIR_SKIP_NESTED_GIT
) ||
1958 !(dir
->flags
& DIR_NO_GITLINKS
)) {
1960 * Determine if `dirname` is a nested repo by confirming that:
1961 * 1) we are in a nonbare repository, and
1962 * 2) `dirname` is not an immediate parent of `the_repository->gitdir`,
1963 * which could occur if the git_dir or worktree location was
1964 * manually configured by the user; see t2205 testcases 1-3 for
1965 * examples where this matters
1968 struct strbuf sb
= STRBUF_INIT
;
1969 strbuf_addstr(&sb
, dirname
);
1970 nested_repo
= is_nonbare_repository_dir(&sb
);
1973 char *real_dirname
, *real_gitdir
;
1974 strbuf_addstr(&sb
, ".git");
1975 real_dirname
= real_pathdup(sb
.buf
, 1);
1976 real_gitdir
= real_pathdup(the_repository
->gitdir
, 1);
1978 nested_repo
= !!strcmp(real_dirname
, real_gitdir
);
1982 strbuf_release(&sb
);
1985 if ((dir
->flags
& DIR_SKIP_NESTED_GIT
) ||
1986 (matches_how
== MATCHED_RECURSIVELY_LEADING_PATHSPEC
))
1988 return excluded
? path_excluded
: path_untracked
;
1992 if (!(dir
->flags
& DIR_SHOW_OTHER_DIRECTORIES
)) {
1994 (dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
1995 (dir
->flags
& DIR_SHOW_IGNORED_TOO_MODE_MATCHING
)) {
1998 * This is an excluded directory and we are
1999 * showing ignored paths that match an exclude
2000 * pattern. (e.g. show directory as ignored
2001 * only if it matches an exclude pattern).
2002 * This path will either be 'path_excluded`
2003 * (if we are showing empty directories or if
2004 * the directory is not empty), or will be
2005 * 'path_none' (empty directory, and we are
2006 * not showing empty directories).
2008 if (!(dir
->flags
& DIR_HIDE_EMPTY_DIRECTORIES
))
2009 return path_excluded
;
2011 if (read_directory_recursive(dir
, istate
, dirname
, len
,
2012 untracked
, 1, 1, pathspec
) == path_excluded
)
2013 return path_excluded
;
2017 return path_recurse
;
2020 assert(dir
->flags
& DIR_SHOW_OTHER_DIRECTORIES
);
2023 * If we have a pathspec which could match something _below_ this
2024 * directory (e.g. when checking 'subdir/' having a pathspec like
2025 * 'subdir/some/deep/path/file' or 'subdir/widget-*.c'), then we
2028 if (matches_how
== MATCHED_RECURSIVELY_LEADING_PATHSPEC
)
2029 return path_recurse
;
2031 /* Special cases for where this directory is excluded/ignored */
2034 * If DIR_SHOW_OTHER_DIRECTORIES is set and we're not
2035 * hiding empty directories, there is no need to
2036 * recurse into an ignored directory.
2038 if (!(dir
->flags
& DIR_HIDE_EMPTY_DIRECTORIES
))
2039 return path_excluded
;
2042 * Even if we are hiding empty directories, we can still avoid
2043 * recursing into ignored directories for DIR_SHOW_IGNORED_TOO
2044 * if DIR_SHOW_IGNORED_TOO_MODE_MATCHING is also set.
2046 if ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
2047 (dir
->flags
& DIR_SHOW_IGNORED_TOO_MODE_MATCHING
))
2048 return path_excluded
;
2052 * Other than the path_recurse case above, we only need to
2053 * recurse into untracked directories if any of the following
2055 * - DIR_SHOW_IGNORED (because then we need to determine if
2056 * there are ignored entries below)
2057 * - DIR_SHOW_IGNORED_TOO (same as above)
2058 * - DIR_HIDE_EMPTY_DIRECTORIES (because we have to determine if
2059 * the directory is empty)
2062 !(dir
->flags
& (DIR_SHOW_IGNORED
|
2063 DIR_SHOW_IGNORED_TOO
|
2064 DIR_HIDE_EMPTY_DIRECTORIES
))) {
2065 return path_untracked
;
2069 * Even if we don't want to know all the paths under an untracked or
2070 * ignored directory, we may still need to go into the directory to
2071 * determine if it is empty (because with DIR_HIDE_EMPTY_DIRECTORIES,
2072 * an empty directory should be path_none instead of path_excluded or
2075 check_only
= ((dir
->flags
& DIR_HIDE_EMPTY_DIRECTORIES
) &&
2076 !(dir
->flags
& DIR_SHOW_IGNORED_TOO
));
2079 * However, there's another optimization possible as a subset of
2080 * check_only, based on the cases we have to consider:
2081 * A) Directory matches no exclude patterns:
2082 * * Directory is empty => path_none
2083 * * Directory has an untracked file under it => path_untracked
2084 * * Directory has only ignored files under it => path_excluded
2085 * B) Directory matches an exclude pattern:
2086 * * Directory is empty => path_none
2087 * * Directory has an untracked file under it => path_excluded
2088 * * Directory has only ignored files under it => path_excluded
2089 * In case A, we can exit as soon as we've found an untracked
2090 * file but otherwise have to walk all files. In case B, though,
2091 * we can stop at the first file we find under the directory.
2093 stop_early
= check_only
&& excluded
;
2096 * If /every/ file within an untracked directory is ignored, then
2097 * we want to treat the directory as ignored (for e.g. status
2098 * --porcelain), without listing the individual ignored files
2099 * underneath. To do so, we'll save the current ignored_nr, and
2100 * pop all the ones added after it if it turns out the entire
2101 * directory is ignored. Also, when DIR_SHOW_IGNORED_TOO and
2102 * !DIR_KEEP_UNTRACKED_CONTENTS then we don't want to show
2103 * untracked paths so will need to pop all those off the last
2104 * after we traverse.
2106 old_ignored_nr
= dir
->ignored_nr
;
2107 old_untracked_nr
= dir
->nr
;
2109 /* Actually recurse into dirname now, we'll fixup the state later. */
2110 untracked
= lookup_untracked(dir
->untracked
, untracked
,
2111 dirname
+ baselen
, len
- baselen
);
2112 state
= read_directory_recursive(dir
, istate
, dirname
, len
, untracked
,
2113 check_only
, stop_early
, pathspec
);
2115 /* There are a variety of reasons we may need to fixup the state... */
2116 if (state
== path_excluded
) {
2117 /* state == path_excluded implies all paths under
2118 * dirname were ignored...
2120 * if running e.g. `git status --porcelain --ignored=matching`,
2121 * then we want to see the subpaths that are ignored.
2123 * if running e.g. just `git status --porcelain`, then
2124 * we just want the directory itself to be listed as ignored
2125 * and not the individual paths underneath.
2127 int want_ignored_subpaths
=
2128 ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
2129 (dir
->flags
& DIR_SHOW_IGNORED_TOO_MODE_MATCHING
));
2131 if (want_ignored_subpaths
) {
2133 * with --ignored=matching, we want the subpaths
2134 * INSTEAD of the directory itself.
2139 for (i
= old_ignored_nr
+ 1; i
<dir
->ignored_nr
; ++i
)
2140 FREE_AND_NULL(dir
->ignored
[i
]);
2141 dir
->ignored_nr
= old_ignored_nr
;
2146 * We may need to ignore some of the untracked paths we found while
2147 * traversing subdirectories.
2149 if ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
2150 !(dir
->flags
& DIR_KEEP_UNTRACKED_CONTENTS
)) {
2152 for (i
= old_untracked_nr
+ 1; i
<dir
->nr
; ++i
)
2153 FREE_AND_NULL(dir
->entries
[i
]);
2154 dir
->nr
= old_untracked_nr
;
2158 * If there is nothing under the current directory and we are not
2159 * hiding empty directories, then we need to report on the
2160 * untracked or ignored status of the directory itself.
2162 if (state
== path_none
&& !(dir
->flags
& DIR_HIDE_EMPTY_DIRECTORIES
))
2163 state
= excluded
? path_excluded
: path_untracked
;
2169 * This is an inexact early pruning of any recursive directory
2170 * reading - if the path cannot possibly be in the pathspec,
2171 * return true, and we'll skip it early.
2173 static int simplify_away(const char *path
, int pathlen
,
2174 const struct pathspec
*pathspec
)
2178 if (!pathspec
|| !pathspec
->nr
)
2181 GUARD_PATHSPEC(pathspec
,
2190 for (i
= 0; i
< pathspec
->nr
; i
++) {
2191 const struct pathspec_item
*item
= &pathspec
->items
[i
];
2192 int len
= item
->nowildcard_len
;
2196 if (!ps_strncmp(item
, item
->match
, path
, len
))
2204 * This function tells us whether an excluded path matches a
2205 * list of "interesting" pathspecs. That is, whether a path matched
2206 * by any of the pathspecs could possibly be ignored by excluding
2207 * the specified path. This can happen if:
2209 * 1. the path is mentioned explicitly in the pathspec
2211 * 2. the path is a directory prefix of some element in the
2214 static int exclude_matches_pathspec(const char *path
, int pathlen
,
2215 const struct pathspec
*pathspec
)
2219 if (!pathspec
|| !pathspec
->nr
)
2222 GUARD_PATHSPEC(pathspec
,
2231 for (i
= 0; i
< pathspec
->nr
; i
++) {
2232 const struct pathspec_item
*item
= &pathspec
->items
[i
];
2233 int len
= item
->nowildcard_len
;
2235 if (len
== pathlen
&&
2236 !ps_strncmp(item
, item
->match
, path
, pathlen
))
2238 if (len
> pathlen
&&
2239 item
->match
[pathlen
] == '/' &&
2240 !ps_strncmp(item
, item
->match
, path
, pathlen
))
2246 static int get_index_dtype(struct index_state
*istate
,
2247 const char *path
, int len
)
2250 const struct cache_entry
*ce
;
2252 ce
= index_file_exists(istate
, path
, len
, 0);
2254 if (!ce_uptodate(ce
))
2256 if (S_ISGITLINK(ce
->ce_mode
))
2259 * Nobody actually cares about the
2260 * difference between DT_LNK and DT_REG
2265 /* Try to look it up as a directory */
2266 pos
= index_name_pos(istate
, path
, len
);
2270 while (pos
< istate
->cache_nr
) {
2271 ce
= istate
->cache
[pos
++];
2272 if (strncmp(ce
->name
, path
, len
))
2274 if (ce
->name
[len
] > '/')
2276 if (ce
->name
[len
] < '/')
2278 if (!ce_uptodate(ce
))
2279 break; /* continue? */
2285 unsigned char get_dtype(struct dirent
*e
, struct strbuf
*path
,
2289 unsigned char dtype
= DTYPE(e
);
2290 size_t base_path_len
;
2292 if (dtype
!= DT_UNKNOWN
&& !(follow_symlink
&& dtype
== DT_LNK
))
2296 * d_type unknown or unfollowed symlink, try to fall back on [l]stat
2297 * results. If [l]stat fails, explicitly set DT_UNKNOWN.
2299 base_path_len
= path
->len
;
2300 strbuf_addstr(path
, e
->d_name
);
2301 if ((follow_symlink
&& stat(path
->buf
, &st
)) ||
2302 (!follow_symlink
&& lstat(path
->buf
, &st
)))
2305 /* determine d_type from st_mode */
2306 if (S_ISREG(st
.st_mode
))
2308 else if (S_ISDIR(st
.st_mode
))
2310 else if (S_ISLNK(st
.st_mode
))
2314 strbuf_setlen(path
, base_path_len
);
2318 static int resolve_dtype(int dtype
, struct index_state
*istate
,
2319 const char *path
, int len
)
2323 if (dtype
!= DT_UNKNOWN
)
2325 dtype
= get_index_dtype(istate
, path
, len
);
2326 if (dtype
!= DT_UNKNOWN
)
2328 if (lstat(path
, &st
))
2330 if (S_ISREG(st
.st_mode
))
2332 if (S_ISDIR(st
.st_mode
))
2334 if (S_ISLNK(st
.st_mode
))
2339 static enum path_treatment
treat_path_fast(struct dir_struct
*dir
,
2340 struct cached_dir
*cdir
,
2341 struct index_state
*istate
,
2342 struct strbuf
*path
,
2344 const struct pathspec
*pathspec
)
2347 * WARNING: From this function, you can return path_recurse or you
2348 * can call read_directory_recursive() (or neither), but
2349 * you CAN'T DO BOTH.
2351 strbuf_setlen(path
, baselen
);
2353 strbuf_addstr(path
, cdir
->file
);
2354 return path_untracked
;
2356 strbuf_addstr(path
, cdir
->ucd
->name
);
2357 /* treat_one_path() does this before it calls treat_directory() */
2358 strbuf_complete(path
, '/');
2359 if (cdir
->ucd
->check_only
)
2361 * check_only is set as a result of treat_directory() getting
2362 * to its bottom. Verify again the same set of directories
2363 * with check_only set.
2365 return read_directory_recursive(dir
, istate
, path
->buf
, path
->len
,
2366 cdir
->ucd
, 1, 0, pathspec
);
2368 * We get path_recurse in the first run when
2369 * directory_exists_in_index() returns index_nonexistent. We
2370 * are sure that new changes in the index does not impact the
2371 * outcome. Return now.
2373 return path_recurse
;
2376 static enum path_treatment
treat_path(struct dir_struct
*dir
,
2377 struct untracked_cache_dir
*untracked
,
2378 struct cached_dir
*cdir
,
2379 struct index_state
*istate
,
2380 struct strbuf
*path
,
2382 const struct pathspec
*pathspec
)
2384 int has_path_in_index
, dtype
, excluded
;
2387 return treat_path_fast(dir
, cdir
, istate
, path
,
2389 if (is_dot_or_dotdot(cdir
->d_name
) || !fspathcmp(cdir
->d_name
, ".git"))
2391 strbuf_setlen(path
, baselen
);
2392 strbuf_addstr(path
, cdir
->d_name
);
2393 if (simplify_away(path
->buf
, path
->len
, pathspec
))
2396 dtype
= resolve_dtype(cdir
->d_type
, istate
, path
->buf
, path
->len
);
2398 /* Always exclude indexed files */
2399 has_path_in_index
= !!index_file_exists(istate
, path
->buf
, path
->len
,
2401 if (dtype
!= DT_DIR
&& has_path_in_index
)
2405 * When we are looking at a directory P in the working tree,
2406 * there are three cases:
2408 * (1) P exists in the index. Everything inside the directory P in
2409 * the working tree needs to go when P is checked out from the
2412 * (2) P does not exist in the index, but there is P/Q in the index.
2413 * We know P will stay a directory when we check out the contents
2414 * of the index, but we do not know yet if there is a directory
2415 * P/Q in the working tree to be killed, so we need to recurse.
2417 * (3) P does not exist in the index, and there is no P/Q in the index
2418 * to require P to be a directory, either. Only in this case, we
2419 * know that everything inside P will not be killed without
2422 if ((dir
->flags
& DIR_COLLECT_KILLED_ONLY
) &&
2423 (dtype
== DT_DIR
) &&
2424 !has_path_in_index
&&
2425 (directory_exists_in_index(istate
, path
->buf
, path
->len
) == index_nonexistent
))
2428 excluded
= is_excluded(dir
, istate
, path
->buf
, &dtype
);
2431 * Excluded? If we don't explicitly want to show
2432 * ignored files, ignore it
2434 if (excluded
&& !(dir
->flags
& (DIR_SHOW_IGNORED
|DIR_SHOW_IGNORED_TOO
)))
2435 return path_excluded
;
2442 * WARNING: Do not ignore/amend the return value from
2443 * treat_directory(), and especially do not change it to return
2444 * path_recurse as that can cause exponential slowdown.
2445 * Instead, modify treat_directory() to return the right value.
2447 strbuf_addch(path
, '/');
2448 return treat_directory(dir
, istate
, untracked
,
2449 path
->buf
, path
->len
,
2450 baselen
, excluded
, pathspec
);
2454 !match_pathspec(istate
, pathspec
, path
->buf
, path
->len
,
2455 0 /* prefix */, NULL
/* seen */,
2459 return path_excluded
;
2460 return path_untracked
;
2464 static void add_untracked(struct untracked_cache_dir
*dir
, const char *name
)
2468 ALLOC_GROW(dir
->untracked
, dir
->untracked_nr
+ 1,
2469 dir
->untracked_alloc
);
2470 dir
->untracked
[dir
->untracked_nr
++] = xstrdup(name
);
2473 static int valid_cached_dir(struct dir_struct
*dir
,
2474 struct untracked_cache_dir
*untracked
,
2475 struct index_state
*istate
,
2476 struct strbuf
*path
,
2485 * With fsmonitor, we can trust the untracked cache's valid field.
2487 refresh_fsmonitor(istate
);
2488 if (!(dir
->untracked
->use_fsmonitor
&& untracked
->valid
)) {
2489 if (lstat(path
->len
? path
->buf
: ".", &st
)) {
2490 memset(&untracked
->stat_data
, 0, sizeof(untracked
->stat_data
));
2493 if (!untracked
->valid
||
2494 match_stat_data_racy(istate
, &untracked
->stat_data
, &st
)) {
2495 fill_stat_data(&untracked
->stat_data
, &st
);
2500 if (untracked
->check_only
!= !!check_only
)
2504 * prep_exclude will be called eventually on this directory,
2505 * but it's called much later in last_matching_pattern(). We
2506 * need it now to determine the validity of the cache for this
2507 * path. The next calls will be nearly no-op, the way
2508 * prep_exclude() is designed.
2510 if (path
->len
&& path
->buf
[path
->len
- 1] != '/') {
2511 strbuf_addch(path
, '/');
2512 prep_exclude(dir
, istate
, path
->buf
, path
->len
);
2513 strbuf_setlen(path
, path
->len
- 1);
2515 prep_exclude(dir
, istate
, path
->buf
, path
->len
);
2517 /* hopefully prep_exclude() haven't invalidated this entry... */
2518 return untracked
->valid
;
2521 static int open_cached_dir(struct cached_dir
*cdir
,
2522 struct dir_struct
*dir
,
2523 struct untracked_cache_dir
*untracked
,
2524 struct index_state
*istate
,
2525 struct strbuf
*path
,
2530 memset(cdir
, 0, sizeof(*cdir
));
2531 cdir
->untracked
= untracked
;
2532 if (valid_cached_dir(dir
, untracked
, istate
, path
, check_only
))
2534 c_path
= path
->len
? path
->buf
: ".";
2535 cdir
->fdir
= opendir(c_path
);
2537 warning_errno(_("could not open directory '%s'"), c_path
);
2538 if (dir
->untracked
) {
2539 invalidate_directory(dir
->untracked
, untracked
);
2540 dir
->untracked
->dir_opened
++;
2547 static int read_cached_dir(struct cached_dir
*cdir
)
2552 de
= readdir_skip_dot_and_dotdot(cdir
->fdir
);
2554 cdir
->d_name
= NULL
;
2555 cdir
->d_type
= DT_UNKNOWN
;
2558 cdir
->d_name
= de
->d_name
;
2559 cdir
->d_type
= DTYPE(de
);
2562 while (cdir
->nr_dirs
< cdir
->untracked
->dirs_nr
) {
2563 struct untracked_cache_dir
*d
= cdir
->untracked
->dirs
[cdir
->nr_dirs
];
2573 if (cdir
->nr_files
< cdir
->untracked
->untracked_nr
) {
2574 struct untracked_cache_dir
*d
= cdir
->untracked
;
2575 cdir
->file
= d
->untracked
[cdir
->nr_files
++];
2581 static void close_cached_dir(struct cached_dir
*cdir
)
2584 closedir(cdir
->fdir
);
2586 * We have gone through this directory and found no untracked
2587 * entries. Mark it valid.
2589 if (cdir
->untracked
) {
2590 cdir
->untracked
->valid
= 1;
2591 cdir
->untracked
->recurse
= 1;
2595 static void add_path_to_appropriate_result_list(struct dir_struct
*dir
,
2596 struct untracked_cache_dir
*untracked
,
2597 struct cached_dir
*cdir
,
2598 struct index_state
*istate
,
2599 struct strbuf
*path
,
2601 const struct pathspec
*pathspec
,
2602 enum path_treatment state
)
2604 /* add the path to the appropriate result list */
2607 if (dir
->flags
& DIR_SHOW_IGNORED
)
2608 dir_add_name(dir
, istate
, path
->buf
, path
->len
);
2609 else if ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) ||
2610 ((dir
->flags
& DIR_COLLECT_IGNORED
) &&
2611 exclude_matches_pathspec(path
->buf
, path
->len
,
2613 dir_add_ignored(dir
, istate
, path
->buf
, path
->len
);
2616 case path_untracked
:
2617 if (dir
->flags
& DIR_SHOW_IGNORED
)
2619 dir_add_name(dir
, istate
, path
->buf
, path
->len
);
2621 add_untracked(untracked
, path
->buf
+ baselen
);
2630 * Read a directory tree. We currently ignore anything but
2631 * directories, regular files and symlinks. That's because git
2632 * doesn't handle them at all yet. Maybe that will change some
2635 * Also, we ignore the name ".git" (even if it is not a directory).
2636 * That likely will not change.
2638 * If 'stop_at_first_file' is specified, 'path_excluded' is returned
2639 * to signal that a file was found. This is the least significant value that
2640 * indicates that a file was encountered that does not depend on the order of
2641 * whether an untracked or excluded path was encountered first.
2643 * Returns the most significant path_treatment value encountered in the scan.
2644 * If 'stop_at_first_file' is specified, `path_excluded` is the most
2645 * significant path_treatment value that will be returned.
2648 static enum path_treatment
read_directory_recursive(struct dir_struct
*dir
,
2649 struct index_state
*istate
, const char *base
, int baselen
,
2650 struct untracked_cache_dir
*untracked
, int check_only
,
2651 int stop_at_first_file
, const struct pathspec
*pathspec
)
2654 * WARNING: Do NOT recurse unless path_recurse is returned from
2655 * treat_path(). Recursing on any other return value
2656 * can result in exponential slowdown.
2658 struct cached_dir cdir
;
2659 enum path_treatment state
, subdir_state
, dir_state
= path_none
;
2660 struct strbuf path
= STRBUF_INIT
;
2662 strbuf_add(&path
, base
, baselen
);
2664 if (open_cached_dir(&cdir
, dir
, untracked
, istate
, &path
, check_only
))
2666 dir
->internal
.visited_directories
++;
2669 untracked
->check_only
= !!check_only
;
2671 while (!read_cached_dir(&cdir
)) {
2672 /* check how the file or directory should be treated */
2673 state
= treat_path(dir
, untracked
, &cdir
, istate
, &path
,
2675 dir
->internal
.visited_paths
++;
2677 if (state
> dir_state
)
2680 /* recurse into subdir if instructed by treat_path */
2681 if (state
== path_recurse
) {
2682 struct untracked_cache_dir
*ud
;
2683 ud
= lookup_untracked(dir
->untracked
,
2686 path
.len
- baselen
);
2688 read_directory_recursive(dir
, istate
, path
.buf
,
2690 check_only
, stop_at_first_file
, pathspec
);
2691 if (subdir_state
> dir_state
)
2692 dir_state
= subdir_state
;
2695 !match_pathspec(istate
, pathspec
, path
.buf
, path
.len
,
2696 0 /* prefix */, NULL
,
2697 0 /* do NOT special case dirs */))
2702 if (stop_at_first_file
) {
2704 * If stopping at first file, then
2705 * signal that a file was found by
2706 * returning `path_excluded`. This is
2707 * to return a consistent value
2708 * regardless of whether an ignored or
2709 * excluded file happened to be
2712 * In current usage, the
2713 * `stop_at_first_file` is passed when
2714 * an ancestor directory has matched
2715 * an exclude pattern, so any found
2716 * files will be excluded.
2718 if (dir_state
>= path_excluded
) {
2719 dir_state
= path_excluded
;
2724 /* abort early if maximum state has been reached */
2725 if (dir_state
== path_untracked
) {
2727 add_untracked(untracked
, path
.buf
+ baselen
);
2730 /* skip the add_path_to_appropriate_result_list() */
2734 add_path_to_appropriate_result_list(dir
, untracked
, &cdir
,
2735 istate
, &path
, baselen
,
2738 close_cached_dir(&cdir
);
2740 strbuf_release(&path
);
2745 int cmp_dir_entry(const void *p1
, const void *p2
)
2747 const struct dir_entry
*e1
= *(const struct dir_entry
**)p1
;
2748 const struct dir_entry
*e2
= *(const struct dir_entry
**)p2
;
2750 return name_compare(e1
->name
, e1
->len
, e2
->name
, e2
->len
);
2753 /* check if *out lexically strictly contains *in */
2754 int check_dir_entry_contains(const struct dir_entry
*out
, const struct dir_entry
*in
)
2756 return (out
->len
< in
->len
) &&
2757 (out
->name
[out
->len
- 1] == '/') &&
2758 !memcmp(out
->name
, in
->name
, out
->len
);
2761 static int treat_leading_path(struct dir_struct
*dir
,
2762 struct index_state
*istate
,
2763 const char *path
, int len
,
2764 const struct pathspec
*pathspec
)
2766 struct strbuf sb
= STRBUF_INIT
;
2767 struct strbuf subdir
= STRBUF_INIT
;
2768 int prevlen
, baselen
;
2770 struct cached_dir cdir
;
2771 enum path_treatment state
= path_none
;
2774 * For each directory component of path, we are going to check whether
2775 * that path is relevant given the pathspec. For example, if path is
2777 * then we will ask treat_path() whether we should go into foo, then
2778 * whether we should go into bar, then whether baz is relevant.
2779 * Checking each is important because e.g. if path is
2781 * then we need to check .git to know we shouldn't traverse it.
2782 * If the return from treat_path() is:
2783 * * path_none, for any path, we return false.
2784 * * path_recurse, for all path components, we return true
2785 * * <anything else> for some intermediate component, we make sure
2786 * to add that path to the relevant list but return false
2787 * signifying that we shouldn't recurse into it.
2790 while (len
&& path
[len
- 1] == '/')
2795 memset(&cdir
, 0, sizeof(cdir
));
2796 cdir
.d_type
= DT_DIR
;
2800 prevlen
= baselen
+ !!baselen
;
2801 cp
= path
+ prevlen
;
2802 cp
= memchr(cp
, '/', path
+ len
- cp
);
2806 baselen
= cp
- path
;
2808 strbuf_add(&sb
, path
, baselen
);
2809 if (!is_directory(sb
.buf
))
2812 strbuf_add(&sb
, path
, prevlen
);
2813 strbuf_reset(&subdir
);
2814 strbuf_add(&subdir
, path
+prevlen
, baselen
-prevlen
);
2815 cdir
.d_name
= subdir
.buf
;
2816 state
= treat_path(dir
, NULL
, &cdir
, istate
, &sb
, prevlen
, pathspec
);
2818 if (state
!= path_recurse
)
2819 break; /* do not recurse into it */
2821 break; /* finished checking */
2823 add_path_to_appropriate_result_list(dir
, NULL
, &cdir
, istate
,
2824 &sb
, baselen
, pathspec
,
2827 strbuf_release(&subdir
);
2828 strbuf_release(&sb
);
2829 return state
== path_recurse
;
2832 static const char *get_ident_string(void)
2834 static struct strbuf sb
= STRBUF_INIT
;
2839 if (uname(&uts
) < 0)
2840 die_errno(_("failed to get kernel name and information"));
2841 strbuf_addf(&sb
, "Location %s, system %s", get_git_work_tree(),
2846 static int ident_in_untracked(const struct untracked_cache
*uc
)
2849 * Previous git versions may have saved many NUL separated
2850 * strings in the "ident" field, but it is insane to manage
2851 * many locations, so just take care of the first one.
2854 return !strcmp(uc
->ident
.buf
, get_ident_string());
2857 static void set_untracked_ident(struct untracked_cache
*uc
)
2859 strbuf_reset(&uc
->ident
);
2860 strbuf_addstr(&uc
->ident
, get_ident_string());
2863 * This strbuf used to contain a list of NUL separated
2864 * strings, so save NUL too for backward compatibility.
2866 strbuf_addch(&uc
->ident
, 0);
2869 static unsigned new_untracked_cache_flags(struct index_state
*istate
)
2871 struct repository
*repo
= istate
->repo
;
2875 * This logic is coordinated with the setting of these flags in
2876 * wt-status.c#wt_status_collect_untracked(), and the evaluation
2877 * of the config setting in commit.c#git_status_config()
2879 if (!repo_config_get_string(repo
, "status.showuntrackedfiles", &val
) &&
2880 !strcmp(val
, "all"))
2884 * The default, if "all" is not set, is "normal" - leading us here.
2885 * If the value is "none" then it really doesn't matter.
2887 return DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
2890 static void new_untracked_cache(struct index_state
*istate
, int flags
)
2892 struct untracked_cache
*uc
= xcalloc(1, sizeof(*uc
));
2893 strbuf_init(&uc
->ident
, 100);
2894 uc
->exclude_per_dir
= ".gitignore";
2895 uc
->dir_flags
= flags
>= 0 ? flags
: new_untracked_cache_flags(istate
);
2896 set_untracked_ident(uc
);
2897 istate
->untracked
= uc
;
2898 istate
->cache_changed
|= UNTRACKED_CHANGED
;
2901 void add_untracked_cache(struct index_state
*istate
)
2903 if (!istate
->untracked
) {
2904 new_untracked_cache(istate
, -1);
2906 if (!ident_in_untracked(istate
->untracked
)) {
2907 free_untracked_cache(istate
->untracked
);
2908 new_untracked_cache(istate
, -1);
2913 void remove_untracked_cache(struct index_state
*istate
)
2915 if (istate
->untracked
) {
2916 free_untracked_cache(istate
->untracked
);
2917 istate
->untracked
= NULL
;
2918 istate
->cache_changed
|= UNTRACKED_CHANGED
;
2922 static struct untracked_cache_dir
*validate_untracked_cache(struct dir_struct
*dir
,
2924 const struct pathspec
*pathspec
,
2925 struct index_state
*istate
)
2927 struct untracked_cache_dir
*root
;
2928 static int untracked_cache_disabled
= -1;
2930 if (!dir
->untracked
)
2932 if (untracked_cache_disabled
< 0)
2933 untracked_cache_disabled
= git_env_bool("GIT_DISABLE_UNTRACKED_CACHE", 0);
2934 if (untracked_cache_disabled
)
2938 * We only support $GIT_DIR/info/exclude and core.excludesfile
2939 * as the global ignore rule files. Any other additions
2940 * (e.g. from command line) invalidate the cache. This
2941 * condition also catches running setup_standard_excludes()
2942 * before setting dir->untracked!
2944 if (dir
->internal
.unmanaged_exclude_files
)
2948 * Optimize for the main use case only: whole-tree git
2949 * status. More work involved in treat_leading_path() if we
2950 * use cache on just a subset of the worktree. pathspec
2951 * support could make the matter even worse.
2953 if (base_len
|| (pathspec
&& pathspec
->nr
))
2956 /* We don't support collecting ignore files */
2957 if (dir
->flags
& (DIR_SHOW_IGNORED
| DIR_SHOW_IGNORED_TOO
|
2958 DIR_COLLECT_IGNORED
))
2962 * If we use .gitignore in the cache and now you change it to
2963 * .gitexclude, everything will go wrong.
2965 if (dir
->exclude_per_dir
!= dir
->untracked
->exclude_per_dir
&&
2966 strcmp(dir
->exclude_per_dir
, dir
->untracked
->exclude_per_dir
))
2970 * EXC_CMDL is not considered in the cache. If people set it,
2973 if (dir
->internal
.exclude_list_group
[EXC_CMDL
].nr
)
2976 if (!ident_in_untracked(dir
->untracked
)) {
2977 warning(_("untracked cache is disabled on this system or location"));
2982 * If the untracked structure we received does not have the same flags
2983 * as requested in this run, we're going to need to either discard the
2984 * existing structure (and potentially later recreate), or bypass the
2985 * untracked cache mechanism for this run.
2987 if (dir
->flags
!= dir
->untracked
->dir_flags
) {
2989 * If the untracked structure we received does not have the same flags
2990 * as configured, then we need to reset / create a new "untracked"
2991 * structure to match the new config.
2993 * Keeping the saved and used untracked cache consistent with the
2994 * configuration provides an opportunity for frequent users of
2995 * "git status -uall" to leverage the untracked cache by aligning their
2996 * configuration - setting "status.showuntrackedfiles" to "all" or
2997 * "normal" as appropriate.
2999 * Previously using -uall (or setting "status.showuntrackedfiles" to
3000 * "all") was incompatible with untracked cache and *consistently*
3001 * caused surprisingly bad performance (with fscache and fsmonitor
3002 * enabled) on Windows.
3004 * IMPROVEMENT OPPORTUNITY: If we reworked the untracked cache storage
3005 * to not be as bound up with the desired output in a given run,
3006 * and instead iterated through and stored enough information to
3007 * correctly serve both "modes", then users could get peak performance
3008 * with or without '-uall' regardless of their
3009 * "status.showuntrackedfiles" config.
3011 if (dir
->untracked
->dir_flags
!= new_untracked_cache_flags(istate
)) {
3012 free_untracked_cache(istate
->untracked
);
3013 new_untracked_cache(istate
, dir
->flags
);
3014 dir
->untracked
= istate
->untracked
;
3018 * Current untracked cache data is consistent with config, but not
3019 * usable in this request/run; just bypass untracked cache.
3025 if (!dir
->untracked
->root
) {
3026 /* Untracked cache existed but is not initialized; fix that */
3027 FLEX_ALLOC_STR(dir
->untracked
->root
, name
, "");
3028 istate
->cache_changed
|= UNTRACKED_CHANGED
;
3031 /* Validate $GIT_DIR/info/exclude and core.excludesfile */
3032 root
= dir
->untracked
->root
;
3033 if (!oideq(&dir
->internal
.ss_info_exclude
.oid
,
3034 &dir
->untracked
->ss_info_exclude
.oid
)) {
3035 invalidate_gitignore(dir
->untracked
, root
);
3036 dir
->untracked
->ss_info_exclude
= dir
->internal
.ss_info_exclude
;
3038 if (!oideq(&dir
->internal
.ss_excludes_file
.oid
,
3039 &dir
->untracked
->ss_excludes_file
.oid
)) {
3040 invalidate_gitignore(dir
->untracked
, root
);
3041 dir
->untracked
->ss_excludes_file
= dir
->internal
.ss_excludes_file
;
3044 /* Make sure this directory is not dropped out at saving phase */
3049 static void emit_traversal_statistics(struct dir_struct
*dir
,
3050 struct repository
*repo
,
3054 if (!trace2_is_enabled())
3058 trace2_data_string("read_directory", repo
, "path", "");
3060 struct strbuf tmp
= STRBUF_INIT
;
3061 strbuf_add(&tmp
, path
, path_len
);
3062 trace2_data_string("read_directory", repo
, "path", tmp
.buf
);
3063 strbuf_release(&tmp
);
3066 trace2_data_intmax("read_directory", repo
,
3067 "directories-visited", dir
->internal
.visited_directories
);
3068 trace2_data_intmax("read_directory", repo
,
3069 "paths-visited", dir
->internal
.visited_paths
);
3071 if (!dir
->untracked
)
3073 trace2_data_intmax("read_directory", repo
,
3074 "node-creation", dir
->untracked
->dir_created
);
3075 trace2_data_intmax("read_directory", repo
,
3076 "gitignore-invalidation",
3077 dir
->untracked
->gitignore_invalidated
);
3078 trace2_data_intmax("read_directory", repo
,
3079 "directory-invalidation",
3080 dir
->untracked
->dir_invalidated
);
3081 trace2_data_intmax("read_directory", repo
,
3082 "opendir", dir
->untracked
->dir_opened
);
3085 int read_directory(struct dir_struct
*dir
, struct index_state
*istate
,
3086 const char *path
, int len
, const struct pathspec
*pathspec
)
3088 struct untracked_cache_dir
*untracked
;
3090 trace2_region_enter("dir", "read_directory", istate
->repo
);
3091 dir
->internal
.visited_paths
= 0;
3092 dir
->internal
.visited_directories
= 0;
3094 if (has_symlink_leading_path(path
, len
)) {
3095 trace2_region_leave("dir", "read_directory", istate
->repo
);
3099 untracked
= validate_untracked_cache(dir
, len
, pathspec
, istate
);
3102 * make sure untracked cache code path is disabled,
3103 * e.g. prep_exclude()
3105 dir
->untracked
= NULL
;
3106 if (!len
|| treat_leading_path(dir
, istate
, path
, len
, pathspec
))
3107 read_directory_recursive(dir
, istate
, path
, len
, untracked
, 0, 0, pathspec
);
3108 QSORT(dir
->entries
, dir
->nr
, cmp_dir_entry
);
3109 QSORT(dir
->ignored
, dir
->ignored_nr
, cmp_dir_entry
);
3111 emit_traversal_statistics(dir
, istate
->repo
, path
, len
);
3113 trace2_region_leave("dir", "read_directory", istate
->repo
);
3114 if (dir
->untracked
) {
3115 static int force_untracked_cache
= -1;
3117 if (force_untracked_cache
< 0)
3118 force_untracked_cache
=
3119 git_env_bool("GIT_FORCE_UNTRACKED_CACHE", -1);
3120 if (force_untracked_cache
< 0)
3121 force_untracked_cache
= (istate
->repo
->settings
.core_untracked_cache
== UNTRACKED_CACHE_WRITE
);
3122 if (force_untracked_cache
&&
3123 dir
->untracked
== istate
->untracked
&&
3124 (dir
->untracked
->dir_opened
||
3125 dir
->untracked
->gitignore_invalidated
||
3126 dir
->untracked
->dir_invalidated
))
3127 istate
->cache_changed
|= UNTRACKED_CHANGED
;
3128 if (dir
->untracked
!= istate
->untracked
) {
3129 FREE_AND_NULL(dir
->untracked
);
3136 int file_exists(const char *f
)
3139 return lstat(f
, &sb
) == 0;
3142 int repo_file_exists(struct repository
*repo
, const char *path
)
3144 if (repo
!= the_repository
)
3145 BUG("do not know how to check file existence in arbitrary repo");
3147 return file_exists(path
);
3150 static int cmp_icase(char a
, char b
)
3155 return toupper(a
) - toupper(b
);
3160 * Given two normalized paths (a trailing slash is ok), if subdir is
3161 * outside dir, return -1. Otherwise return the offset in subdir that
3162 * can be used as relative path to dir.
3164 int dir_inside_of(const char *subdir
, const char *dir
)
3168 assert(dir
&& subdir
&& *dir
&& *subdir
);
3170 while (*dir
&& *subdir
&& !cmp_icase(*dir
, *subdir
)) {
3176 /* hel[p]/me vs hel[l]/yeah */
3177 if (*dir
&& *subdir
)
3181 return !*dir
? offset
: -1; /* same dir */
3183 /* foo/[b]ar vs foo/[] */
3184 if (is_dir_sep(dir
[-1]))
3185 return is_dir_sep(subdir
[-1]) ? offset
: -1;
3187 /* foo[/]bar vs foo[] */
3188 return is_dir_sep(*subdir
) ? offset
+ 1 : -1;
3191 int is_inside_dir(const char *dir
)
3200 rc
= (dir_inside_of(cwd
, dir
) >= 0);
3205 int is_empty_dir(const char *path
)
3207 DIR *dir
= opendir(path
);
3214 e
= readdir_skip_dot_and_dotdot(dir
);
3222 char *git_url_basename(const char *repo
, int is_bundle
, int is_bare
)
3224 const char *end
= repo
+ strlen(repo
), *start
, *ptr
;
3231 start
= strstr(repo
, "://");
3238 * Skip authentication data. The stripping does happen
3239 * greedily, such that we strip up to the last '@' inside
3242 for (ptr
= start
; ptr
< end
&& !is_dir_sep(*ptr
); ptr
++) {
3248 * Strip trailing spaces, slashes and /.git
3250 while (start
< end
&& (is_dir_sep(end
[-1]) || isspace(end
[-1])))
3252 if (end
- start
> 5 && is_dir_sep(end
[-5]) &&
3253 !strncmp(end
- 4, ".git", 4)) {
3255 while (start
< end
&& is_dir_sep(end
[-1]))
3260 * It should not be possible to overflow `ptrdiff_t` by passing in an
3261 * insanely long URL, but GCC does not know that and will complain
3262 * without this check.
3264 if (end
- start
< 0)
3265 die(_("No directory name could be guessed.\n"
3266 "Please specify a directory on the command line"));
3269 * Strip trailing port number if we've got only a
3270 * hostname (that is, there is no dir separator but a
3271 * colon). This check is required such that we do not
3272 * strip URI's like '/foo/bar:2222.git', which should
3273 * result in a dir '2222' being guessed due to backwards
3276 if (memchr(start
, '/', end
- start
) == NULL
3277 && memchr(start
, ':', end
- start
) != NULL
) {
3279 while (start
< ptr
&& isdigit(ptr
[-1]) && ptr
[-1] != ':')
3281 if (start
< ptr
&& ptr
[-1] == ':')
3286 * Find last component. To remain backwards compatible we
3287 * also regard colons as path separators, such that
3288 * cloning a repository 'foo:bar.git' would result in a
3289 * directory 'bar' being guessed.
3292 while (start
< ptr
&& !is_dir_sep(ptr
[-1]) && ptr
[-1] != ':')
3297 * Strip .{bundle,git}.
3300 strip_suffix_mem(start
, &len
, is_bundle
? ".bundle" : ".git");
3302 if (!len
|| (len
== 1 && *start
== '/'))
3303 die(_("No directory name could be guessed.\n"
3304 "Please specify a directory on the command line"));
3307 dir
= xstrfmt("%.*s.git", (int)len
, start
);
3309 dir
= xstrndup(start
, len
);
3311 * Replace sequences of 'control' characters and whitespace
3312 * with one ascii space, remove leading and trailing spaces.
3316 int prev_space
= 1 /* strip leading whitespace */;
3317 for (end
= dir
; *end
; ++end
) {
3319 if ((unsigned char)ch
< '\x20')
3330 if (out
> dir
&& prev_space
)
3336 void strip_dir_trailing_slashes(char *dir
)
3338 char *end
= dir
+ strlen(dir
);
3340 while (dir
< end
- 1 && is_dir_sep(end
[-1]))
3345 static int remove_dir_recurse(struct strbuf
*path
, int flag
, int *kept_up
)
3349 int ret
= 0, original_len
= path
->len
, len
, kept_down
= 0;
3350 int only_empty
= (flag
& REMOVE_DIR_EMPTY_ONLY
);
3351 int keep_toplevel
= (flag
& REMOVE_DIR_KEEP_TOPLEVEL
);
3352 int purge_original_cwd
= (flag
& REMOVE_DIR_PURGE_ORIGINAL_CWD
);
3353 struct object_id submodule_head
;
3355 if ((flag
& REMOVE_DIR_KEEP_NESTED_GIT
) &&
3356 !repo_resolve_gitlink_ref(the_repository
, path
->buf
,
3357 "HEAD", &submodule_head
)) {
3358 /* Do not descend and nuke a nested git work tree. */
3364 flag
&= ~REMOVE_DIR_KEEP_TOPLEVEL
;
3365 dir
= opendir(path
->buf
);
3367 if (errno
== ENOENT
)
3368 return keep_toplevel
? -1 : 0;
3369 else if (errno
== EACCES
&& !keep_toplevel
)
3371 * An empty dir could be removable even if it
3374 return rmdir(path
->buf
);
3378 strbuf_complete(path
, '/');
3381 while ((e
= readdir_skip_dot_and_dotdot(dir
)) != NULL
) {
3384 strbuf_setlen(path
, len
);
3385 strbuf_addstr(path
, e
->d_name
);
3386 if (lstat(path
->buf
, &st
)) {
3387 if (errno
== ENOENT
)
3389 * file disappeared, which is what we
3394 } else if (S_ISDIR(st
.st_mode
)) {
3395 if (!remove_dir_recurse(path
, flag
, &kept_down
))
3396 continue; /* happy */
3397 } else if (!only_empty
&&
3398 (!unlink(path
->buf
) || errno
== ENOENT
)) {
3399 continue; /* happy, too */
3402 /* path too long, stat fails, or non-directory still exists */
3408 strbuf_setlen(path
, original_len
);
3409 if (!ret
&& !keep_toplevel
&& !kept_down
) {
3410 if (!purge_original_cwd
&&
3411 startup_info
->original_cwd
&&
3412 !strcmp(startup_info
->original_cwd
, path
->buf
))
3413 ret
= -1; /* Do not remove current working directory */
3415 ret
= (!rmdir(path
->buf
) || errno
== ENOENT
) ? 0 : -1;
3418 * report the uplevel that it is not an error that we
3419 * did not rmdir() our directory.
3425 int remove_dir_recursively(struct strbuf
*path
, int flag
)
3427 return remove_dir_recurse(path
, flag
, NULL
);
3430 static GIT_PATH_FUNC(git_path_info_exclude
, "info/exclude")
3432 void setup_standard_excludes(struct dir_struct
*dir
)
3434 dir
->exclude_per_dir
= ".gitignore";
3436 /* core.excludesfile defaulting to $XDG_CONFIG_HOME/git/ignore */
3438 excludes_file
= xdg_config_home("ignore");
3439 if (excludes_file
&& !access_or_warn(excludes_file
, R_OK
, 0))
3440 add_patterns_from_file_1(dir
, excludes_file
,
3441 dir
->untracked
? &dir
->internal
.ss_excludes_file
: NULL
);
3443 /* per repository user preference */
3444 if (startup_info
->have_repository
) {
3445 const char *path
= git_path_info_exclude();
3446 if (!access_or_warn(path
, R_OK
, 0))
3447 add_patterns_from_file_1(dir
, path
,
3448 dir
->untracked
? &dir
->internal
.ss_info_exclude
: NULL
);
3452 char *get_sparse_checkout_filename(void)
3454 return git_pathdup("info/sparse-checkout");
3457 int get_sparse_checkout_patterns(struct pattern_list
*pl
)
3460 char *sparse_filename
= get_sparse_checkout_filename();
3462 pl
->use_cone_patterns
= core_sparse_checkout_cone
;
3463 res
= add_patterns_from_file_to_list(sparse_filename
, "", 0, pl
, NULL
, 0);
3465 free(sparse_filename
);
3469 int remove_path(const char *name
)
3473 if (unlink(name
) && !is_missing_file_error(errno
))
3476 slash
= strrchr(name
, '/');
3478 char *dirs
= xstrdup(name
);
3479 slash
= dirs
+ (slash
- name
);
3482 if (startup_info
->original_cwd
&&
3483 !strcmp(startup_info
->original_cwd
, dirs
))
3485 } while (rmdir(dirs
) == 0 && (slash
= strrchr(dirs
, '/')));
3492 * Frees memory within dir which was allocated, and resets fields for further
3493 * use. Does not free dir itself.
3495 void dir_clear(struct dir_struct
*dir
)
3498 struct exclude_list_group
*group
;
3499 struct pattern_list
*pl
;
3500 struct exclude_stack
*stk
;
3501 struct dir_struct
new = DIR_INIT
;
3503 for (i
= EXC_CMDL
; i
<= EXC_FILE
; i
++) {
3504 group
= &dir
->internal
.exclude_list_group
[i
];
3505 for (j
= 0; j
< group
->nr
; j
++) {
3508 free((char *)pl
->src
);
3509 clear_pattern_list(pl
);
3514 for (i
= 0; i
< dir
->ignored_nr
; i
++)
3515 free(dir
->ignored
[i
]);
3516 for (i
= 0; i
< dir
->nr
; i
++)
3517 free(dir
->entries
[i
]);
3521 stk
= dir
->internal
.exclude_stack
;
3523 struct exclude_stack
*prev
= stk
->prev
;
3527 strbuf_release(&dir
->internal
.basebuf
);
3529 memcpy(dir
, &new, sizeof(*dir
));
3532 struct ondisk_untracked_cache
{
3533 struct stat_data info_exclude_stat
;
3534 struct stat_data excludes_file_stat
;
3538 #define ouc_offset(x) offsetof(struct ondisk_untracked_cache, x)
3541 int index
; /* number of written untracked_cache_dir */
3542 struct ewah_bitmap
*check_only
; /* from untracked_cache_dir */
3543 struct ewah_bitmap
*valid
; /* from untracked_cache_dir */
3544 struct ewah_bitmap
*sha1_valid
; /* set if exclude_sha1 is not null */
3546 struct strbuf sb_stat
;
3547 struct strbuf sb_sha1
;
3550 static void stat_data_to_disk(struct stat_data
*to
, const struct stat_data
*from
)
3552 to
->sd_ctime
.sec
= htonl(from
->sd_ctime
.sec
);
3553 to
->sd_ctime
.nsec
= htonl(from
->sd_ctime
.nsec
);
3554 to
->sd_mtime
.sec
= htonl(from
->sd_mtime
.sec
);
3555 to
->sd_mtime
.nsec
= htonl(from
->sd_mtime
.nsec
);
3556 to
->sd_dev
= htonl(from
->sd_dev
);
3557 to
->sd_ino
= htonl(from
->sd_ino
);
3558 to
->sd_uid
= htonl(from
->sd_uid
);
3559 to
->sd_gid
= htonl(from
->sd_gid
);
3560 to
->sd_size
= htonl(from
->sd_size
);
3563 static void write_one_dir(struct untracked_cache_dir
*untracked
,
3564 struct write_data
*wd
)
3566 struct stat_data stat_data
;
3567 struct strbuf
*out
= &wd
->out
;
3568 unsigned char intbuf
[16];
3569 unsigned int intlen
, value
;
3570 int i
= wd
->index
++;
3573 * untracked_nr should be reset whenever valid is clear, but
3576 if (!untracked
->valid
) {
3577 untracked
->untracked_nr
= 0;
3578 untracked
->check_only
= 0;
3581 if (untracked
->check_only
)
3582 ewah_set(wd
->check_only
, i
);
3583 if (untracked
->valid
) {
3584 ewah_set(wd
->valid
, i
);
3585 stat_data_to_disk(&stat_data
, &untracked
->stat_data
);
3586 strbuf_add(&wd
->sb_stat
, &stat_data
, sizeof(stat_data
));
3588 if (!is_null_oid(&untracked
->exclude_oid
)) {
3589 ewah_set(wd
->sha1_valid
, i
);
3590 strbuf_add(&wd
->sb_sha1
, untracked
->exclude_oid
.hash
,
3591 the_hash_algo
->rawsz
);
3594 intlen
= encode_varint(untracked
->untracked_nr
, intbuf
);
3595 strbuf_add(out
, intbuf
, intlen
);
3597 /* skip non-recurse directories */
3598 for (i
= 0, value
= 0; i
< untracked
->dirs_nr
; i
++)
3599 if (untracked
->dirs
[i
]->recurse
)
3601 intlen
= encode_varint(value
, intbuf
);
3602 strbuf_add(out
, intbuf
, intlen
);
3604 strbuf_add(out
, untracked
->name
, strlen(untracked
->name
) + 1);
3606 for (i
= 0; i
< untracked
->untracked_nr
; i
++)
3607 strbuf_add(out
, untracked
->untracked
[i
],
3608 strlen(untracked
->untracked
[i
]) + 1);
3610 for (i
= 0; i
< untracked
->dirs_nr
; i
++)
3611 if (untracked
->dirs
[i
]->recurse
)
3612 write_one_dir(untracked
->dirs
[i
], wd
);
3615 void write_untracked_extension(struct strbuf
*out
, struct untracked_cache
*untracked
)
3617 struct ondisk_untracked_cache
*ouc
;
3618 struct write_data wd
;
3619 unsigned char varbuf
[16];
3621 const unsigned hashsz
= the_hash_algo
->rawsz
;
3623 CALLOC_ARRAY(ouc
, 1);
3624 stat_data_to_disk(&ouc
->info_exclude_stat
, &untracked
->ss_info_exclude
.stat
);
3625 stat_data_to_disk(&ouc
->excludes_file_stat
, &untracked
->ss_excludes_file
.stat
);
3626 ouc
->dir_flags
= htonl(untracked
->dir_flags
);
3628 varint_len
= encode_varint(untracked
->ident
.len
, varbuf
);
3629 strbuf_add(out
, varbuf
, varint_len
);
3630 strbuf_addbuf(out
, &untracked
->ident
);
3632 strbuf_add(out
, ouc
, sizeof(*ouc
));
3633 strbuf_add(out
, untracked
->ss_info_exclude
.oid
.hash
, hashsz
);
3634 strbuf_add(out
, untracked
->ss_excludes_file
.oid
.hash
, hashsz
);
3635 strbuf_add(out
, untracked
->exclude_per_dir
, strlen(untracked
->exclude_per_dir
) + 1);
3638 if (!untracked
->root
) {
3639 varint_len
= encode_varint(0, varbuf
);
3640 strbuf_add(out
, varbuf
, varint_len
);
3645 wd
.check_only
= ewah_new();
3646 wd
.valid
= ewah_new();
3647 wd
.sha1_valid
= ewah_new();
3648 strbuf_init(&wd
.out
, 1024);
3649 strbuf_init(&wd
.sb_stat
, 1024);
3650 strbuf_init(&wd
.sb_sha1
, 1024);
3651 write_one_dir(untracked
->root
, &wd
);
3653 varint_len
= encode_varint(wd
.index
, varbuf
);
3654 strbuf_add(out
, varbuf
, varint_len
);
3655 strbuf_addbuf(out
, &wd
.out
);
3656 ewah_serialize_strbuf(wd
.valid
, out
);
3657 ewah_serialize_strbuf(wd
.check_only
, out
);
3658 ewah_serialize_strbuf(wd
.sha1_valid
, out
);
3659 strbuf_addbuf(out
, &wd
.sb_stat
);
3660 strbuf_addbuf(out
, &wd
.sb_sha1
);
3661 strbuf_addch(out
, '\0'); /* safe guard for string lists */
3663 ewah_free(wd
.valid
);
3664 ewah_free(wd
.check_only
);
3665 ewah_free(wd
.sha1_valid
);
3666 strbuf_release(&wd
.out
);
3667 strbuf_release(&wd
.sb_stat
);
3668 strbuf_release(&wd
.sb_sha1
);
3671 static void free_untracked(struct untracked_cache_dir
*ucd
)
3676 for (i
= 0; i
< ucd
->dirs_nr
; i
++)
3677 free_untracked(ucd
->dirs
[i
]);
3678 for (i
= 0; i
< ucd
->untracked_nr
; i
++)
3679 free(ucd
->untracked
[i
]);
3680 free(ucd
->untracked
);
3685 void free_untracked_cache(struct untracked_cache
*uc
)
3690 free(uc
->exclude_per_dir_to_free
);
3691 strbuf_release(&uc
->ident
);
3692 free_untracked(uc
->root
);
3698 struct untracked_cache_dir
**ucd
;
3699 struct ewah_bitmap
*check_only
;
3700 struct ewah_bitmap
*valid
;
3701 struct ewah_bitmap
*sha1_valid
;
3702 const unsigned char *data
;
3703 const unsigned char *end
;
3706 static void stat_data_from_disk(struct stat_data
*to
, const unsigned char *data
)
3708 memcpy(to
, data
, sizeof(*to
));
3709 to
->sd_ctime
.sec
= ntohl(to
->sd_ctime
.sec
);
3710 to
->sd_ctime
.nsec
= ntohl(to
->sd_ctime
.nsec
);
3711 to
->sd_mtime
.sec
= ntohl(to
->sd_mtime
.sec
);
3712 to
->sd_mtime
.nsec
= ntohl(to
->sd_mtime
.nsec
);
3713 to
->sd_dev
= ntohl(to
->sd_dev
);
3714 to
->sd_ino
= ntohl(to
->sd_ino
);
3715 to
->sd_uid
= ntohl(to
->sd_uid
);
3716 to
->sd_gid
= ntohl(to
->sd_gid
);
3717 to
->sd_size
= ntohl(to
->sd_size
);
3720 static int read_one_dir(struct untracked_cache_dir
**untracked_
,
3721 struct read_data
*rd
)
3723 struct untracked_cache_dir ud
, *untracked
;
3724 const unsigned char *data
= rd
->data
, *end
= rd
->end
;
3725 const unsigned char *eos
;
3729 memset(&ud
, 0, sizeof(ud
));
3731 value
= decode_varint(&data
);
3735 ud
.untracked_alloc
= value
;
3736 ud
.untracked_nr
= value
;
3737 if (ud
.untracked_nr
)
3738 ALLOC_ARRAY(ud
.untracked
, ud
.untracked_nr
);
3740 ud
.dirs_alloc
= ud
.dirs_nr
= decode_varint(&data
);
3743 ALLOC_ARRAY(ud
.dirs
, ud
.dirs_nr
);
3745 eos
= memchr(data
, '\0', end
- data
);
3746 if (!eos
|| eos
== end
)
3749 *untracked_
= untracked
= xmalloc(st_add3(sizeof(*untracked
), eos
- data
, 1));
3750 memcpy(untracked
, &ud
, sizeof(ud
));
3751 memcpy(untracked
->name
, data
, eos
- data
+ 1);
3754 for (i
= 0; i
< untracked
->untracked_nr
; i
++) {
3755 eos
= memchr(data
, '\0', end
- data
);
3756 if (!eos
|| eos
== end
)
3758 untracked
->untracked
[i
] = xmemdupz(data
, eos
- data
);
3762 rd
->ucd
[rd
->index
++] = untracked
;
3765 for (i
= 0; i
< untracked
->dirs_nr
; i
++) {
3766 if (read_one_dir(untracked
->dirs
+ i
, rd
) < 0)
3772 static void set_check_only(size_t pos
, void *cb
)
3774 struct read_data
*rd
= cb
;
3775 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
3779 static void read_stat(size_t pos
, void *cb
)
3781 struct read_data
*rd
= cb
;
3782 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
3783 if (rd
->data
+ sizeof(struct stat_data
) > rd
->end
) {
3784 rd
->data
= rd
->end
+ 1;
3787 stat_data_from_disk(&ud
->stat_data
, rd
->data
);
3788 rd
->data
+= sizeof(struct stat_data
);
3792 static void read_oid(size_t pos
, void *cb
)
3794 struct read_data
*rd
= cb
;
3795 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
3796 if (rd
->data
+ the_hash_algo
->rawsz
> rd
->end
) {
3797 rd
->data
= rd
->end
+ 1;
3800 oidread(&ud
->exclude_oid
, rd
->data
, the_repository
->hash_algo
);
3801 rd
->data
+= the_hash_algo
->rawsz
;
3804 static void load_oid_stat(struct oid_stat
*oid_stat
, const unsigned char *data
,
3805 const unsigned char *sha1
)
3807 stat_data_from_disk(&oid_stat
->stat
, data
);
3808 oidread(&oid_stat
->oid
, sha1
, the_repository
->hash_algo
);
3809 oid_stat
->valid
= 1;
3812 struct untracked_cache
*read_untracked_extension(const void *data
, unsigned long sz
)
3814 struct untracked_cache
*uc
;
3815 struct read_data rd
;
3816 const unsigned char *next
= data
, *end
= (const unsigned char *)data
+ sz
;
3820 const char *exclude_per_dir
;
3821 const unsigned hashsz
= the_hash_algo
->rawsz
;
3822 const unsigned offset
= sizeof(struct ondisk_untracked_cache
);
3823 const unsigned exclude_per_dir_offset
= offset
+ 2 * hashsz
;
3825 if (sz
<= 1 || end
[-1] != '\0')
3829 ident_len
= decode_varint(&next
);
3830 if (next
+ ident_len
> end
)
3832 ident
= (const char *)next
;
3835 if (next
+ exclude_per_dir_offset
+ 1 > end
)
3838 CALLOC_ARRAY(uc
, 1);
3839 strbuf_init(&uc
->ident
, ident_len
);
3840 strbuf_add(&uc
->ident
, ident
, ident_len
);
3841 load_oid_stat(&uc
->ss_info_exclude
,
3842 next
+ ouc_offset(info_exclude_stat
),
3844 load_oid_stat(&uc
->ss_excludes_file
,
3845 next
+ ouc_offset(excludes_file_stat
),
3846 next
+ offset
+ hashsz
);
3847 uc
->dir_flags
= get_be32(next
+ ouc_offset(dir_flags
));
3848 exclude_per_dir
= (const char *)next
+ exclude_per_dir_offset
;
3849 uc
->exclude_per_dir
= uc
->exclude_per_dir_to_free
= xstrdup(exclude_per_dir
);
3850 /* NUL after exclude_per_dir is covered by sizeof(*ouc) */
3851 next
+= exclude_per_dir_offset
+ strlen(exclude_per_dir
) + 1;
3855 len
= decode_varint(&next
);
3856 if (next
> end
|| len
== 0)
3859 rd
.valid
= ewah_new();
3860 rd
.check_only
= ewah_new();
3861 rd
.sha1_valid
= ewah_new();
3865 ALLOC_ARRAY(rd
.ucd
, len
);
3867 if (read_one_dir(&uc
->root
, &rd
) || rd
.index
!= len
)
3871 len
= ewah_read_mmap(rd
.valid
, next
, end
- next
);
3876 len
= ewah_read_mmap(rd
.check_only
, next
, end
- next
);
3881 len
= ewah_read_mmap(rd
.sha1_valid
, next
, end
- next
);
3885 ewah_each_bit(rd
.check_only
, set_check_only
, &rd
);
3886 rd
.data
= next
+ len
;
3887 ewah_each_bit(rd
.valid
, read_stat
, &rd
);
3888 ewah_each_bit(rd
.sha1_valid
, read_oid
, &rd
);
3893 ewah_free(rd
.valid
);
3894 ewah_free(rd
.check_only
);
3895 ewah_free(rd
.sha1_valid
);
3898 free_untracked_cache(uc
);
3904 static void invalidate_one_directory(struct untracked_cache
*uc
,
3905 struct untracked_cache_dir
*ucd
)
3907 uc
->dir_invalidated
++;
3909 ucd
->untracked_nr
= 0;
3913 * Normally when an entry is added or removed from a directory,
3914 * invalidating that directory is enough. No need to touch its
3915 * ancestors. When a directory is shown as "foo/bar/" in git-status
3916 * however, deleting or adding an entry may have cascading effect.
3918 * Say the "foo/bar/file" has become untracked, we need to tell the
3919 * untracked_cache_dir of "foo" that "bar/" is not an untracked
3920 * directory any more (because "bar" is managed by foo as an untracked
3923 * Similarly, if "foo/bar/file" moves from untracked to tracked and it
3924 * was the last untracked entry in the entire "foo", we should show
3925 * "foo/" instead. Which means we have to invalidate past "bar" up to
3928 * This function traverses all directories from root to leaf. If there
3929 * is a chance of one of the above cases happening, we invalidate back
3930 * to root. Otherwise we just invalidate the leaf. There may be a more
3931 * sophisticated way than checking for SHOW_OTHER_DIRECTORIES to
3932 * detect these cases and avoid unnecessary invalidation, for example,
3933 * checking for the untracked entry named "bar/" in "foo", but for now
3934 * stick to something safe and simple.
3936 static int invalidate_one_component(struct untracked_cache
*uc
,
3937 struct untracked_cache_dir
*dir
,
3938 const char *path
, int len
)
3940 const char *rest
= strchr(path
, '/');
3943 int component_len
= rest
- path
;
3944 struct untracked_cache_dir
*d
=
3945 lookup_untracked(uc
, dir
, path
, component_len
);
3947 invalidate_one_component(uc
, d
, rest
+ 1,
3948 len
- (component_len
+ 1));
3950 invalidate_one_directory(uc
, dir
);
3954 invalidate_one_directory(uc
, dir
);
3955 return uc
->dir_flags
& DIR_SHOW_OTHER_DIRECTORIES
;
3958 void untracked_cache_invalidate_path(struct index_state
*istate
,
3959 const char *path
, int safe_path
)
3961 if (!istate
->untracked
|| !istate
->untracked
->root
)
3963 if (!safe_path
&& !verify_path(path
, 0))
3965 invalidate_one_component(istate
->untracked
, istate
->untracked
->root
,
3966 path
, strlen(path
));
3969 void untracked_cache_invalidate_trimmed_path(struct index_state
*istate
,
3973 size_t len
= strlen(path
);
3976 BUG("untracked_cache_invalidate_trimmed_path given zero length path");
3978 if (path
[len
- 1] != '/') {
3979 untracked_cache_invalidate_path(istate
, path
, safe_path
);
3981 struct strbuf tmp
= STRBUF_INIT
;
3983 strbuf_add(&tmp
, path
, len
- 1);
3984 untracked_cache_invalidate_path(istate
, tmp
.buf
, safe_path
);
3985 strbuf_release(&tmp
);
3989 void untracked_cache_remove_from_index(struct index_state
*istate
,
3992 untracked_cache_invalidate_path(istate
, path
, 1);
3995 void untracked_cache_add_to_index(struct index_state
*istate
,
3998 untracked_cache_invalidate_path(istate
, path
, 1);
4001 static void connect_wt_gitdir_in_nested(const char *sub_worktree
,
4002 const char *sub_gitdir
)
4005 struct repository subrepo
;
4006 struct strbuf sub_wt
= STRBUF_INIT
;
4007 struct strbuf sub_gd
= STRBUF_INIT
;
4009 const struct submodule
*sub
;
4011 /* If the submodule has no working tree, we can ignore it. */
4012 if (repo_init(&subrepo
, sub_gitdir
, sub_worktree
))
4015 if (repo_read_index(&subrepo
) < 0)
4016 die(_("index file corrupt in repo %s"), subrepo
.gitdir
);
4018 /* TODO: audit for interaction with sparse-index. */
4019 ensure_full_index(subrepo
.index
);
4020 for (i
= 0; i
< subrepo
.index
->cache_nr
; i
++) {
4021 const struct cache_entry
*ce
= subrepo
.index
->cache
[i
];
4023 if (!S_ISGITLINK(ce
->ce_mode
))
4026 while (i
+ 1 < subrepo
.index
->cache_nr
&&
4027 !strcmp(ce
->name
, subrepo
.index
->cache
[i
+ 1]->name
))
4029 * Skip entries with the same name in different stages
4030 * to make sure an entry is returned only once.
4034 sub
= submodule_from_path(&subrepo
, null_oid(), ce
->name
);
4035 if (!sub
|| !is_submodule_active(&subrepo
, ce
->name
))
4036 /* .gitmodules broken or inactive sub */
4039 strbuf_reset(&sub_wt
);
4040 strbuf_reset(&sub_gd
);
4041 strbuf_addf(&sub_wt
, "%s/%s", sub_worktree
, sub
->path
);
4042 submodule_name_to_gitdir(&sub_gd
, &subrepo
, sub
->name
);
4044 connect_work_tree_and_git_dir(sub_wt
.buf
, sub_gd
.buf
, 1);
4046 strbuf_release(&sub_wt
);
4047 strbuf_release(&sub_gd
);
4048 repo_clear(&subrepo
);
4051 void connect_work_tree_and_git_dir(const char *work_tree_
,
4052 const char *git_dir_
,
4053 int recurse_into_nested
)
4055 struct strbuf gitfile_sb
= STRBUF_INIT
;
4056 struct strbuf cfg_sb
= STRBUF_INIT
;
4057 struct strbuf rel_path
= STRBUF_INIT
;
4058 char *git_dir
, *work_tree
;
4060 /* Prepare .git file */
4061 strbuf_addf(&gitfile_sb
, "%s/.git", work_tree_
);
4062 if (safe_create_leading_directories_const(gitfile_sb
.buf
))
4063 die(_("could not create directories for %s"), gitfile_sb
.buf
);
4065 /* Prepare config file */
4066 strbuf_addf(&cfg_sb
, "%s/config", git_dir_
);
4067 if (safe_create_leading_directories_const(cfg_sb
.buf
))
4068 die(_("could not create directories for %s"), cfg_sb
.buf
);
4070 git_dir
= real_pathdup(git_dir_
, 1);
4071 work_tree
= real_pathdup(work_tree_
, 1);
4073 /* Write .git file */
4074 write_file(gitfile_sb
.buf
, "gitdir: %s",
4075 relative_path(git_dir
, work_tree
, &rel_path
));
4076 /* Update core.worktree setting */
4077 git_config_set_in_file(cfg_sb
.buf
, "core.worktree",
4078 relative_path(work_tree
, git_dir
, &rel_path
));
4080 strbuf_release(&gitfile_sb
);
4081 strbuf_release(&cfg_sb
);
4082 strbuf_release(&rel_path
);
4084 if (recurse_into_nested
)
4085 connect_wt_gitdir_in_nested(work_tree
, git_dir
);
4092 * Migrate the git directory of the given path from old_git_dir to new_git_dir.
4094 void relocate_gitdir(const char *path
, const char *old_git_dir
, const char *new_git_dir
)
4096 if (rename(old_git_dir
, new_git_dir
) < 0)
4097 die_errno(_("could not migrate git directory from '%s' to '%s'"),
4098 old_git_dir
, new_git_dir
);
4100 connect_work_tree_and_git_dir(path
, new_git_dir
, 0);
4103 int path_match_flags(const char *const str
, const enum path_match_flags flags
)
4105 const char *p
= str
;
4107 if (flags
& PATH_MATCH_NATIVE
&&
4108 flags
& PATH_MATCH_XPLATFORM
)
4109 BUG("path_match_flags() must get one match kind, not multiple!");
4110 else if (!(flags
& PATH_MATCH_KINDS_MASK
))
4111 BUG("path_match_flags() must get at least one match kind!");
4113 if (flags
& PATH_MATCH_STARTS_WITH_DOT_SLASH
&&
4114 flags
& PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH
)
4115 BUG("path_match_flags() must get one platform kind, not multiple!");
4116 else if (!(flags
& PATH_MATCH_PLATFORM_MASK
))
4117 BUG("path_match_flags() must get at least one platform kind!");
4121 if (flags
& PATH_MATCH_STARTS_WITH_DOT_DOT_SLASH
&&
4125 if (flags
& PATH_MATCH_NATIVE
)
4126 return is_dir_sep(*p
);
4127 else if (flags
& PATH_MATCH_XPLATFORM
)
4128 return is_xplatform_dir_sep(*p
);