2 * This handles recursive filename detection with exclude
3 * files, index knowledge etc..
5 * See Documentation/technical/api-directory-listing.txt
7 * Copyright (C) Linus Torvalds, 2005-2006
8 * Junio Hamano, 2005-2006
10 #define NO_THE_INDEX_COMPATIBILITY_MACROS
16 #include "wildmatch.h"
20 #include "ewah/ewok.h"
21 #include "fsmonitor.h"
22 #include "submodule-config.h"
25 * Tells read_directory_recursive how a file or directory should be treated.
26 * Values are ordered by significance, e.g. if a directory contains both
27 * excluded and untracked files, it is listed as untracked because
28 * path_untracked > path_excluded.
38 * Support data structure for our opendir/readdir/closedir wrappers
42 struct untracked_cache_dir
*untracked
;
48 struct untracked_cache_dir
*ucd
;
51 static enum path_treatment
read_directory_recursive(struct dir_struct
*dir
,
52 struct index_state
*istate
, const char *path
, int len
,
53 struct untracked_cache_dir
*untracked
,
54 int check_only
, int stop_at_first_file
, const struct pathspec
*pathspec
);
55 static int get_dtype(struct dirent
*de
, struct index_state
*istate
,
56 const char *path
, int len
);
58 int count_slashes(const char *s
)
67 int fspathcmp(const char *a
, const char *b
)
69 return ignore_case
? strcasecmp(a
, b
) : strcmp(a
, b
);
72 int fspathncmp(const char *a
, const char *b
, size_t count
)
74 return ignore_case
? strncasecmp(a
, b
, count
) : strncmp(a
, b
, count
);
77 int git_fnmatch(const struct pathspec_item
*item
,
78 const char *pattern
, const char *string
,
82 if (ps_strncmp(item
, pattern
, string
, prefix
))
87 if (item
->flags
& PATHSPEC_ONESTAR
) {
88 int pattern_len
= strlen(++pattern
);
89 int string_len
= strlen(string
);
90 return string_len
< pattern_len
||
91 ps_strcmp(item
, pattern
,
92 string
+ string_len
- pattern_len
);
94 if (item
->magic
& PATHSPEC_GLOB
)
95 return wildmatch(pattern
, string
,
97 (item
->magic
& PATHSPEC_ICASE
? WM_CASEFOLD
: 0));
99 /* wildmatch has not learned no FNM_PATHNAME mode yet */
100 return wildmatch(pattern
, string
,
101 item
->magic
& PATHSPEC_ICASE
? WM_CASEFOLD
: 0);
104 static int fnmatch_icase_mem(const char *pattern
, int patternlen
,
105 const char *string
, int stringlen
,
109 struct strbuf pat_buf
= STRBUF_INIT
;
110 struct strbuf str_buf
= STRBUF_INIT
;
111 const char *use_pat
= pattern
;
112 const char *use_str
= string
;
114 if (pattern
[patternlen
]) {
115 strbuf_add(&pat_buf
, pattern
, patternlen
);
116 use_pat
= pat_buf
.buf
;
118 if (string
[stringlen
]) {
119 strbuf_add(&str_buf
, string
, stringlen
);
120 use_str
= str_buf
.buf
;
124 flags
|= WM_CASEFOLD
;
125 match_status
= wildmatch(use_pat
, use_str
, flags
);
127 strbuf_release(&pat_buf
);
128 strbuf_release(&str_buf
);
133 static size_t common_prefix_len(const struct pathspec
*pathspec
)
139 * ":(icase)path" is treated as a pathspec full of
140 * wildcard. In other words, only prefix is considered common
141 * prefix. If the pathspec is abc/foo abc/bar, running in
142 * subdir xyz, the common prefix is still xyz, not xuz/abc as
145 GUARD_PATHSPEC(pathspec
,
154 for (n
= 0; n
< pathspec
->nr
; n
++) {
155 size_t i
= 0, len
= 0, item_len
;
156 if (pathspec
->items
[n
].magic
& PATHSPEC_EXCLUDE
)
158 if (pathspec
->items
[n
].magic
& PATHSPEC_ICASE
)
159 item_len
= pathspec
->items
[n
].prefix
;
161 item_len
= pathspec
->items
[n
].nowildcard_len
;
162 while (i
< item_len
&& (n
== 0 || i
< max
)) {
163 char c
= pathspec
->items
[n
].match
[i
];
164 if (c
!= pathspec
->items
[0].match
[i
])
170 if (n
== 0 || len
< max
) {
180 * Returns a copy of the longest leading path common among all
183 char *common_prefix(const struct pathspec
*pathspec
)
185 unsigned long len
= common_prefix_len(pathspec
);
187 return len
? xmemdupz(pathspec
->items
[0].match
, len
) : NULL
;
190 int fill_directory(struct dir_struct
*dir
,
191 struct index_state
*istate
,
192 const struct pathspec
*pathspec
)
198 * Calculate common prefix for the pathspec, and
199 * use that to optimize the directory walk
201 prefix_len
= common_prefix_len(pathspec
);
202 prefix
= prefix_len
? pathspec
->items
[0].match
: "";
204 /* Read the directory and prune it */
205 read_directory(dir
, istate
, prefix
, prefix_len
, pathspec
);
210 int within_depth(const char *name
, int namelen
,
211 int depth
, int max_depth
)
213 const char *cp
= name
, *cpe
= name
+ namelen
;
219 if (depth
> max_depth
)
226 * Read the contents of the blob with the given OID into a buffer.
227 * Append a trailing LF to the end if the last line doesn't have one.
230 * -1 when the OID is invalid or unknown or does not refer to a blob.
231 * 0 when the blob is empty.
232 * 1 along with { data, size } of the (possibly augmented) buffer
235 * Optionally updates the given sha1_stat with the given OID (when valid).
237 static int do_read_blob(const struct object_id
*oid
,
238 struct sha1_stat
*sha1_stat
,
242 enum object_type type
;
249 data
= read_sha1_file(oid
->hash
, &type
, &sz
);
250 if (!data
|| type
!= OBJ_BLOB
) {
256 memset(&sha1_stat
->stat
, 0, sizeof(sha1_stat
->stat
));
257 hashcpy(sha1_stat
->sha1
, oid
->hash
);
265 if (data
[sz
- 1] != '\n') {
266 data
= xrealloc(data
, st_add(sz
, 1));
270 *size_out
= xsize_t(sz
);
276 #define DO_MATCH_EXCLUDE (1<<0)
277 #define DO_MATCH_DIRECTORY (1<<1)
278 #define DO_MATCH_SUBMODULE (1<<2)
280 static int match_attrs(const char *name
, int namelen
,
281 const struct pathspec_item
*item
)
285 git_check_attr(name
, item
->attr_check
);
286 for (i
= 0; i
< item
->attr_match_nr
; i
++) {
289 enum attr_match_mode match_mode
;
291 value
= item
->attr_check
->items
[i
].value
;
292 match_mode
= item
->attr_match
[i
].match_mode
;
294 if (ATTR_TRUE(value
))
295 matched
= (match_mode
== MATCH_SET
);
296 else if (ATTR_FALSE(value
))
297 matched
= (match_mode
== MATCH_UNSET
);
298 else if (ATTR_UNSET(value
))
299 matched
= (match_mode
== MATCH_UNSPECIFIED
);
301 matched
= (match_mode
== MATCH_VALUE
&&
302 !strcmp(item
->attr_match
[i
].value
, value
));
311 * Does 'match' match the given name?
312 * A match is found if
314 * (1) the 'match' string is leading directory of 'name', or
315 * (2) the 'match' string is a wildcard and matches 'name', or
316 * (3) the 'match' string is exactly the same as 'name'.
318 * and the return value tells which case it was.
320 * It returns 0 when there is no match.
322 static int match_pathspec_item(const struct pathspec_item
*item
, int prefix
,
323 const char *name
, int namelen
, unsigned flags
)
325 /* name/namelen has prefix cut off by caller */
326 const char *match
= item
->match
+ prefix
;
327 int matchlen
= item
->len
- prefix
;
330 * The normal call pattern is:
331 * 1. prefix = common_prefix_len(ps);
332 * 2. prune something, or fill_directory
333 * 3. match_pathspec()
335 * 'prefix' at #1 may be shorter than the command's prefix and
336 * it's ok for #2 to match extra files. Those extras will be
339 * Suppose the pathspec is 'foo' and '../bar' running from
340 * subdir 'xyz'. The common prefix at #1 will be empty, thanks
341 * to "../". We may have xyz/foo _and_ XYZ/foo after #2. The
342 * user does not want XYZ/foo, only the "foo" part should be
343 * case-insensitive. We need to filter out XYZ/foo here. In
344 * other words, we do not trust the caller on comparing the
345 * prefix part when :(icase) is involved. We do exact
346 * comparison ourselves.
348 * Normally the caller (common_prefix_len() in fact) does
349 * _exact_ matching on name[-prefix+1..-1] and we do not need
350 * to check that part. Be defensive and check it anyway, in
351 * case common_prefix_len is changed, or a new caller is
352 * introduced that does not use common_prefix_len.
354 * If the penalty turns out too high when prefix is really
355 * long, maybe change it to
356 * strncmp(match, name, item->prefix - prefix)
358 if (item
->prefix
&& (item
->magic
& PATHSPEC_ICASE
) &&
359 strncmp(item
->match
, name
- prefix
, item
->prefix
))
362 if (item
->attr_match_nr
&& !match_attrs(name
, namelen
, item
))
365 /* If the match was just the prefix, we matched */
367 return MATCHED_RECURSIVELY
;
369 if (matchlen
<= namelen
&& !ps_strncmp(item
, match
, name
, matchlen
)) {
370 if (matchlen
== namelen
)
371 return MATCHED_EXACTLY
;
373 if (match
[matchlen
-1] == '/' || name
[matchlen
] == '/')
374 return MATCHED_RECURSIVELY
;
375 } else if ((flags
& DO_MATCH_DIRECTORY
) &&
376 match
[matchlen
- 1] == '/' &&
377 namelen
== matchlen
- 1 &&
378 !ps_strncmp(item
, match
, name
, namelen
))
379 return MATCHED_EXACTLY
;
381 if (item
->nowildcard_len
< item
->len
&&
382 !git_fnmatch(item
, match
, name
,
383 item
->nowildcard_len
- prefix
))
384 return MATCHED_FNMATCH
;
386 /* Perform checks to see if "name" is a super set of the pathspec */
387 if (flags
& DO_MATCH_SUBMODULE
) {
388 /* name is a literal prefix of the pathspec */
389 if ((namelen
< matchlen
) &&
390 (match
[namelen
] == '/') &&
391 !ps_strncmp(item
, match
, name
, namelen
))
392 return MATCHED_RECURSIVELY
;
394 /* name" doesn't match up to the first wild character */
395 if (item
->nowildcard_len
< item
->len
&&
396 ps_strncmp(item
, match
, name
,
397 item
->nowildcard_len
- prefix
))
401 * Here is where we would perform a wildmatch to check if
402 * "name" can be matched as a directory (or a prefix) against
403 * the pathspec. Since wildmatch doesn't have this capability
404 * at the present we have to punt and say that it is a match,
405 * potentially returning a false positive
406 * The submodules themselves will be able to perform more
407 * accurate matching to determine if the pathspec matches.
409 return MATCHED_RECURSIVELY
;
416 * Given a name and a list of pathspecs, returns the nature of the
417 * closest (i.e. most specific) match of the name to any of the
420 * The caller typically calls this multiple times with the same
421 * pathspec and seen[] array but with different name/namelen
422 * (e.g. entries from the index) and is interested in seeing if and
423 * how each pathspec matches all the names it calls this function
424 * with. A mark is left in the seen[] array for each pathspec element
425 * indicating the closest type of match that element achieved, so if
426 * seen[n] remains zero after multiple invocations, that means the nth
427 * pathspec did not match any names, which could indicate that the
428 * user mistyped the nth pathspec.
430 static int do_match_pathspec(const struct pathspec
*ps
,
431 const char *name
, int namelen
,
432 int prefix
, char *seen
,
435 int i
, retval
= 0, exclude
= flags
& DO_MATCH_EXCLUDE
;
447 if (!ps
->recursive
||
448 !(ps
->magic
& PATHSPEC_MAXDEPTH
) ||
450 return MATCHED_RECURSIVELY
;
452 if (within_depth(name
, namelen
, 0, ps
->max_depth
))
453 return MATCHED_EXACTLY
;
461 for (i
= ps
->nr
- 1; i
>= 0; i
--) {
464 if ((!exclude
&& ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
) ||
465 ( exclude
&& !(ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
)))
468 if (seen
&& seen
[i
] == MATCHED_EXACTLY
)
471 * Make exclude patterns optional and never report
472 * "pathspec ':(exclude)foo' matches no files"
474 if (seen
&& ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
)
475 seen
[i
] = MATCHED_FNMATCH
;
476 how
= match_pathspec_item(ps
->items
+i
, prefix
, name
,
479 (ps
->magic
& PATHSPEC_MAXDEPTH
) &&
480 ps
->max_depth
!= -1 &&
481 how
&& how
!= MATCHED_FNMATCH
) {
482 int len
= ps
->items
[i
].len
;
483 if (name
[len
] == '/')
485 if (within_depth(name
+len
, namelen
-len
, 0, ps
->max_depth
))
486 how
= MATCHED_EXACTLY
;
493 if (seen
&& seen
[i
] < how
)
500 int match_pathspec(const struct pathspec
*ps
,
501 const char *name
, int namelen
,
502 int prefix
, char *seen
, int is_dir
)
504 int positive
, negative
;
505 unsigned flags
= is_dir
? DO_MATCH_DIRECTORY
: 0;
506 positive
= do_match_pathspec(ps
, name
, namelen
,
507 prefix
, seen
, flags
);
508 if (!(ps
->magic
& PATHSPEC_EXCLUDE
) || !positive
)
510 negative
= do_match_pathspec(ps
, name
, namelen
,
512 flags
| DO_MATCH_EXCLUDE
);
513 return negative
? 0 : positive
;
517 * Check if a submodule is a superset of the pathspec
519 int submodule_path_match(const struct pathspec
*ps
,
520 const char *submodule_name
,
523 int matched
= do_match_pathspec(ps
, submodule_name
,
524 strlen(submodule_name
),
531 int report_path_error(const char *ps_matched
,
532 const struct pathspec
*pathspec
,
536 * Make sure all pathspec matched; otherwise it is an error.
539 for (num
= 0; num
< pathspec
->nr
; num
++) {
540 int other
, found_dup
;
545 * The caller might have fed identical pathspec
546 * twice. Do not barf on such a mistake.
547 * FIXME: parse_pathspec should have eliminated
548 * duplicate pathspec.
550 for (found_dup
= other
= 0;
551 !found_dup
&& other
< pathspec
->nr
;
553 if (other
== num
|| !ps_matched
[other
])
555 if (!strcmp(pathspec
->items
[other
].original
,
556 pathspec
->items
[num
].original
))
558 * Ok, we have a match already.
565 error("pathspec '%s' did not match any file(s) known to git.",
566 pathspec
->items
[num
].original
);
573 * Return the length of the "simple" part of a path match limiter.
575 int simple_length(const char *match
)
580 unsigned char c
= *match
++;
582 if (c
== '\0' || is_glob_special(c
))
587 int no_wildcard(const char *string
)
589 return string
[simple_length(string
)] == '\0';
592 void parse_exclude_pattern(const char **pattern
,
597 const char *p
= *pattern
;
602 *flags
|= EXC_FLAG_NEGATIVE
;
606 if (len
&& p
[len
- 1] == '/') {
608 *flags
|= EXC_FLAG_MUSTBEDIR
;
610 for (i
= 0; i
< len
; i
++) {
615 *flags
|= EXC_FLAG_NODIR
;
616 *nowildcardlen
= simple_length(p
);
618 * we should have excluded the trailing slash from 'p' too,
619 * but that's one more allocation. Instead just make sure
620 * nowildcardlen does not exceed real patternlen
622 if (*nowildcardlen
> len
)
623 *nowildcardlen
= len
;
624 if (*p
== '*' && no_wildcard(p
+ 1))
625 *flags
|= EXC_FLAG_ENDSWITH
;
630 void add_exclude(const char *string
, const char *base
,
631 int baselen
, struct exclude_list
*el
, int srcpos
)
638 parse_exclude_pattern(&string
, &patternlen
, &flags
, &nowildcardlen
);
639 if (flags
& EXC_FLAG_MUSTBEDIR
) {
640 FLEXPTR_ALLOC_MEM(x
, pattern
, string
, patternlen
);
642 x
= xmalloc(sizeof(*x
));
645 x
->patternlen
= patternlen
;
646 x
->nowildcardlen
= nowildcardlen
;
648 x
->baselen
= baselen
;
651 ALLOC_GROW(el
->excludes
, el
->nr
+ 1, el
->alloc
);
652 el
->excludes
[el
->nr
++] = x
;
656 static int read_skip_worktree_file_from_index(const struct index_state
*istate
,
660 struct sha1_stat
*sha1_stat
)
665 pos
= index_name_pos(istate
, path
, len
);
668 if (!ce_skip_worktree(istate
->cache
[pos
]))
671 return do_read_blob(&istate
->cache
[pos
]->oid
, sha1_stat
, size_out
, data_out
);
675 * Frees memory within el which was allocated for exclude patterns and
676 * the file buffer. Does not free el itself.
678 void clear_exclude_list(struct exclude_list
*el
)
682 for (i
= 0; i
< el
->nr
; i
++)
683 free(el
->excludes
[i
]);
687 memset(el
, 0, sizeof(*el
));
690 static void trim_trailing_spaces(char *buf
)
692 char *p
, *last_space
= NULL
;
694 for (p
= buf
; *p
; p
++)
714 * Given a subdirectory name and "dir" of the current directory,
715 * search the subdir in "dir" and return it, or create a new one if it
716 * does not exist in "dir".
718 * If "name" has the trailing slash, it'll be excluded in the search.
720 static struct untracked_cache_dir
*lookup_untracked(struct untracked_cache
*uc
,
721 struct untracked_cache_dir
*dir
,
722 const char *name
, int len
)
725 struct untracked_cache_dir
*d
;
728 if (len
&& name
[len
- 1] == '/')
732 while (last
> first
) {
733 int cmp
, next
= (last
+ first
) >> 1;
735 cmp
= strncmp(name
, d
->name
, len
);
736 if (!cmp
&& strlen(d
->name
) > len
)
748 FLEX_ALLOC_MEM(d
, name
, name
, len
);
750 ALLOC_GROW(dir
->dirs
, dir
->dirs_nr
+ 1, dir
->dirs_alloc
);
751 MOVE_ARRAY(dir
->dirs
+ first
+ 1, dir
->dirs
+ first
,
752 dir
->dirs_nr
- first
);
754 dir
->dirs
[first
] = d
;
758 static void do_invalidate_gitignore(struct untracked_cache_dir
*dir
)
762 dir
->untracked_nr
= 0;
763 for (i
= 0; i
< dir
->dirs_nr
; i
++)
764 do_invalidate_gitignore(dir
->dirs
[i
]);
767 static void invalidate_gitignore(struct untracked_cache
*uc
,
768 struct untracked_cache_dir
*dir
)
770 uc
->gitignore_invalidated
++;
771 do_invalidate_gitignore(dir
);
774 static void invalidate_directory(struct untracked_cache
*uc
,
775 struct untracked_cache_dir
*dir
)
778 uc
->dir_invalidated
++;
780 dir
->untracked_nr
= 0;
781 for (i
= 0; i
< dir
->dirs_nr
; i
++)
782 dir
->dirs
[i
]->recurse
= 0;
785 static int add_excludes_from_buffer(char *buf
, size_t size
,
786 const char *base
, int baselen
,
787 struct exclude_list
*el
);
790 * Given a file with name "fname", read it (either from disk, or from
791 * an index if 'istate' is non-null), parse it and store the
792 * exclude rules in "el".
794 * If "ss" is not NULL, compute SHA-1 of the exclude file and fill
795 * stat data from disk (only valid if add_excludes returns zero). If
796 * ss_valid is non-zero, "ss" must contain good value as input.
798 static int add_excludes(const char *fname
, const char *base
, int baselen
,
799 struct exclude_list
*el
,
800 struct index_state
*istate
,
801 struct sha1_stat
*sha1_stat
)
809 fd
= open(fname
, O_RDONLY
);
810 if (fd
< 0 || fstat(fd
, &st
) < 0) {
812 warn_on_fopen_errors(fname
);
817 r
= read_skip_worktree_file_from_index(istate
, fname
,
823 size
= xsize_t(st
.st_size
);
826 fill_stat_data(&sha1_stat
->stat
, &st
);
827 hashcpy(sha1_stat
->sha1
, EMPTY_BLOB_SHA1_BIN
);
828 sha1_stat
->valid
= 1;
833 buf
= xmallocz(size
);
834 if (read_in_full(fd
, buf
, size
) != size
) {
843 if (sha1_stat
->valid
&&
844 !match_stat_data_racy(istate
, &sha1_stat
->stat
, &st
))
845 ; /* no content change, ss->sha1 still good */
847 (pos
= index_name_pos(istate
, fname
, strlen(fname
))) >= 0 &&
848 !ce_stage(istate
->cache
[pos
]) &&
849 ce_uptodate(istate
->cache
[pos
]) &&
850 !would_convert_to_git(istate
, fname
))
851 hashcpy(sha1_stat
->sha1
,
852 istate
->cache
[pos
]->oid
.hash
);
854 hash_sha1_file(buf
, size
, "blob", sha1_stat
->sha1
);
855 fill_stat_data(&sha1_stat
->stat
, &st
);
856 sha1_stat
->valid
= 1;
860 add_excludes_from_buffer(buf
, size
, base
, baselen
, el
);
864 static int add_excludes_from_buffer(char *buf
, size_t size
,
865 const char *base
, int baselen
,
866 struct exclude_list
*el
)
873 if (skip_utf8_bom(&buf
, size
))
874 size
-= buf
- el
->filebuf
;
878 for (i
= 0; i
< size
; i
++) {
879 if (buf
[i
] == '\n') {
880 if (entry
!= buf
+ i
&& entry
[0] != '#') {
881 buf
[i
- (i
&& buf
[i
-1] == '\r')] = 0;
882 trim_trailing_spaces(entry
);
883 add_exclude(entry
, base
, baselen
, el
, lineno
);
892 int add_excludes_from_file_to_list(const char *fname
, const char *base
,
893 int baselen
, struct exclude_list
*el
,
894 struct index_state
*istate
)
896 return add_excludes(fname
, base
, baselen
, el
, istate
, NULL
);
899 int add_excludes_from_blob_to_list(
900 struct object_id
*oid
,
901 const char *base
, int baselen
,
902 struct exclude_list
*el
)
908 r
= do_read_blob(oid
, NULL
, &size
, &buf
);
912 add_excludes_from_buffer(buf
, size
, base
, baselen
, el
);
916 struct exclude_list
*add_exclude_list(struct dir_struct
*dir
,
917 int group_type
, const char *src
)
919 struct exclude_list
*el
;
920 struct exclude_list_group
*group
;
922 group
= &dir
->exclude_list_group
[group_type
];
923 ALLOC_GROW(group
->el
, group
->nr
+ 1, group
->alloc
);
924 el
= &group
->el
[group
->nr
++];
925 memset(el
, 0, sizeof(*el
));
931 * Used to set up core.excludesfile and .git/info/exclude lists.
933 static void add_excludes_from_file_1(struct dir_struct
*dir
, const char *fname
,
934 struct sha1_stat
*sha1_stat
)
936 struct exclude_list
*el
;
938 * catch setup_standard_excludes() that's called before
939 * dir->untracked is assigned. That function behaves
940 * differently when dir->untracked is non-NULL.
943 dir
->unmanaged_exclude_files
++;
944 el
= add_exclude_list(dir
, EXC_FILE
, fname
);
945 if (add_excludes(fname
, "", 0, el
, NULL
, sha1_stat
) < 0)
946 die("cannot use %s as an exclude file", fname
);
949 void add_excludes_from_file(struct dir_struct
*dir
, const char *fname
)
951 dir
->unmanaged_exclude_files
++; /* see validate_untracked_cache() */
952 add_excludes_from_file_1(dir
, fname
, NULL
);
955 int match_basename(const char *basename
, int basenamelen
,
956 const char *pattern
, int prefix
, int patternlen
,
959 if (prefix
== patternlen
) {
960 if (patternlen
== basenamelen
&&
961 !fspathncmp(pattern
, basename
, basenamelen
))
963 } else if (flags
& EXC_FLAG_ENDSWITH
) {
964 /* "*literal" matching against "fooliteral" */
965 if (patternlen
- 1 <= basenamelen
&&
966 !fspathncmp(pattern
+ 1,
967 basename
+ basenamelen
- (patternlen
- 1),
971 if (fnmatch_icase_mem(pattern
, patternlen
,
972 basename
, basenamelen
,
979 int match_pathname(const char *pathname
, int pathlen
,
980 const char *base
, int baselen
,
981 const char *pattern
, int prefix
, int patternlen
,
988 * match with FNM_PATHNAME; the pattern has base implicitly
991 if (*pattern
== '/') {
998 * baselen does not count the trailing slash. base[] may or
999 * may not end with a trailing slash though.
1001 if (pathlen
< baselen
+ 1 ||
1002 (baselen
&& pathname
[baselen
] != '/') ||
1003 fspathncmp(pathname
, base
, baselen
))
1006 namelen
= baselen
? pathlen
- baselen
- 1 : pathlen
;
1007 name
= pathname
+ pathlen
- namelen
;
1011 * if the non-wildcard part is longer than the
1012 * remaining pathname, surely it cannot match.
1014 if (prefix
> namelen
)
1017 if (fspathncmp(pattern
, name
, prefix
))
1020 patternlen
-= prefix
;
1025 * If the whole pattern did not have a wildcard,
1026 * then our prefix match is all we need; we
1027 * do not need to call fnmatch at all.
1029 if (!patternlen
&& !namelen
)
1033 return fnmatch_icase_mem(pattern
, patternlen
,
1039 * Scan the given exclude list in reverse to see whether pathname
1040 * should be ignored. The first match (i.e. the last on the list), if
1041 * any, determines the fate. Returns the exclude_list element which
1042 * matched, or NULL for undecided.
1044 static struct exclude
*last_exclude_matching_from_list(const char *pathname
,
1046 const char *basename
,
1048 struct exclude_list
*el
,
1049 struct index_state
*istate
)
1051 struct exclude
*exc
= NULL
; /* undecided */
1055 return NULL
; /* undefined */
1057 for (i
= el
->nr
- 1; 0 <= i
; i
--) {
1058 struct exclude
*x
= el
->excludes
[i
];
1059 const char *exclude
= x
->pattern
;
1060 int prefix
= x
->nowildcardlen
;
1062 if (x
->flags
& EXC_FLAG_MUSTBEDIR
) {
1063 if (*dtype
== DT_UNKNOWN
)
1064 *dtype
= get_dtype(NULL
, istate
, pathname
, pathlen
);
1065 if (*dtype
!= DT_DIR
)
1069 if (x
->flags
& EXC_FLAG_NODIR
) {
1070 if (match_basename(basename
,
1071 pathlen
- (basename
- pathname
),
1072 exclude
, prefix
, x
->patternlen
,
1080 assert(x
->baselen
== 0 || x
->base
[x
->baselen
- 1] == '/');
1081 if (match_pathname(pathname
, pathlen
,
1082 x
->base
, x
->baselen
? x
->baselen
- 1 : 0,
1083 exclude
, prefix
, x
->patternlen
, x
->flags
)) {
1092 * Scan the list and let the last match determine the fate.
1093 * Return 1 for exclude, 0 for include and -1 for undecided.
1095 int is_excluded_from_list(const char *pathname
,
1096 int pathlen
, const char *basename
, int *dtype
,
1097 struct exclude_list
*el
, struct index_state
*istate
)
1099 struct exclude
*exclude
;
1100 exclude
= last_exclude_matching_from_list(pathname
, pathlen
, basename
,
1103 return exclude
->flags
& EXC_FLAG_NEGATIVE
? 0 : 1;
1104 return -1; /* undecided */
1107 static struct exclude
*last_exclude_matching_from_lists(struct dir_struct
*dir
,
1108 struct index_state
*istate
,
1109 const char *pathname
, int pathlen
, const char *basename
,
1113 struct exclude_list_group
*group
;
1114 struct exclude
*exclude
;
1115 for (i
= EXC_CMDL
; i
<= EXC_FILE
; i
++) {
1116 group
= &dir
->exclude_list_group
[i
];
1117 for (j
= group
->nr
- 1; j
>= 0; j
--) {
1118 exclude
= last_exclude_matching_from_list(
1119 pathname
, pathlen
, basename
, dtype_p
,
1120 &group
->el
[j
], istate
);
1129 * Loads the per-directory exclude list for the substring of base
1130 * which has a char length of baselen.
1132 static void prep_exclude(struct dir_struct
*dir
,
1133 struct index_state
*istate
,
1134 const char *base
, int baselen
)
1136 struct exclude_list_group
*group
;
1137 struct exclude_list
*el
;
1138 struct exclude_stack
*stk
= NULL
;
1139 struct untracked_cache_dir
*untracked
;
1142 group
= &dir
->exclude_list_group
[EXC_DIRS
];
1145 * Pop the exclude lists from the EXCL_DIRS exclude_list_group
1146 * which originate from directories not in the prefix of the
1147 * path being checked.
1149 while ((stk
= dir
->exclude_stack
) != NULL
) {
1150 if (stk
->baselen
<= baselen
&&
1151 !strncmp(dir
->basebuf
.buf
, base
, stk
->baselen
))
1153 el
= &group
->el
[dir
->exclude_stack
->exclude_ix
];
1154 dir
->exclude_stack
= stk
->prev
;
1155 dir
->exclude
= NULL
;
1156 free((char *)el
->src
); /* see strbuf_detach() below */
1157 clear_exclude_list(el
);
1162 /* Skip traversing into sub directories if the parent is excluded */
1167 * Lazy initialization. All call sites currently just
1168 * memset(dir, 0, sizeof(*dir)) before use. Changing all of
1169 * them seems lots of work for little benefit.
1171 if (!dir
->basebuf
.buf
)
1172 strbuf_init(&dir
->basebuf
, PATH_MAX
);
1174 /* Read from the parent directories and push them down. */
1175 current
= stk
? stk
->baselen
: -1;
1176 strbuf_setlen(&dir
->basebuf
, current
< 0 ? 0 : current
);
1178 untracked
= stk
? stk
->ucd
: dir
->untracked
->root
;
1182 while (current
< baselen
) {
1184 struct sha1_stat sha1_stat
;
1186 stk
= xcalloc(1, sizeof(*stk
));
1191 cp
= strchr(base
+ current
+ 1, '/');
1193 die("oops in prep_exclude");
1196 lookup_untracked(dir
->untracked
, untracked
,
1198 cp
- base
- current
);
1200 stk
->prev
= dir
->exclude_stack
;
1201 stk
->baselen
= cp
- base
;
1202 stk
->exclude_ix
= group
->nr
;
1203 stk
->ucd
= untracked
;
1204 el
= add_exclude_list(dir
, EXC_DIRS
, NULL
);
1205 strbuf_add(&dir
->basebuf
, base
+ current
, stk
->baselen
- current
);
1206 assert(stk
->baselen
== dir
->basebuf
.len
);
1208 /* Abort if the directory is excluded */
1211 dir
->basebuf
.buf
[stk
->baselen
- 1] = 0;
1212 dir
->exclude
= last_exclude_matching_from_lists(dir
,
1214 dir
->basebuf
.buf
, stk
->baselen
- 1,
1215 dir
->basebuf
.buf
+ current
, &dt
);
1216 dir
->basebuf
.buf
[stk
->baselen
- 1] = '/';
1218 dir
->exclude
->flags
& EXC_FLAG_NEGATIVE
)
1219 dir
->exclude
= NULL
;
1221 dir
->exclude_stack
= stk
;
1226 /* Try to read per-directory file */
1227 hashclr(sha1_stat
.sha1
);
1228 sha1_stat
.valid
= 0;
1229 if (dir
->exclude_per_dir
&&
1231 * If we know that no files have been added in
1232 * this directory (i.e. valid_cached_dir() has
1233 * been executed and set untracked->valid) ..
1235 (!untracked
|| !untracked
->valid
||
1237 * .. and .gitignore does not exist before
1238 * (i.e. null exclude_sha1). Then we can skip
1239 * loading .gitignore, which would result in
1242 !is_null_sha1(untracked
->exclude_sha1
))) {
1244 * dir->basebuf gets reused by the traversal, but we
1245 * need fname to remain unchanged to ensure the src
1246 * member of each struct exclude correctly
1247 * back-references its source file. Other invocations
1248 * of add_exclude_list provide stable strings, so we
1249 * strbuf_detach() and free() here in the caller.
1251 struct strbuf sb
= STRBUF_INIT
;
1252 strbuf_addbuf(&sb
, &dir
->basebuf
);
1253 strbuf_addstr(&sb
, dir
->exclude_per_dir
);
1254 el
->src
= strbuf_detach(&sb
, NULL
);
1255 add_excludes(el
->src
, el
->src
, stk
->baselen
, el
, istate
,
1256 untracked
? &sha1_stat
: NULL
);
1259 * NEEDSWORK: when untracked cache is enabled, prep_exclude()
1260 * will first be called in valid_cached_dir() then maybe many
1261 * times more in last_exclude_matching(). When the cache is
1262 * used, last_exclude_matching() will not be called and
1263 * reading .gitignore content will be a waste.
1265 * So when it's called by valid_cached_dir() and we can get
1266 * .gitignore SHA-1 from the index (i.e. .gitignore is not
1267 * modified on work tree), we could delay reading the
1268 * .gitignore content until we absolutely need it in
1269 * last_exclude_matching(). Be careful about ignore rule
1270 * order, though, if you do that.
1273 hashcmp(sha1_stat
.sha1
, untracked
->exclude_sha1
)) {
1274 invalidate_gitignore(dir
->untracked
, untracked
);
1275 hashcpy(untracked
->exclude_sha1
, sha1_stat
.sha1
);
1277 dir
->exclude_stack
= stk
;
1278 current
= stk
->baselen
;
1280 strbuf_setlen(&dir
->basebuf
, baselen
);
1284 * Loads the exclude lists for the directory containing pathname, then
1285 * scans all exclude lists to determine whether pathname is excluded.
1286 * Returns the exclude_list element which matched, or NULL for
1289 struct exclude
*last_exclude_matching(struct dir_struct
*dir
,
1290 struct index_state
*istate
,
1291 const char *pathname
,
1294 int pathlen
= strlen(pathname
);
1295 const char *basename
= strrchr(pathname
, '/');
1296 basename
= (basename
) ? basename
+1 : pathname
;
1298 prep_exclude(dir
, istate
, pathname
, basename
-pathname
);
1301 return dir
->exclude
;
1303 return last_exclude_matching_from_lists(dir
, istate
, pathname
, pathlen
,
1308 * Loads the exclude lists for the directory containing pathname, then
1309 * scans all exclude lists to determine whether pathname is excluded.
1310 * Returns 1 if true, otherwise 0.
1312 int is_excluded(struct dir_struct
*dir
, struct index_state
*istate
,
1313 const char *pathname
, int *dtype_p
)
1315 struct exclude
*exclude
=
1316 last_exclude_matching(dir
, istate
, pathname
, dtype_p
);
1318 return exclude
->flags
& EXC_FLAG_NEGATIVE
? 0 : 1;
1322 static struct dir_entry
*dir_entry_new(const char *pathname
, int len
)
1324 struct dir_entry
*ent
;
1326 FLEX_ALLOC_MEM(ent
, name
, pathname
, len
);
1331 static struct dir_entry
*dir_add_name(struct dir_struct
*dir
,
1332 struct index_state
*istate
,
1333 const char *pathname
, int len
)
1335 if (index_file_exists(istate
, pathname
, len
, ignore_case
))
1338 ALLOC_GROW(dir
->entries
, dir
->nr
+1, dir
->alloc
);
1339 return dir
->entries
[dir
->nr
++] = dir_entry_new(pathname
, len
);
1342 struct dir_entry
*dir_add_ignored(struct dir_struct
*dir
,
1343 struct index_state
*istate
,
1344 const char *pathname
, int len
)
1346 if (!index_name_is_other(istate
, pathname
, len
))
1349 ALLOC_GROW(dir
->ignored
, dir
->ignored_nr
+1, dir
->ignored_alloc
);
1350 return dir
->ignored
[dir
->ignored_nr
++] = dir_entry_new(pathname
, len
);
1354 index_nonexistent
= 0,
1360 * Do not use the alphabetically sorted index to look up
1361 * the directory name; instead, use the case insensitive
1364 static enum exist_status
directory_exists_in_index_icase(struct index_state
*istate
,
1365 const char *dirname
, int len
)
1367 struct cache_entry
*ce
;
1369 if (index_dir_exists(istate
, dirname
, len
))
1370 return index_directory
;
1372 ce
= index_file_exists(istate
, dirname
, len
, ignore_case
);
1373 if (ce
&& S_ISGITLINK(ce
->ce_mode
))
1374 return index_gitdir
;
1376 return index_nonexistent
;
1380 * The index sorts alphabetically by entry name, which
1381 * means that a gitlink sorts as '\0' at the end, while
1382 * a directory (which is defined not as an entry, but as
1383 * the files it contains) will sort with the '/' at the
1386 static enum exist_status
directory_exists_in_index(struct index_state
*istate
,
1387 const char *dirname
, int len
)
1392 return directory_exists_in_index_icase(istate
, dirname
, len
);
1394 pos
= index_name_pos(istate
, dirname
, len
);
1397 while (pos
< istate
->cache_nr
) {
1398 const struct cache_entry
*ce
= istate
->cache
[pos
++];
1399 unsigned char endchar
;
1401 if (strncmp(ce
->name
, dirname
, len
))
1403 endchar
= ce
->name
[len
];
1407 return index_directory
;
1408 if (!endchar
&& S_ISGITLINK(ce
->ce_mode
))
1409 return index_gitdir
;
1411 return index_nonexistent
;
1415 * When we find a directory when traversing the filesystem, we
1416 * have three distinct cases:
1419 * - see it as a directory
1422 * and which one we choose depends on a combination of existing
1423 * git index contents and the flags passed into the directory
1424 * traversal routine.
1426 * Case 1: If we *already* have entries in the index under that
1427 * directory name, we always recurse into the directory to see
1430 * Case 2: If we *already* have that directory name as a gitlink,
1431 * we always continue to see it as a gitlink, regardless of whether
1432 * there is an actual git directory there or not (it might not
1433 * be checked out as a subproject!)
1435 * Case 3: if we didn't have it in the index previously, we
1436 * have a few sub-cases:
1438 * (a) if "show_other_directories" is true, we show it as
1439 * just a directory, unless "hide_empty_directories" is
1440 * also true, in which case we need to check if it contains any
1441 * untracked and / or ignored files.
1442 * (b) if it looks like a git directory, and we don't have
1443 * 'no_gitlinks' set we treat it as a gitlink, and show it
1445 * (c) otherwise, we recurse into it.
1447 static enum path_treatment
treat_directory(struct dir_struct
*dir
,
1448 struct index_state
*istate
,
1449 struct untracked_cache_dir
*untracked
,
1450 const char *dirname
, int len
, int baselen
, int exclude
,
1451 const struct pathspec
*pathspec
)
1453 /* The "len-1" is to strip the final '/' */
1454 switch (directory_exists_in_index(istate
, dirname
, len
-1)) {
1455 case index_directory
:
1456 return path_recurse
;
1461 case index_nonexistent
:
1462 if (dir
->flags
& DIR_SHOW_OTHER_DIRECTORIES
)
1465 (dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
1466 (dir
->flags
& DIR_SHOW_IGNORED_TOO_MODE_MATCHING
)) {
1469 * This is an excluded directory and we are
1470 * showing ignored paths that match an exclude
1471 * pattern. (e.g. show directory as ignored
1472 * only if it matches an exclude pattern).
1473 * This path will either be 'path_excluded`
1474 * (if we are showing empty directories or if
1475 * the directory is not empty), or will be
1476 * 'path_none' (empty directory, and we are
1477 * not showing empty directories).
1479 if (!(dir
->flags
& DIR_HIDE_EMPTY_DIRECTORIES
))
1480 return path_excluded
;
1482 if (read_directory_recursive(dir
, istate
, dirname
, len
,
1483 untracked
, 1, 1, pathspec
) == path_excluded
)
1484 return path_excluded
;
1488 if (!(dir
->flags
& DIR_NO_GITLINKS
)) {
1489 struct object_id oid
;
1490 if (resolve_gitlink_ref(dirname
, "HEAD", &oid
) == 0)
1491 return exclude
? path_excluded
: path_untracked
;
1493 return path_recurse
;
1496 /* This is the "show_other_directories" case */
1498 if (!(dir
->flags
& DIR_HIDE_EMPTY_DIRECTORIES
))
1499 return exclude
? path_excluded
: path_untracked
;
1501 untracked
= lookup_untracked(dir
->untracked
, untracked
,
1502 dirname
+ baselen
, len
- baselen
);
1505 * If this is an excluded directory, then we only need to check if
1506 * the directory contains any files.
1508 return read_directory_recursive(dir
, istate
, dirname
, len
,
1509 untracked
, 1, exclude
, pathspec
);
1513 * This is an inexact early pruning of any recursive directory
1514 * reading - if the path cannot possibly be in the pathspec,
1515 * return true, and we'll skip it early.
1517 static int simplify_away(const char *path
, int pathlen
,
1518 const struct pathspec
*pathspec
)
1522 if (!pathspec
|| !pathspec
->nr
)
1525 GUARD_PATHSPEC(pathspec
,
1534 for (i
= 0; i
< pathspec
->nr
; i
++) {
1535 const struct pathspec_item
*item
= &pathspec
->items
[i
];
1536 int len
= item
->nowildcard_len
;
1540 if (!ps_strncmp(item
, item
->match
, path
, len
))
1548 * This function tells us whether an excluded path matches a
1549 * list of "interesting" pathspecs. That is, whether a path matched
1550 * by any of the pathspecs could possibly be ignored by excluding
1551 * the specified path. This can happen if:
1553 * 1. the path is mentioned explicitly in the pathspec
1555 * 2. the path is a directory prefix of some element in the
1558 static int exclude_matches_pathspec(const char *path
, int pathlen
,
1559 const struct pathspec
*pathspec
)
1563 if (!pathspec
|| !pathspec
->nr
)
1566 GUARD_PATHSPEC(pathspec
,
1574 for (i
= 0; i
< pathspec
->nr
; i
++) {
1575 const struct pathspec_item
*item
= &pathspec
->items
[i
];
1576 int len
= item
->nowildcard_len
;
1578 if (len
== pathlen
&&
1579 !ps_strncmp(item
, item
->match
, path
, pathlen
))
1581 if (len
> pathlen
&&
1582 item
->match
[pathlen
] == '/' &&
1583 !ps_strncmp(item
, item
->match
, path
, pathlen
))
1589 static int get_index_dtype(struct index_state
*istate
,
1590 const char *path
, int len
)
1593 const struct cache_entry
*ce
;
1595 ce
= index_file_exists(istate
, path
, len
, 0);
1597 if (!ce_uptodate(ce
))
1599 if (S_ISGITLINK(ce
->ce_mode
))
1602 * Nobody actually cares about the
1603 * difference between DT_LNK and DT_REG
1608 /* Try to look it up as a directory */
1609 pos
= index_name_pos(istate
, path
, len
);
1613 while (pos
< istate
->cache_nr
) {
1614 ce
= istate
->cache
[pos
++];
1615 if (strncmp(ce
->name
, path
, len
))
1617 if (ce
->name
[len
] > '/')
1619 if (ce
->name
[len
] < '/')
1621 if (!ce_uptodate(ce
))
1622 break; /* continue? */
1628 static int get_dtype(struct dirent
*de
, struct index_state
*istate
,
1629 const char *path
, int len
)
1631 int dtype
= de
? DTYPE(de
) : DT_UNKNOWN
;
1634 if (dtype
!= DT_UNKNOWN
)
1636 dtype
= get_index_dtype(istate
, path
, len
);
1637 if (dtype
!= DT_UNKNOWN
)
1639 if (lstat(path
, &st
))
1641 if (S_ISREG(st
.st_mode
))
1643 if (S_ISDIR(st
.st_mode
))
1645 if (S_ISLNK(st
.st_mode
))
1650 static enum path_treatment
treat_one_path(struct dir_struct
*dir
,
1651 struct untracked_cache_dir
*untracked
,
1652 struct index_state
*istate
,
1653 struct strbuf
*path
,
1655 const struct pathspec
*pathspec
,
1656 int dtype
, struct dirent
*de
)
1659 int has_path_in_index
= !!index_file_exists(istate
, path
->buf
, path
->len
, ignore_case
);
1660 enum path_treatment path_treatment
;
1662 if (dtype
== DT_UNKNOWN
)
1663 dtype
= get_dtype(de
, istate
, path
->buf
, path
->len
);
1665 /* Always exclude indexed files */
1666 if (dtype
!= DT_DIR
&& has_path_in_index
)
1670 * When we are looking at a directory P in the working tree,
1671 * there are three cases:
1673 * (1) P exists in the index. Everything inside the directory P in
1674 * the working tree needs to go when P is checked out from the
1677 * (2) P does not exist in the index, but there is P/Q in the index.
1678 * We know P will stay a directory when we check out the contents
1679 * of the index, but we do not know yet if there is a directory
1680 * P/Q in the working tree to be killed, so we need to recurse.
1682 * (3) P does not exist in the index, and there is no P/Q in the index
1683 * to require P to be a directory, either. Only in this case, we
1684 * know that everything inside P will not be killed without
1687 if ((dir
->flags
& DIR_COLLECT_KILLED_ONLY
) &&
1688 (dtype
== DT_DIR
) &&
1689 !has_path_in_index
&&
1690 (directory_exists_in_index(istate
, path
->buf
, path
->len
) == index_nonexistent
))
1693 exclude
= is_excluded(dir
, istate
, path
->buf
, &dtype
);
1696 * Excluded? If we don't explicitly want to show
1697 * ignored files, ignore it
1699 if (exclude
&& !(dir
->flags
& (DIR_SHOW_IGNORED
|DIR_SHOW_IGNORED_TOO
)))
1700 return path_excluded
;
1706 strbuf_addch(path
, '/');
1707 path_treatment
= treat_directory(dir
, istate
, untracked
,
1708 path
->buf
, path
->len
,
1709 baselen
, exclude
, pathspec
);
1711 * If 1) we only want to return directories that
1712 * match an exclude pattern and 2) this directory does
1713 * not match an exclude pattern but all of its
1714 * contents are excluded, then indicate that we should
1715 * recurse into this directory (instead of marking the
1716 * directory itself as an ignored path).
1719 path_treatment
== path_excluded
&&
1720 (dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
1721 (dir
->flags
& DIR_SHOW_IGNORED_TOO_MODE_MATCHING
))
1722 return path_recurse
;
1723 return path_treatment
;
1726 return exclude
? path_excluded
: path_untracked
;
1730 static enum path_treatment
treat_path_fast(struct dir_struct
*dir
,
1731 struct untracked_cache_dir
*untracked
,
1732 struct cached_dir
*cdir
,
1733 struct index_state
*istate
,
1734 struct strbuf
*path
,
1736 const struct pathspec
*pathspec
)
1738 strbuf_setlen(path
, baselen
);
1740 strbuf_addstr(path
, cdir
->file
);
1741 return path_untracked
;
1743 strbuf_addstr(path
, cdir
->ucd
->name
);
1744 /* treat_one_path() does this before it calls treat_directory() */
1745 strbuf_complete(path
, '/');
1746 if (cdir
->ucd
->check_only
)
1748 * check_only is set as a result of treat_directory() getting
1749 * to its bottom. Verify again the same set of directories
1750 * with check_only set.
1752 return read_directory_recursive(dir
, istate
, path
->buf
, path
->len
,
1753 cdir
->ucd
, 1, 0, pathspec
);
1755 * We get path_recurse in the first run when
1756 * directory_exists_in_index() returns index_nonexistent. We
1757 * are sure that new changes in the index does not impact the
1758 * outcome. Return now.
1760 return path_recurse
;
1763 static enum path_treatment
treat_path(struct dir_struct
*dir
,
1764 struct untracked_cache_dir
*untracked
,
1765 struct cached_dir
*cdir
,
1766 struct index_state
*istate
,
1767 struct strbuf
*path
,
1769 const struct pathspec
*pathspec
)
1772 struct dirent
*de
= cdir
->de
;
1775 return treat_path_fast(dir
, untracked
, cdir
, istate
, path
,
1777 if (is_dot_or_dotdot(de
->d_name
) || !strcmp(de
->d_name
, ".git"))
1779 strbuf_setlen(path
, baselen
);
1780 strbuf_addstr(path
, de
->d_name
);
1781 if (simplify_away(path
->buf
, path
->len
, pathspec
))
1785 return treat_one_path(dir
, untracked
, istate
, path
, baselen
, pathspec
, dtype
, de
);
1788 static void add_untracked(struct untracked_cache_dir
*dir
, const char *name
)
1792 ALLOC_GROW(dir
->untracked
, dir
->untracked_nr
+ 1,
1793 dir
->untracked_alloc
);
1794 dir
->untracked
[dir
->untracked_nr
++] = xstrdup(name
);
1797 static int valid_cached_dir(struct dir_struct
*dir
,
1798 struct untracked_cache_dir
*untracked
,
1799 struct index_state
*istate
,
1800 struct strbuf
*path
,
1809 * With fsmonitor, we can trust the untracked cache's valid field.
1811 refresh_fsmonitor(istate
);
1812 if (!(dir
->untracked
->use_fsmonitor
&& untracked
->valid
)) {
1813 if (stat(path
->len
? path
->buf
: ".", &st
)) {
1814 invalidate_directory(dir
->untracked
, untracked
);
1815 memset(&untracked
->stat_data
, 0, sizeof(untracked
->stat_data
));
1818 if (!untracked
->valid
||
1819 match_stat_data_racy(istate
, &untracked
->stat_data
, &st
)) {
1820 if (untracked
->valid
)
1821 invalidate_directory(dir
->untracked
, untracked
);
1822 fill_stat_data(&untracked
->stat_data
, &st
);
1827 if (untracked
->check_only
!= !!check_only
) {
1828 invalidate_directory(dir
->untracked
, untracked
);
1833 * prep_exclude will be called eventually on this directory,
1834 * but it's called much later in last_exclude_matching(). We
1835 * need it now to determine the validity of the cache for this
1836 * path. The next calls will be nearly no-op, the way
1837 * prep_exclude() is designed.
1839 if (path
->len
&& path
->buf
[path
->len
- 1] != '/') {
1840 strbuf_addch(path
, '/');
1841 prep_exclude(dir
, istate
, path
->buf
, path
->len
);
1842 strbuf_setlen(path
, path
->len
- 1);
1844 prep_exclude(dir
, istate
, path
->buf
, path
->len
);
1846 /* hopefully prep_exclude() haven't invalidated this entry... */
1847 return untracked
->valid
;
1850 static int open_cached_dir(struct cached_dir
*cdir
,
1851 struct dir_struct
*dir
,
1852 struct untracked_cache_dir
*untracked
,
1853 struct index_state
*istate
,
1854 struct strbuf
*path
,
1857 memset(cdir
, 0, sizeof(*cdir
));
1858 cdir
->untracked
= untracked
;
1859 if (valid_cached_dir(dir
, untracked
, istate
, path
, check_only
))
1861 cdir
->fdir
= opendir(path
->len
? path
->buf
: ".");
1863 dir
->untracked
->dir_opened
++;
1869 static int read_cached_dir(struct cached_dir
*cdir
)
1872 cdir
->de
= readdir(cdir
->fdir
);
1877 while (cdir
->nr_dirs
< cdir
->untracked
->dirs_nr
) {
1878 struct untracked_cache_dir
*d
= cdir
->untracked
->dirs
[cdir
->nr_dirs
];
1888 if (cdir
->nr_files
< cdir
->untracked
->untracked_nr
) {
1889 struct untracked_cache_dir
*d
= cdir
->untracked
;
1890 cdir
->file
= d
->untracked
[cdir
->nr_files
++];
1896 static void close_cached_dir(struct cached_dir
*cdir
)
1899 closedir(cdir
->fdir
);
1901 * We have gone through this directory and found no untracked
1902 * entries. Mark it valid.
1904 if (cdir
->untracked
) {
1905 cdir
->untracked
->valid
= 1;
1906 cdir
->untracked
->recurse
= 1;
1911 * Read a directory tree. We currently ignore anything but
1912 * directories, regular files and symlinks. That's because git
1913 * doesn't handle them at all yet. Maybe that will change some
1916 * Also, we ignore the name ".git" (even if it is not a directory).
1917 * That likely will not change.
1919 * If 'stop_at_first_file' is specified, 'path_excluded' is returned
1920 * to signal that a file was found. This is the least significant value that
1921 * indicates that a file was encountered that does not depend on the order of
1922 * whether an untracked or exluded path was encountered first.
1924 * Returns the most significant path_treatment value encountered in the scan.
1925 * If 'stop_at_first_file' is specified, `path_excluded` is the most
1926 * significant path_treatment value that will be returned.
1929 static enum path_treatment
read_directory_recursive(struct dir_struct
*dir
,
1930 struct index_state
*istate
, const char *base
, int baselen
,
1931 struct untracked_cache_dir
*untracked
, int check_only
,
1932 int stop_at_first_file
, const struct pathspec
*pathspec
)
1934 struct cached_dir cdir
;
1935 enum path_treatment state
, subdir_state
, dir_state
= path_none
;
1936 struct strbuf path
= STRBUF_INIT
;
1938 strbuf_add(&path
, base
, baselen
);
1940 if (open_cached_dir(&cdir
, dir
, untracked
, istate
, &path
, check_only
))
1944 untracked
->check_only
= !!check_only
;
1946 while (!read_cached_dir(&cdir
)) {
1947 /* check how the file or directory should be treated */
1948 state
= treat_path(dir
, untracked
, &cdir
, istate
, &path
,
1951 if (state
> dir_state
)
1954 /* recurse into subdir if instructed by treat_path */
1955 if ((state
== path_recurse
) ||
1956 ((state
== path_untracked
) &&
1957 (dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
1958 (get_dtype(cdir
.de
, istate
, path
.buf
, path
.len
) == DT_DIR
))) {
1959 struct untracked_cache_dir
*ud
;
1960 ud
= lookup_untracked(dir
->untracked
, untracked
,
1962 path
.len
- baselen
);
1964 read_directory_recursive(dir
, istate
, path
.buf
,
1966 check_only
, stop_at_first_file
, pathspec
);
1967 if (subdir_state
> dir_state
)
1968 dir_state
= subdir_state
;
1972 if (stop_at_first_file
) {
1974 * If stopping at first file, then
1975 * signal that a file was found by
1976 * returning `path_excluded`. This is
1977 * to return a consistent value
1978 * regardless of whether an ignored or
1979 * excluded file happened to be
1982 * In current usage, the
1983 * `stop_at_first_file` is passed when
1984 * an ancestor directory has matched
1985 * an exclude pattern, so any found
1986 * files will be excluded.
1988 if (dir_state
>= path_excluded
) {
1989 dir_state
= path_excluded
;
1994 /* abort early if maximum state has been reached */
1995 if (dir_state
== path_untracked
) {
1997 add_untracked(untracked
, path
.buf
+ baselen
);
2000 /* skip the dir_add_* part */
2004 /* add the path to the appropriate result list */
2007 if (dir
->flags
& DIR_SHOW_IGNORED
)
2008 dir_add_name(dir
, istate
, path
.buf
, path
.len
);
2009 else if ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) ||
2010 ((dir
->flags
& DIR_COLLECT_IGNORED
) &&
2011 exclude_matches_pathspec(path
.buf
, path
.len
,
2013 dir_add_ignored(dir
, istate
, path
.buf
, path
.len
);
2016 case path_untracked
:
2017 if (dir
->flags
& DIR_SHOW_IGNORED
)
2019 dir_add_name(dir
, istate
, path
.buf
, path
.len
);
2021 add_untracked(untracked
, path
.buf
+ baselen
);
2028 close_cached_dir(&cdir
);
2030 strbuf_release(&path
);
2035 int cmp_dir_entry(const void *p1
, const void *p2
)
2037 const struct dir_entry
*e1
= *(const struct dir_entry
**)p1
;
2038 const struct dir_entry
*e2
= *(const struct dir_entry
**)p2
;
2040 return name_compare(e1
->name
, e1
->len
, e2
->name
, e2
->len
);
2043 /* check if *out lexically strictly contains *in */
2044 int check_dir_entry_contains(const struct dir_entry
*out
, const struct dir_entry
*in
)
2046 return (out
->len
< in
->len
) &&
2047 (out
->name
[out
->len
- 1] == '/') &&
2048 !memcmp(out
->name
, in
->name
, out
->len
);
2051 static int treat_leading_path(struct dir_struct
*dir
,
2052 struct index_state
*istate
,
2053 const char *path
, int len
,
2054 const struct pathspec
*pathspec
)
2056 struct strbuf sb
= STRBUF_INIT
;
2057 int baselen
, rc
= 0;
2059 int old_flags
= dir
->flags
;
2061 while (len
&& path
[len
- 1] == '/')
2066 dir
->flags
&= ~DIR_SHOW_OTHER_DIRECTORIES
;
2068 cp
= path
+ baselen
+ !!baselen
;
2069 cp
= memchr(cp
, '/', path
+ len
- cp
);
2073 baselen
= cp
- path
;
2074 strbuf_setlen(&sb
, 0);
2075 strbuf_add(&sb
, path
, baselen
);
2076 if (!is_directory(sb
.buf
))
2078 if (simplify_away(sb
.buf
, sb
.len
, pathspec
))
2080 if (treat_one_path(dir
, NULL
, istate
, &sb
, baselen
, pathspec
,
2081 DT_DIR
, NULL
) == path_none
)
2082 break; /* do not recurse into it */
2083 if (len
<= baselen
) {
2085 break; /* finished checking */
2088 strbuf_release(&sb
);
2089 dir
->flags
= old_flags
;
2093 static const char *get_ident_string(void)
2095 static struct strbuf sb
= STRBUF_INIT
;
2100 if (uname(&uts
) < 0)
2101 die_errno(_("failed to get kernel name and information"));
2102 strbuf_addf(&sb
, "Location %s, system %s", get_git_work_tree(),
2107 static int ident_in_untracked(const struct untracked_cache
*uc
)
2110 * Previous git versions may have saved many NUL separated
2111 * strings in the "ident" field, but it is insane to manage
2112 * many locations, so just take care of the first one.
2115 return !strcmp(uc
->ident
.buf
, get_ident_string());
2118 static void set_untracked_ident(struct untracked_cache
*uc
)
2120 strbuf_reset(&uc
->ident
);
2121 strbuf_addstr(&uc
->ident
, get_ident_string());
2124 * This strbuf used to contain a list of NUL separated
2125 * strings, so save NUL too for backward compatibility.
2127 strbuf_addch(&uc
->ident
, 0);
2130 static void new_untracked_cache(struct index_state
*istate
)
2132 struct untracked_cache
*uc
= xcalloc(1, sizeof(*uc
));
2133 strbuf_init(&uc
->ident
, 100);
2134 uc
->exclude_per_dir
= ".gitignore";
2135 /* should be the same flags used by git-status */
2136 uc
->dir_flags
= DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
2137 set_untracked_ident(uc
);
2138 istate
->untracked
= uc
;
2139 istate
->cache_changed
|= UNTRACKED_CHANGED
;
2142 void add_untracked_cache(struct index_state
*istate
)
2144 if (!istate
->untracked
) {
2145 new_untracked_cache(istate
);
2147 if (!ident_in_untracked(istate
->untracked
)) {
2148 free_untracked_cache(istate
->untracked
);
2149 new_untracked_cache(istate
);
2154 void remove_untracked_cache(struct index_state
*istate
)
2156 if (istate
->untracked
) {
2157 free_untracked_cache(istate
->untracked
);
2158 istate
->untracked
= NULL
;
2159 istate
->cache_changed
|= UNTRACKED_CHANGED
;
2163 static struct untracked_cache_dir
*validate_untracked_cache(struct dir_struct
*dir
,
2165 const struct pathspec
*pathspec
)
2167 struct untracked_cache_dir
*root
;
2169 if (!dir
->untracked
|| getenv("GIT_DISABLE_UNTRACKED_CACHE"))
2173 * We only support $GIT_DIR/info/exclude and core.excludesfile
2174 * as the global ignore rule files. Any other additions
2175 * (e.g. from command line) invalidate the cache. This
2176 * condition also catches running setup_standard_excludes()
2177 * before setting dir->untracked!
2179 if (dir
->unmanaged_exclude_files
)
2183 * Optimize for the main use case only: whole-tree git
2184 * status. More work involved in treat_leading_path() if we
2185 * use cache on just a subset of the worktree. pathspec
2186 * support could make the matter even worse.
2188 if (base_len
|| (pathspec
&& pathspec
->nr
))
2191 /* Different set of flags may produce different results */
2192 if (dir
->flags
!= dir
->untracked
->dir_flags
||
2194 * See treat_directory(), case index_nonexistent. Without
2195 * this flag, we may need to also cache .git file content
2196 * for the resolve_gitlink_ref() call, which we don't.
2198 !(dir
->flags
& DIR_SHOW_OTHER_DIRECTORIES
) ||
2199 /* We don't support collecting ignore files */
2200 (dir
->flags
& (DIR_SHOW_IGNORED
| DIR_SHOW_IGNORED_TOO
|
2201 DIR_COLLECT_IGNORED
)))
2205 * If we use .gitignore in the cache and now you change it to
2206 * .gitexclude, everything will go wrong.
2208 if (dir
->exclude_per_dir
!= dir
->untracked
->exclude_per_dir
&&
2209 strcmp(dir
->exclude_per_dir
, dir
->untracked
->exclude_per_dir
))
2213 * EXC_CMDL is not considered in the cache. If people set it,
2216 if (dir
->exclude_list_group
[EXC_CMDL
].nr
)
2219 if (!ident_in_untracked(dir
->untracked
)) {
2220 warning(_("Untracked cache is disabled on this system or location."));
2224 if (!dir
->untracked
->root
) {
2225 const int len
= sizeof(*dir
->untracked
->root
);
2226 dir
->untracked
->root
= xmalloc(len
);
2227 memset(dir
->untracked
->root
, 0, len
);
2230 /* Validate $GIT_DIR/info/exclude and core.excludesfile */
2231 root
= dir
->untracked
->root
;
2232 if (hashcmp(dir
->ss_info_exclude
.sha1
,
2233 dir
->untracked
->ss_info_exclude
.sha1
)) {
2234 invalidate_gitignore(dir
->untracked
, root
);
2235 dir
->untracked
->ss_info_exclude
= dir
->ss_info_exclude
;
2237 if (hashcmp(dir
->ss_excludes_file
.sha1
,
2238 dir
->untracked
->ss_excludes_file
.sha1
)) {
2239 invalidate_gitignore(dir
->untracked
, root
);
2240 dir
->untracked
->ss_excludes_file
= dir
->ss_excludes_file
;
2243 /* Make sure this directory is not dropped out at saving phase */
2248 int read_directory(struct dir_struct
*dir
, struct index_state
*istate
,
2249 const char *path
, int len
, const struct pathspec
*pathspec
)
2251 struct untracked_cache_dir
*untracked
;
2253 if (has_symlink_leading_path(path
, len
))
2256 untracked
= validate_untracked_cache(dir
, len
, pathspec
);
2259 * make sure untracked cache code path is disabled,
2260 * e.g. prep_exclude()
2262 dir
->untracked
= NULL
;
2263 if (!len
|| treat_leading_path(dir
, istate
, path
, len
, pathspec
))
2264 read_directory_recursive(dir
, istate
, path
, len
, untracked
, 0, 0, pathspec
);
2265 QSORT(dir
->entries
, dir
->nr
, cmp_dir_entry
);
2266 QSORT(dir
->ignored
, dir
->ignored_nr
, cmp_dir_entry
);
2269 * If DIR_SHOW_IGNORED_TOO is set, read_directory_recursive() will
2270 * also pick up untracked contents of untracked dirs; by default
2271 * we discard these, but given DIR_KEEP_UNTRACKED_CONTENTS we do not.
2273 if ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
2274 !(dir
->flags
& DIR_KEEP_UNTRACKED_CONTENTS
)) {
2277 /* remove from dir->entries untracked contents of untracked dirs */
2278 for (i
= j
= 0; j
< dir
->nr
; j
++) {
2280 check_dir_entry_contains(dir
->entries
[i
- 1], dir
->entries
[j
])) {
2281 FREE_AND_NULL(dir
->entries
[j
]);
2283 dir
->entries
[i
++] = dir
->entries
[j
];
2290 if (dir
->untracked
) {
2291 static struct trace_key trace_untracked_stats
= TRACE_KEY_INIT(UNTRACKED_STATS
);
2292 trace_printf_key(&trace_untracked_stats
,
2293 "node creation: %u\n"
2294 "gitignore invalidation: %u\n"
2295 "directory invalidation: %u\n"
2297 dir
->untracked
->dir_created
,
2298 dir
->untracked
->gitignore_invalidated
,
2299 dir
->untracked
->dir_invalidated
,
2300 dir
->untracked
->dir_opened
);
2301 if (dir
->untracked
== istate
->untracked
&&
2302 (dir
->untracked
->dir_opened
||
2303 dir
->untracked
->gitignore_invalidated
||
2304 dir
->untracked
->dir_invalidated
))
2305 istate
->cache_changed
|= UNTRACKED_CHANGED
;
2306 if (dir
->untracked
!= istate
->untracked
) {
2307 FREE_AND_NULL(dir
->untracked
);
2313 int file_exists(const char *f
)
2316 return lstat(f
, &sb
) == 0;
2319 static int cmp_icase(char a
, char b
)
2324 return toupper(a
) - toupper(b
);
2329 * Given two normalized paths (a trailing slash is ok), if subdir is
2330 * outside dir, return -1. Otherwise return the offset in subdir that
2331 * can be used as relative path to dir.
2333 int dir_inside_of(const char *subdir
, const char *dir
)
2337 assert(dir
&& subdir
&& *dir
&& *subdir
);
2339 while (*dir
&& *subdir
&& !cmp_icase(*dir
, *subdir
)) {
2345 /* hel[p]/me vs hel[l]/yeah */
2346 if (*dir
&& *subdir
)
2350 return !*dir
? offset
: -1; /* same dir */
2352 /* foo/[b]ar vs foo/[] */
2353 if (is_dir_sep(dir
[-1]))
2354 return is_dir_sep(subdir
[-1]) ? offset
: -1;
2356 /* foo[/]bar vs foo[] */
2357 return is_dir_sep(*subdir
) ? offset
+ 1 : -1;
2360 int is_inside_dir(const char *dir
)
2369 rc
= (dir_inside_of(cwd
, dir
) >= 0);
2374 int is_empty_dir(const char *path
)
2376 DIR *dir
= opendir(path
);
2383 while ((e
= readdir(dir
)) != NULL
)
2384 if (!is_dot_or_dotdot(e
->d_name
)) {
2393 static int remove_dir_recurse(struct strbuf
*path
, int flag
, int *kept_up
)
2397 int ret
= 0, original_len
= path
->len
, len
, kept_down
= 0;
2398 int only_empty
= (flag
& REMOVE_DIR_EMPTY_ONLY
);
2399 int keep_toplevel
= (flag
& REMOVE_DIR_KEEP_TOPLEVEL
);
2400 struct object_id submodule_head
;
2402 if ((flag
& REMOVE_DIR_KEEP_NESTED_GIT
) &&
2403 !resolve_gitlink_ref(path
->buf
, "HEAD", &submodule_head
)) {
2404 /* Do not descend and nuke a nested git work tree. */
2410 flag
&= ~REMOVE_DIR_KEEP_TOPLEVEL
;
2411 dir
= opendir(path
->buf
);
2413 if (errno
== ENOENT
)
2414 return keep_toplevel
? -1 : 0;
2415 else if (errno
== EACCES
&& !keep_toplevel
)
2417 * An empty dir could be removable even if it
2420 return rmdir(path
->buf
);
2424 strbuf_complete(path
, '/');
2427 while ((e
= readdir(dir
)) != NULL
) {
2429 if (is_dot_or_dotdot(e
->d_name
))
2432 strbuf_setlen(path
, len
);
2433 strbuf_addstr(path
, e
->d_name
);
2434 if (lstat(path
->buf
, &st
)) {
2435 if (errno
== ENOENT
)
2437 * file disappeared, which is what we
2442 } else if (S_ISDIR(st
.st_mode
)) {
2443 if (!remove_dir_recurse(path
, flag
, &kept_down
))
2444 continue; /* happy */
2445 } else if (!only_empty
&&
2446 (!unlink(path
->buf
) || errno
== ENOENT
)) {
2447 continue; /* happy, too */
2450 /* path too long, stat fails, or non-directory still exists */
2456 strbuf_setlen(path
, original_len
);
2457 if (!ret
&& !keep_toplevel
&& !kept_down
)
2458 ret
= (!rmdir(path
->buf
) || errno
== ENOENT
) ? 0 : -1;
2461 * report the uplevel that it is not an error that we
2462 * did not rmdir() our directory.
2468 int remove_dir_recursively(struct strbuf
*path
, int flag
)
2470 return remove_dir_recurse(path
, flag
, NULL
);
2473 static GIT_PATH_FUNC(git_path_info_exclude
, "info/exclude")
2475 void setup_standard_excludes(struct dir_struct
*dir
)
2477 dir
->exclude_per_dir
= ".gitignore";
2479 /* core.excludefile defaulting to $XDG_HOME/git/ignore */
2481 excludes_file
= xdg_config_home("ignore");
2482 if (excludes_file
&& !access_or_warn(excludes_file
, R_OK
, 0))
2483 add_excludes_from_file_1(dir
, excludes_file
,
2484 dir
->untracked
? &dir
->ss_excludes_file
: NULL
);
2486 /* per repository user preference */
2487 if (startup_info
->have_repository
) {
2488 const char *path
= git_path_info_exclude();
2489 if (!access_or_warn(path
, R_OK
, 0))
2490 add_excludes_from_file_1(dir
, path
,
2491 dir
->untracked
? &dir
->ss_info_exclude
: NULL
);
2495 int remove_path(const char *name
)
2499 if (unlink(name
) && !is_missing_file_error(errno
))
2502 slash
= strrchr(name
, '/');
2504 char *dirs
= xstrdup(name
);
2505 slash
= dirs
+ (slash
- name
);
2508 } while (rmdir(dirs
) == 0 && (slash
= strrchr(dirs
, '/')));
2515 * Frees memory within dir which was allocated for exclude lists and
2516 * the exclude_stack. Does not free dir itself.
2518 void clear_directory(struct dir_struct
*dir
)
2521 struct exclude_list_group
*group
;
2522 struct exclude_list
*el
;
2523 struct exclude_stack
*stk
;
2525 for (i
= EXC_CMDL
; i
<= EXC_FILE
; i
++) {
2526 group
= &dir
->exclude_list_group
[i
];
2527 for (j
= 0; j
< group
->nr
; j
++) {
2530 free((char *)el
->src
);
2531 clear_exclude_list(el
);
2536 stk
= dir
->exclude_stack
;
2538 struct exclude_stack
*prev
= stk
->prev
;
2542 strbuf_release(&dir
->basebuf
);
2545 struct ondisk_untracked_cache
{
2546 struct stat_data info_exclude_stat
;
2547 struct stat_data excludes_file_stat
;
2549 unsigned char info_exclude_sha1
[20];
2550 unsigned char excludes_file_sha1
[20];
2551 char exclude_per_dir
[FLEX_ARRAY
];
2554 #define ouc_offset(x) offsetof(struct ondisk_untracked_cache, x)
2555 #define ouc_size(len) (ouc_offset(exclude_per_dir) + len + 1)
2558 int index
; /* number of written untracked_cache_dir */
2559 struct ewah_bitmap
*check_only
; /* from untracked_cache_dir */
2560 struct ewah_bitmap
*valid
; /* from untracked_cache_dir */
2561 struct ewah_bitmap
*sha1_valid
; /* set if exclude_sha1 is not null */
2563 struct strbuf sb_stat
;
2564 struct strbuf sb_sha1
;
2567 static void stat_data_to_disk(struct stat_data
*to
, const struct stat_data
*from
)
2569 to
->sd_ctime
.sec
= htonl(from
->sd_ctime
.sec
);
2570 to
->sd_ctime
.nsec
= htonl(from
->sd_ctime
.nsec
);
2571 to
->sd_mtime
.sec
= htonl(from
->sd_mtime
.sec
);
2572 to
->sd_mtime
.nsec
= htonl(from
->sd_mtime
.nsec
);
2573 to
->sd_dev
= htonl(from
->sd_dev
);
2574 to
->sd_ino
= htonl(from
->sd_ino
);
2575 to
->sd_uid
= htonl(from
->sd_uid
);
2576 to
->sd_gid
= htonl(from
->sd_gid
);
2577 to
->sd_size
= htonl(from
->sd_size
);
2580 static void write_one_dir(struct untracked_cache_dir
*untracked
,
2581 struct write_data
*wd
)
2583 struct stat_data stat_data
;
2584 struct strbuf
*out
= &wd
->out
;
2585 unsigned char intbuf
[16];
2586 unsigned int intlen
, value
;
2587 int i
= wd
->index
++;
2590 * untracked_nr should be reset whenever valid is clear, but
2593 if (!untracked
->valid
) {
2594 untracked
->untracked_nr
= 0;
2595 untracked
->check_only
= 0;
2598 if (untracked
->check_only
)
2599 ewah_set(wd
->check_only
, i
);
2600 if (untracked
->valid
) {
2601 ewah_set(wd
->valid
, i
);
2602 stat_data_to_disk(&stat_data
, &untracked
->stat_data
);
2603 strbuf_add(&wd
->sb_stat
, &stat_data
, sizeof(stat_data
));
2605 if (!is_null_sha1(untracked
->exclude_sha1
)) {
2606 ewah_set(wd
->sha1_valid
, i
);
2607 strbuf_add(&wd
->sb_sha1
, untracked
->exclude_sha1
, 20);
2610 intlen
= encode_varint(untracked
->untracked_nr
, intbuf
);
2611 strbuf_add(out
, intbuf
, intlen
);
2613 /* skip non-recurse directories */
2614 for (i
= 0, value
= 0; i
< untracked
->dirs_nr
; i
++)
2615 if (untracked
->dirs
[i
]->recurse
)
2617 intlen
= encode_varint(value
, intbuf
);
2618 strbuf_add(out
, intbuf
, intlen
);
2620 strbuf_add(out
, untracked
->name
, strlen(untracked
->name
) + 1);
2622 for (i
= 0; i
< untracked
->untracked_nr
; i
++)
2623 strbuf_add(out
, untracked
->untracked
[i
],
2624 strlen(untracked
->untracked
[i
]) + 1);
2626 for (i
= 0; i
< untracked
->dirs_nr
; i
++)
2627 if (untracked
->dirs
[i
]->recurse
)
2628 write_one_dir(untracked
->dirs
[i
], wd
);
2631 void write_untracked_extension(struct strbuf
*out
, struct untracked_cache
*untracked
)
2633 struct ondisk_untracked_cache
*ouc
;
2634 struct write_data wd
;
2635 unsigned char varbuf
[16];
2637 size_t len
= strlen(untracked
->exclude_per_dir
);
2639 FLEX_ALLOC_MEM(ouc
, exclude_per_dir
, untracked
->exclude_per_dir
, len
);
2640 stat_data_to_disk(&ouc
->info_exclude_stat
, &untracked
->ss_info_exclude
.stat
);
2641 stat_data_to_disk(&ouc
->excludes_file_stat
, &untracked
->ss_excludes_file
.stat
);
2642 hashcpy(ouc
->info_exclude_sha1
, untracked
->ss_info_exclude
.sha1
);
2643 hashcpy(ouc
->excludes_file_sha1
, untracked
->ss_excludes_file
.sha1
);
2644 ouc
->dir_flags
= htonl(untracked
->dir_flags
);
2646 varint_len
= encode_varint(untracked
->ident
.len
, varbuf
);
2647 strbuf_add(out
, varbuf
, varint_len
);
2648 strbuf_addbuf(out
, &untracked
->ident
);
2650 strbuf_add(out
, ouc
, ouc_size(len
));
2653 if (!untracked
->root
) {
2654 varint_len
= encode_varint(0, varbuf
);
2655 strbuf_add(out
, varbuf
, varint_len
);
2660 wd
.check_only
= ewah_new();
2661 wd
.valid
= ewah_new();
2662 wd
.sha1_valid
= ewah_new();
2663 strbuf_init(&wd
.out
, 1024);
2664 strbuf_init(&wd
.sb_stat
, 1024);
2665 strbuf_init(&wd
.sb_sha1
, 1024);
2666 write_one_dir(untracked
->root
, &wd
);
2668 varint_len
= encode_varint(wd
.index
, varbuf
);
2669 strbuf_add(out
, varbuf
, varint_len
);
2670 strbuf_addbuf(out
, &wd
.out
);
2671 ewah_serialize_strbuf(wd
.valid
, out
);
2672 ewah_serialize_strbuf(wd
.check_only
, out
);
2673 ewah_serialize_strbuf(wd
.sha1_valid
, out
);
2674 strbuf_addbuf(out
, &wd
.sb_stat
);
2675 strbuf_addbuf(out
, &wd
.sb_sha1
);
2676 strbuf_addch(out
, '\0'); /* safe guard for string lists */
2678 ewah_free(wd
.valid
);
2679 ewah_free(wd
.check_only
);
2680 ewah_free(wd
.sha1_valid
);
2681 strbuf_release(&wd
.out
);
2682 strbuf_release(&wd
.sb_stat
);
2683 strbuf_release(&wd
.sb_sha1
);
2686 static void free_untracked(struct untracked_cache_dir
*ucd
)
2691 for (i
= 0; i
< ucd
->dirs_nr
; i
++)
2692 free_untracked(ucd
->dirs
[i
]);
2693 for (i
= 0; i
< ucd
->untracked_nr
; i
++)
2694 free(ucd
->untracked
[i
]);
2695 free(ucd
->untracked
);
2700 void free_untracked_cache(struct untracked_cache
*uc
)
2703 free_untracked(uc
->root
);
2709 struct untracked_cache_dir
**ucd
;
2710 struct ewah_bitmap
*check_only
;
2711 struct ewah_bitmap
*valid
;
2712 struct ewah_bitmap
*sha1_valid
;
2713 const unsigned char *data
;
2714 const unsigned char *end
;
2717 static void stat_data_from_disk(struct stat_data
*to
, const unsigned char *data
)
2719 memcpy(to
, data
, sizeof(*to
));
2720 to
->sd_ctime
.sec
= ntohl(to
->sd_ctime
.sec
);
2721 to
->sd_ctime
.nsec
= ntohl(to
->sd_ctime
.nsec
);
2722 to
->sd_mtime
.sec
= ntohl(to
->sd_mtime
.sec
);
2723 to
->sd_mtime
.nsec
= ntohl(to
->sd_mtime
.nsec
);
2724 to
->sd_dev
= ntohl(to
->sd_dev
);
2725 to
->sd_ino
= ntohl(to
->sd_ino
);
2726 to
->sd_uid
= ntohl(to
->sd_uid
);
2727 to
->sd_gid
= ntohl(to
->sd_gid
);
2728 to
->sd_size
= ntohl(to
->sd_size
);
2731 static int read_one_dir(struct untracked_cache_dir
**untracked_
,
2732 struct read_data
*rd
)
2734 struct untracked_cache_dir ud
, *untracked
;
2735 const unsigned char *next
, *data
= rd
->data
, *end
= rd
->end
;
2739 memset(&ud
, 0, sizeof(ud
));
2742 value
= decode_varint(&next
);
2746 ud
.untracked_alloc
= value
;
2747 ud
.untracked_nr
= value
;
2748 if (ud
.untracked_nr
)
2749 ALLOC_ARRAY(ud
.untracked
, ud
.untracked_nr
);
2753 ud
.dirs_alloc
= ud
.dirs_nr
= decode_varint(&next
);
2756 ALLOC_ARRAY(ud
.dirs
, ud
.dirs_nr
);
2759 len
= strlen((const char *)data
);
2760 next
= data
+ len
+ 1;
2763 *untracked_
= untracked
= xmalloc(st_add(sizeof(*untracked
), len
));
2764 memcpy(untracked
, &ud
, sizeof(ud
));
2765 memcpy(untracked
->name
, data
, len
+ 1);
2768 for (i
= 0; i
< untracked
->untracked_nr
; i
++) {
2769 len
= strlen((const char *)data
);
2770 next
= data
+ len
+ 1;
2773 untracked
->untracked
[i
] = xstrdup((const char*)data
);
2777 rd
->ucd
[rd
->index
++] = untracked
;
2780 for (i
= 0; i
< untracked
->dirs_nr
; i
++) {
2781 len
= read_one_dir(untracked
->dirs
+ i
, rd
);
2788 static void set_check_only(size_t pos
, void *cb
)
2790 struct read_data
*rd
= cb
;
2791 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
2795 static void read_stat(size_t pos
, void *cb
)
2797 struct read_data
*rd
= cb
;
2798 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
2799 if (rd
->data
+ sizeof(struct stat_data
) > rd
->end
) {
2800 rd
->data
= rd
->end
+ 1;
2803 stat_data_from_disk(&ud
->stat_data
, rd
->data
);
2804 rd
->data
+= sizeof(struct stat_data
);
2808 static void read_sha1(size_t pos
, void *cb
)
2810 struct read_data
*rd
= cb
;
2811 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
2812 if (rd
->data
+ 20 > rd
->end
) {
2813 rd
->data
= rd
->end
+ 1;
2816 hashcpy(ud
->exclude_sha1
, rd
->data
);
2820 static void load_sha1_stat(struct sha1_stat
*sha1_stat
,
2821 const unsigned char *data
,
2822 const unsigned char *sha1
)
2824 stat_data_from_disk(&sha1_stat
->stat
, data
);
2825 hashcpy(sha1_stat
->sha1
, sha1
);
2826 sha1_stat
->valid
= 1;
2829 struct untracked_cache
*read_untracked_extension(const void *data
, unsigned long sz
)
2831 struct untracked_cache
*uc
;
2832 struct read_data rd
;
2833 const unsigned char *next
= data
, *end
= (const unsigned char *)data
+ sz
;
2836 const char *exclude_per_dir
;
2838 if (sz
<= 1 || end
[-1] != '\0')
2842 ident_len
= decode_varint(&next
);
2843 if (next
+ ident_len
> end
)
2845 ident
= (const char *)next
;
2848 if (next
+ ouc_size(0) > end
)
2851 uc
= xcalloc(1, sizeof(*uc
));
2852 strbuf_init(&uc
->ident
, ident_len
);
2853 strbuf_add(&uc
->ident
, ident
, ident_len
);
2854 load_sha1_stat(&uc
->ss_info_exclude
,
2855 next
+ ouc_offset(info_exclude_stat
),
2856 next
+ ouc_offset(info_exclude_sha1
));
2857 load_sha1_stat(&uc
->ss_excludes_file
,
2858 next
+ ouc_offset(excludes_file_stat
),
2859 next
+ ouc_offset(excludes_file_sha1
));
2860 uc
->dir_flags
= get_be32(next
+ ouc_offset(dir_flags
));
2861 exclude_per_dir
= (const char *)next
+ ouc_offset(exclude_per_dir
);
2862 uc
->exclude_per_dir
= xstrdup(exclude_per_dir
);
2863 /* NUL after exclude_per_dir is covered by sizeof(*ouc) */
2864 next
+= ouc_size(strlen(exclude_per_dir
));
2868 len
= decode_varint(&next
);
2869 if (next
> end
|| len
== 0)
2872 rd
.valid
= ewah_new();
2873 rd
.check_only
= ewah_new();
2874 rd
.sha1_valid
= ewah_new();
2878 ALLOC_ARRAY(rd
.ucd
, len
);
2880 if (read_one_dir(&uc
->root
, &rd
) || rd
.index
!= len
)
2884 len
= ewah_read_mmap(rd
.valid
, next
, end
- next
);
2889 len
= ewah_read_mmap(rd
.check_only
, next
, end
- next
);
2894 len
= ewah_read_mmap(rd
.sha1_valid
, next
, end
- next
);
2898 ewah_each_bit(rd
.check_only
, set_check_only
, &rd
);
2899 rd
.data
= next
+ len
;
2900 ewah_each_bit(rd
.valid
, read_stat
, &rd
);
2901 ewah_each_bit(rd
.sha1_valid
, read_sha1
, &rd
);
2906 ewah_free(rd
.valid
);
2907 ewah_free(rd
.check_only
);
2908 ewah_free(rd
.sha1_valid
);
2911 free_untracked_cache(uc
);
2917 static void invalidate_one_directory(struct untracked_cache
*uc
,
2918 struct untracked_cache_dir
*ucd
)
2920 uc
->dir_invalidated
++;
2922 ucd
->untracked_nr
= 0;
2926 * Normally when an entry is added or removed from a directory,
2927 * invalidating that directory is enough. No need to touch its
2928 * ancestors. When a directory is shown as "foo/bar/" in git-status
2929 * however, deleting or adding an entry may have cascading effect.
2931 * Say the "foo/bar/file" has become untracked, we need to tell the
2932 * untracked_cache_dir of "foo" that "bar/" is not an untracked
2933 * directory any more (because "bar" is managed by foo as an untracked
2936 * Similarly, if "foo/bar/file" moves from untracked to tracked and it
2937 * was the last untracked entry in the entire "foo", we should show
2938 * "foo/" instead. Which means we have to invalidate past "bar" up to
2941 * This function traverses all directories from root to leaf. If there
2942 * is a chance of one of the above cases happening, we invalidate back
2943 * to root. Otherwise we just invalidate the leaf. There may be a more
2944 * sophisticated way than checking for SHOW_OTHER_DIRECTORIES to
2945 * detect these cases and avoid unnecessary invalidation, for example,
2946 * checking for the untracked entry named "bar/" in "foo", but for now
2947 * stick to something safe and simple.
2949 static int invalidate_one_component(struct untracked_cache
*uc
,
2950 struct untracked_cache_dir
*dir
,
2951 const char *path
, int len
)
2953 const char *rest
= strchr(path
, '/');
2956 int component_len
= rest
- path
;
2957 struct untracked_cache_dir
*d
=
2958 lookup_untracked(uc
, dir
, path
, component_len
);
2960 invalidate_one_component(uc
, d
, rest
+ 1,
2961 len
- (component_len
+ 1));
2963 invalidate_one_directory(uc
, dir
);
2967 invalidate_one_directory(uc
, dir
);
2968 return uc
->dir_flags
& DIR_SHOW_OTHER_DIRECTORIES
;
2971 void untracked_cache_invalidate_path(struct index_state
*istate
,
2974 if (!istate
->untracked
|| !istate
->untracked
->root
)
2976 invalidate_one_component(istate
->untracked
, istate
->untracked
->root
,
2977 path
, strlen(path
));
2980 void untracked_cache_remove_from_index(struct index_state
*istate
,
2983 untracked_cache_invalidate_path(istate
, path
);
2986 void untracked_cache_add_to_index(struct index_state
*istate
,
2989 untracked_cache_invalidate_path(istate
, path
);
2992 static void connect_wt_gitdir_in_nested(const char *sub_worktree
,
2993 const char *sub_gitdir
)
2996 struct repository subrepo
;
2997 struct strbuf sub_wt
= STRBUF_INIT
;
2998 struct strbuf sub_gd
= STRBUF_INIT
;
3000 const struct submodule
*sub
;
3002 /* If the submodule has no working tree, we can ignore it. */
3003 if (repo_init(&subrepo
, sub_gitdir
, sub_worktree
))
3006 if (repo_read_index(&subrepo
) < 0)
3007 die("index file corrupt in repo %s", subrepo
.gitdir
);
3009 for (i
= 0; i
< subrepo
.index
->cache_nr
; i
++) {
3010 const struct cache_entry
*ce
= subrepo
.index
->cache
[i
];
3012 if (!S_ISGITLINK(ce
->ce_mode
))
3015 while (i
+ 1 < subrepo
.index
->cache_nr
&&
3016 !strcmp(ce
->name
, subrepo
.index
->cache
[i
+ 1]->name
))
3018 * Skip entries with the same name in different stages
3019 * to make sure an entry is returned only once.
3023 sub
= submodule_from_path(&subrepo
, &null_oid
, ce
->name
);
3024 if (!sub
|| !is_submodule_active(&subrepo
, ce
->name
))
3025 /* .gitmodules broken or inactive sub */
3028 strbuf_reset(&sub_wt
);
3029 strbuf_reset(&sub_gd
);
3030 strbuf_addf(&sub_wt
, "%s/%s", sub_worktree
, sub
->path
);
3031 strbuf_addf(&sub_gd
, "%s/modules/%s", sub_gitdir
, sub
->name
);
3033 connect_work_tree_and_git_dir(sub_wt
.buf
, sub_gd
.buf
, 1);
3035 strbuf_release(&sub_wt
);
3036 strbuf_release(&sub_gd
);
3037 repo_clear(&subrepo
);
3040 void connect_work_tree_and_git_dir(const char *work_tree_
,
3041 const char *git_dir_
,
3042 int recurse_into_nested
)
3044 struct strbuf gitfile_sb
= STRBUF_INIT
;
3045 struct strbuf cfg_sb
= STRBUF_INIT
;
3046 struct strbuf rel_path
= STRBUF_INIT
;
3047 char *git_dir
, *work_tree
;
3049 /* Prepare .git file */
3050 strbuf_addf(&gitfile_sb
, "%s/.git", work_tree_
);
3051 if (safe_create_leading_directories_const(gitfile_sb
.buf
))
3052 die(_("could not create directories for %s"), gitfile_sb
.buf
);
3054 /* Prepare config file */
3055 strbuf_addf(&cfg_sb
, "%s/config", git_dir_
);
3056 if (safe_create_leading_directories_const(cfg_sb
.buf
))
3057 die(_("could not create directories for %s"), cfg_sb
.buf
);
3059 git_dir
= real_pathdup(git_dir_
, 1);
3060 work_tree
= real_pathdup(work_tree_
, 1);
3062 /* Write .git file */
3063 write_file(gitfile_sb
.buf
, "gitdir: %s",
3064 relative_path(git_dir
, work_tree
, &rel_path
));
3065 /* Update core.worktree setting */
3066 git_config_set_in_file(cfg_sb
.buf
, "core.worktree",
3067 relative_path(work_tree
, git_dir
, &rel_path
));
3069 strbuf_release(&gitfile_sb
);
3070 strbuf_release(&cfg_sb
);
3071 strbuf_release(&rel_path
);
3073 if (recurse_into_nested
)
3074 connect_wt_gitdir_in_nested(work_tree
, git_dir
);
3081 * Migrate the git directory of the given path from old_git_dir to new_git_dir.
3083 void relocate_gitdir(const char *path
, const char *old_git_dir
, const char *new_git_dir
)
3085 if (rename(old_git_dir
, new_git_dir
) < 0)
3086 die_errno(_("could not migrate git directory from '%s' to '%s'"),
3087 old_git_dir
, new_git_dir
);
3089 connect_work_tree_and_git_dir(path
, new_git_dir
, 0);