2 * This handles recursive filename detection with exclude
3 * files, index knowledge etc..
5 * See Documentation/technical/api-directory-listing.txt
7 * Copyright (C) Linus Torvalds, 2005-2006
8 * Junio Hamano, 2005-2006
13 #include "object-store.h"
16 #include "wildmatch.h"
20 #include "ewah/ewok.h"
21 #include "fsmonitor.h"
22 #include "submodule-config.h"
25 * Tells read_directory_recursive how a file or directory should be treated.
26 * Values are ordered by significance, e.g. if a directory contains both
27 * excluded and untracked files, it is listed as untracked because
28 * path_untracked > path_excluded.
38 * Support data structure for our opendir/readdir/closedir wrappers
42 struct untracked_cache_dir
*untracked
;
48 struct untracked_cache_dir
*ucd
;
51 static enum path_treatment
read_directory_recursive(struct dir_struct
*dir
,
52 struct index_state
*istate
, const char *path
, int len
,
53 struct untracked_cache_dir
*untracked
,
54 int check_only
, int stop_at_first_file
, const struct pathspec
*pathspec
);
55 static int get_dtype(struct dirent
*de
, struct index_state
*istate
,
56 const char *path
, int len
);
58 int count_slashes(const char *s
)
67 int fspathcmp(const char *a
, const char *b
)
69 return ignore_case
? strcasecmp(a
, b
) : strcmp(a
, b
);
72 int fspathncmp(const char *a
, const char *b
, size_t count
)
74 return ignore_case
? strncasecmp(a
, b
, count
) : strncmp(a
, b
, count
);
77 int git_fnmatch(const struct pathspec_item
*item
,
78 const char *pattern
, const char *string
,
82 if (ps_strncmp(item
, pattern
, string
, prefix
))
87 if (item
->flags
& PATHSPEC_ONESTAR
) {
88 int pattern_len
= strlen(++pattern
);
89 int string_len
= strlen(string
);
90 return string_len
< pattern_len
||
91 ps_strcmp(item
, pattern
,
92 string
+ string_len
- pattern_len
);
94 if (item
->magic
& PATHSPEC_GLOB
)
95 return wildmatch(pattern
, string
,
97 (item
->magic
& PATHSPEC_ICASE
? WM_CASEFOLD
: 0));
99 /* wildmatch has not learned no FNM_PATHNAME mode yet */
100 return wildmatch(pattern
, string
,
101 item
->magic
& PATHSPEC_ICASE
? WM_CASEFOLD
: 0);
104 static int fnmatch_icase_mem(const char *pattern
, int patternlen
,
105 const char *string
, int stringlen
,
109 struct strbuf pat_buf
= STRBUF_INIT
;
110 struct strbuf str_buf
= STRBUF_INIT
;
111 const char *use_pat
= pattern
;
112 const char *use_str
= string
;
114 if (pattern
[patternlen
]) {
115 strbuf_add(&pat_buf
, pattern
, patternlen
);
116 use_pat
= pat_buf
.buf
;
118 if (string
[stringlen
]) {
119 strbuf_add(&str_buf
, string
, stringlen
);
120 use_str
= str_buf
.buf
;
124 flags
|= WM_CASEFOLD
;
125 match_status
= wildmatch(use_pat
, use_str
, flags
);
127 strbuf_release(&pat_buf
);
128 strbuf_release(&str_buf
);
133 static size_t common_prefix_len(const struct pathspec
*pathspec
)
139 * ":(icase)path" is treated as a pathspec full of
140 * wildcard. In other words, only prefix is considered common
141 * prefix. If the pathspec is abc/foo abc/bar, running in
142 * subdir xyz, the common prefix is still xyz, not xyz/abc as
145 GUARD_PATHSPEC(pathspec
,
154 for (n
= 0; n
< pathspec
->nr
; n
++) {
155 size_t i
= 0, len
= 0, item_len
;
156 if (pathspec
->items
[n
].magic
& PATHSPEC_EXCLUDE
)
158 if (pathspec
->items
[n
].magic
& PATHSPEC_ICASE
)
159 item_len
= pathspec
->items
[n
].prefix
;
161 item_len
= pathspec
->items
[n
].nowildcard_len
;
162 while (i
< item_len
&& (n
== 0 || i
< max
)) {
163 char c
= pathspec
->items
[n
].match
[i
];
164 if (c
!= pathspec
->items
[0].match
[i
])
170 if (n
== 0 || len
< max
) {
180 * Returns a copy of the longest leading path common among all
183 char *common_prefix(const struct pathspec
*pathspec
)
185 unsigned long len
= common_prefix_len(pathspec
);
187 return len
? xmemdupz(pathspec
->items
[0].match
, len
) : NULL
;
190 int fill_directory(struct dir_struct
*dir
,
191 struct index_state
*istate
,
192 const struct pathspec
*pathspec
)
198 * Calculate common prefix for the pathspec, and
199 * use that to optimize the directory walk
201 prefix_len
= common_prefix_len(pathspec
);
202 prefix
= prefix_len
? pathspec
->items
[0].match
: "";
204 /* Read the directory and prune it */
205 read_directory(dir
, istate
, prefix
, prefix_len
, pathspec
);
210 int within_depth(const char *name
, int namelen
,
211 int depth
, int max_depth
)
213 const char *cp
= name
, *cpe
= name
+ namelen
;
219 if (depth
> max_depth
)
226 * Read the contents of the blob with the given OID into a buffer.
227 * Append a trailing LF to the end if the last line doesn't have one.
230 * -1 when the OID is invalid or unknown or does not refer to a blob.
231 * 0 when the blob is empty.
232 * 1 along with { data, size } of the (possibly augmented) buffer
235 * Optionally updates the given oid_stat with the given OID (when valid).
237 static int do_read_blob(const struct object_id
*oid
, struct oid_stat
*oid_stat
,
238 size_t *size_out
, char **data_out
)
240 enum object_type type
;
247 data
= read_object_file(oid
, &type
, &sz
);
248 if (!data
|| type
!= OBJ_BLOB
) {
254 memset(&oid_stat
->stat
, 0, sizeof(oid_stat
->stat
));
255 oidcpy(&oid_stat
->oid
, oid
);
263 if (data
[sz
- 1] != '\n') {
264 data
= xrealloc(data
, st_add(sz
, 1));
268 *size_out
= xsize_t(sz
);
274 #define DO_MATCH_EXCLUDE (1<<0)
275 #define DO_MATCH_DIRECTORY (1<<1)
276 #define DO_MATCH_LEADING_PATHSPEC (1<<2)
279 * Does the given pathspec match the given name? A match is found if
281 * (1) the pathspec string is leading directory of 'name' ("RECURSIVELY"), or
282 * (2) the pathspec string has a leading part matching 'name' ("LEADING"), or
283 * (3) the pathspec string is a wildcard and matches 'name' ("WILDCARD"), or
284 * (4) the pathspec string is exactly the same as 'name' ("EXACT").
286 * Return value tells which case it was (1-4), or 0 when there is no match.
288 * It may be instructive to look at a small table of concrete examples
289 * to understand the differences between 1, 2, and 4:
292 * | a/b | a/b/ | a/b/c
293 * ------+-----------+-----------+------------
294 * a/b | EXACT | EXACT[1] | LEADING[2]
295 * Names a/b/ | RECURSIVE | EXACT | LEADING[2]
296 * a/b/c | RECURSIVE | RECURSIVE | EXACT
298 * [1] Only if DO_MATCH_DIRECTORY is passed; otherwise, this is NOT a match.
299 * [2] Only if DO_MATCH_LEADING_PATHSPEC is passed; otherwise, not a match.
301 static int match_pathspec_item(const struct index_state
*istate
,
302 const struct pathspec_item
*item
, int prefix
,
303 const char *name
, int namelen
, unsigned flags
)
305 /* name/namelen has prefix cut off by caller */
306 const char *match
= item
->match
+ prefix
;
307 int matchlen
= item
->len
- prefix
;
310 * The normal call pattern is:
311 * 1. prefix = common_prefix_len(ps);
312 * 2. prune something, or fill_directory
313 * 3. match_pathspec()
315 * 'prefix' at #1 may be shorter than the command's prefix and
316 * it's ok for #2 to match extra files. Those extras will be
319 * Suppose the pathspec is 'foo' and '../bar' running from
320 * subdir 'xyz'. The common prefix at #1 will be empty, thanks
321 * to "../". We may have xyz/foo _and_ XYZ/foo after #2. The
322 * user does not want XYZ/foo, only the "foo" part should be
323 * case-insensitive. We need to filter out XYZ/foo here. In
324 * other words, we do not trust the caller on comparing the
325 * prefix part when :(icase) is involved. We do exact
326 * comparison ourselves.
328 * Normally the caller (common_prefix_len() in fact) does
329 * _exact_ matching on name[-prefix+1..-1] and we do not need
330 * to check that part. Be defensive and check it anyway, in
331 * case common_prefix_len is changed, or a new caller is
332 * introduced that does not use common_prefix_len.
334 * If the penalty turns out too high when prefix is really
335 * long, maybe change it to
336 * strncmp(match, name, item->prefix - prefix)
338 if (item
->prefix
&& (item
->magic
& PATHSPEC_ICASE
) &&
339 strncmp(item
->match
, name
- prefix
, item
->prefix
))
342 if (item
->attr_match_nr
&&
343 !match_pathspec_attrs(istate
, name
, namelen
, item
))
346 /* If the match was just the prefix, we matched */
348 return MATCHED_RECURSIVELY
;
350 if (matchlen
<= namelen
&& !ps_strncmp(item
, match
, name
, matchlen
)) {
351 if (matchlen
== namelen
)
352 return MATCHED_EXACTLY
;
354 if (match
[matchlen
-1] == '/' || name
[matchlen
] == '/')
355 return MATCHED_RECURSIVELY
;
356 } else if ((flags
& DO_MATCH_DIRECTORY
) &&
357 match
[matchlen
- 1] == '/' &&
358 namelen
== matchlen
- 1 &&
359 !ps_strncmp(item
, match
, name
, namelen
))
360 return MATCHED_EXACTLY
;
362 if (item
->nowildcard_len
< item
->len
&&
363 !git_fnmatch(item
, match
, name
,
364 item
->nowildcard_len
- prefix
))
365 return MATCHED_FNMATCH
;
367 /* Perform checks to see if "name" is a leading string of the pathspec */
368 if (flags
& DO_MATCH_LEADING_PATHSPEC
) {
369 /* name is a literal prefix of the pathspec */
370 int offset
= name
[namelen
-1] == '/' ? 1 : 0;
371 if ((namelen
< matchlen
) &&
372 (match
[namelen
-offset
] == '/') &&
373 !ps_strncmp(item
, match
, name
, namelen
))
374 return MATCHED_RECURSIVELY_LEADING_PATHSPEC
;
376 /* name" doesn't match up to the first wild character */
377 if (item
->nowildcard_len
< item
->len
&&
378 ps_strncmp(item
, match
, name
,
379 item
->nowildcard_len
- prefix
))
383 * Here is where we would perform a wildmatch to check if
384 * "name" can be matched as a directory (or a prefix) against
385 * the pathspec. Since wildmatch doesn't have this capability
386 * at the present we have to punt and say that it is a match,
387 * potentially returning a false positive
388 * The submodules themselves will be able to perform more
389 * accurate matching to determine if the pathspec matches.
391 return MATCHED_RECURSIVELY_LEADING_PATHSPEC
;
398 * Given a name and a list of pathspecs, returns the nature of the
399 * closest (i.e. most specific) match of the name to any of the
402 * The caller typically calls this multiple times with the same
403 * pathspec and seen[] array but with different name/namelen
404 * (e.g. entries from the index) and is interested in seeing if and
405 * how each pathspec matches all the names it calls this function
406 * with. A mark is left in the seen[] array for each pathspec element
407 * indicating the closest type of match that element achieved, so if
408 * seen[n] remains zero after multiple invocations, that means the nth
409 * pathspec did not match any names, which could indicate that the
410 * user mistyped the nth pathspec.
412 static int do_match_pathspec(const struct index_state
*istate
,
413 const struct pathspec
*ps
,
414 const char *name
, int namelen
,
415 int prefix
, char *seen
,
418 int i
, retval
= 0, exclude
= flags
& DO_MATCH_EXCLUDE
;
430 if (!ps
->recursive
||
431 !(ps
->magic
& PATHSPEC_MAXDEPTH
) ||
433 return MATCHED_RECURSIVELY
;
435 if (within_depth(name
, namelen
, 0, ps
->max_depth
))
436 return MATCHED_EXACTLY
;
444 for (i
= ps
->nr
- 1; i
>= 0; i
--) {
447 if ((!exclude
&& ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
) ||
448 ( exclude
&& !(ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
)))
451 if (seen
&& seen
[i
] == MATCHED_EXACTLY
)
454 * Make exclude patterns optional and never report
455 * "pathspec ':(exclude)foo' matches no files"
457 if (seen
&& ps
->items
[i
].magic
& PATHSPEC_EXCLUDE
)
458 seen
[i
] = MATCHED_FNMATCH
;
459 how
= match_pathspec_item(istate
, ps
->items
+i
, prefix
, name
,
462 (ps
->magic
& PATHSPEC_MAXDEPTH
) &&
463 ps
->max_depth
!= -1 &&
464 how
&& how
!= MATCHED_FNMATCH
) {
465 int len
= ps
->items
[i
].len
;
466 if (name
[len
] == '/')
468 if (within_depth(name
+len
, namelen
-len
, 0, ps
->max_depth
))
469 how
= MATCHED_EXACTLY
;
476 if (seen
&& seen
[i
] < how
)
483 int match_pathspec(const struct index_state
*istate
,
484 const struct pathspec
*ps
,
485 const char *name
, int namelen
,
486 int prefix
, char *seen
, int is_dir
)
488 int positive
, negative
;
489 unsigned flags
= is_dir
? DO_MATCH_DIRECTORY
: 0;
490 positive
= do_match_pathspec(istate
, ps
, name
, namelen
,
491 prefix
, seen
, flags
);
492 if (!(ps
->magic
& PATHSPEC_EXCLUDE
) || !positive
)
494 negative
= do_match_pathspec(istate
, ps
, name
, namelen
,
496 flags
| DO_MATCH_EXCLUDE
);
497 return negative
? 0 : positive
;
501 * Check if a submodule is a superset of the pathspec
503 int submodule_path_match(const struct index_state
*istate
,
504 const struct pathspec
*ps
,
505 const char *submodule_name
,
508 int matched
= do_match_pathspec(istate
, ps
, submodule_name
,
509 strlen(submodule_name
),
512 DO_MATCH_LEADING_PATHSPEC
);
516 int report_path_error(const char *ps_matched
,
517 const struct pathspec
*pathspec
)
520 * Make sure all pathspec matched; otherwise it is an error.
523 for (num
= 0; num
< pathspec
->nr
; num
++) {
524 int other
, found_dup
;
529 * The caller might have fed identical pathspec
530 * twice. Do not barf on such a mistake.
531 * FIXME: parse_pathspec should have eliminated
532 * duplicate pathspec.
534 for (found_dup
= other
= 0;
535 !found_dup
&& other
< pathspec
->nr
;
537 if (other
== num
|| !ps_matched
[other
])
539 if (!strcmp(pathspec
->items
[other
].original
,
540 pathspec
->items
[num
].original
))
542 * Ok, we have a match already.
549 error(_("pathspec '%s' did not match any file(s) known to git"),
550 pathspec
->items
[num
].original
);
557 * Return the length of the "simple" part of a path match limiter.
559 int simple_length(const char *match
)
564 unsigned char c
= *match
++;
566 if (c
== '\0' || is_glob_special(c
))
571 int no_wildcard(const char *string
)
573 return string
[simple_length(string
)] == '\0';
576 void parse_path_pattern(const char **pattern
,
581 const char *p
= *pattern
;
586 *flags
|= PATTERN_FLAG_NEGATIVE
;
590 if (len
&& p
[len
- 1] == '/') {
592 *flags
|= PATTERN_FLAG_MUSTBEDIR
;
594 for (i
= 0; i
< len
; i
++) {
599 *flags
|= PATTERN_FLAG_NODIR
;
600 *nowildcardlen
= simple_length(p
);
602 * we should have excluded the trailing slash from 'p' too,
603 * but that's one more allocation. Instead just make sure
604 * nowildcardlen does not exceed real patternlen
606 if (*nowildcardlen
> len
)
607 *nowildcardlen
= len
;
608 if (*p
== '*' && no_wildcard(p
+ 1))
609 *flags
|= PATTERN_FLAG_ENDSWITH
;
614 int pl_hashmap_cmp(const void *unused_cmp_data
,
615 const struct hashmap_entry
*a
,
616 const struct hashmap_entry
*b
,
619 const struct pattern_entry
*ee1
=
620 container_of(a
, struct pattern_entry
, ent
);
621 const struct pattern_entry
*ee2
=
622 container_of(b
, struct pattern_entry
, ent
);
624 size_t min_len
= ee1
->patternlen
<= ee2
->patternlen
629 return strncasecmp(ee1
->pattern
, ee2
->pattern
, min_len
);
630 return strncmp(ee1
->pattern
, ee2
->pattern
, min_len
);
633 static void add_pattern_to_hashsets(struct pattern_list
*pl
, struct path_pattern
*given
)
635 struct pattern_entry
*translated
;
639 if (!pl
->use_cone_patterns
)
642 if (given
->flags
& PATTERN_FLAG_NEGATIVE
&&
643 given
->flags
& PATTERN_FLAG_MUSTBEDIR
&&
644 !strcmp(given
->pattern
, "/*")) {
649 if (!given
->flags
&& !strcmp(given
->pattern
, "/*")) {
654 if (given
->patternlen
> 2 &&
655 !strcmp(given
->pattern
+ given
->patternlen
- 2, "/*")) {
656 if (!(given
->flags
& PATTERN_FLAG_NEGATIVE
)) {
657 /* Not a cone pattern. */
658 pl
->use_cone_patterns
= 0;
659 warning(_("unrecognized pattern: '%s'"), given
->pattern
);
663 truncated
= xstrdup(given
->pattern
);
664 truncated
[given
->patternlen
- 2] = 0;
666 translated
= xmalloc(sizeof(struct pattern_entry
));
667 translated
->pattern
= truncated
;
668 translated
->patternlen
= given
->patternlen
- 2;
669 hashmap_entry_init(&translated
->ent
,
671 strihash(translated
->pattern
) :
672 strhash(translated
->pattern
));
674 if (!hashmap_get_entry(&pl
->recursive_hashmap
,
675 translated
, ent
, NULL
)) {
676 /* We did not see the "parent" included */
677 warning(_("unrecognized negative pattern: '%s'"),
684 hashmap_add(&pl
->parent_hashmap
, &translated
->ent
);
685 hashmap_remove(&pl
->recursive_hashmap
, &translated
->ent
, &data
);
690 if (given
->flags
& PATTERN_FLAG_NEGATIVE
) {
691 warning(_("unrecognized negative pattern: '%s'"),
696 translated
= xmalloc(sizeof(struct pattern_entry
));
698 translated
->pattern
= xstrdup(given
->pattern
);
699 translated
->patternlen
= given
->patternlen
;
700 hashmap_entry_init(&translated
->ent
,
702 strihash(translated
->pattern
) :
703 strhash(translated
->pattern
));
705 hashmap_add(&pl
->recursive_hashmap
, &translated
->ent
);
707 if (hashmap_get_entry(&pl
->parent_hashmap
, translated
, ent
, NULL
)) {
708 /* we already included this at the parent level */
709 warning(_("your sparse-checkout file may have issues: pattern '%s' is repeated"),
711 hashmap_remove(&pl
->parent_hashmap
, &translated
->ent
, &data
);
719 warning(_("disabling cone pattern matching"));
720 hashmap_free_entries(&pl
->parent_hashmap
, struct pattern_entry
, ent
);
721 hashmap_free_entries(&pl
->recursive_hashmap
, struct pattern_entry
, ent
);
722 pl
->use_cone_patterns
= 0;
725 static int hashmap_contains_path(struct hashmap
*map
,
726 struct strbuf
*pattern
)
728 struct pattern_entry p
;
730 /* Check straight mapping */
731 p
.pattern
= pattern
->buf
;
732 p
.patternlen
= pattern
->len
;
733 hashmap_entry_init(&p
.ent
,
735 strihash(p
.pattern
) :
737 return !!hashmap_get_entry(map
, &p
, ent
, NULL
);
740 int hashmap_contains_parent(struct hashmap
*map
,
742 struct strbuf
*buffer
)
746 strbuf_setlen(buffer
, 0);
749 strbuf_addch(buffer
, '/');
751 strbuf_addstr(buffer
, path
);
753 slash_pos
= strrchr(buffer
->buf
, '/');
755 while (slash_pos
> buffer
->buf
) {
756 strbuf_setlen(buffer
, slash_pos
- buffer
->buf
);
758 if (hashmap_contains_path(map
, buffer
))
761 slash_pos
= strrchr(buffer
->buf
, '/');
767 void add_pattern(const char *string
, const char *base
,
768 int baselen
, struct pattern_list
*pl
, int srcpos
)
770 struct path_pattern
*pattern
;
775 parse_path_pattern(&string
, &patternlen
, &flags
, &nowildcardlen
);
776 if (flags
& PATTERN_FLAG_MUSTBEDIR
) {
777 FLEXPTR_ALLOC_MEM(pattern
, pattern
, string
, patternlen
);
779 pattern
= xmalloc(sizeof(*pattern
));
780 pattern
->pattern
= string
;
782 pattern
->patternlen
= patternlen
;
783 pattern
->nowildcardlen
= nowildcardlen
;
784 pattern
->base
= base
;
785 pattern
->baselen
= baselen
;
786 pattern
->flags
= flags
;
787 pattern
->srcpos
= srcpos
;
788 ALLOC_GROW(pl
->patterns
, pl
->nr
+ 1, pl
->alloc
);
789 pl
->patterns
[pl
->nr
++] = pattern
;
792 add_pattern_to_hashsets(pl
, pattern
);
795 static int read_skip_worktree_file_from_index(const struct index_state
*istate
,
797 size_t *size_out
, char **data_out
,
798 struct oid_stat
*oid_stat
)
803 pos
= index_name_pos(istate
, path
, len
);
806 if (!ce_skip_worktree(istate
->cache
[pos
]))
809 return do_read_blob(&istate
->cache
[pos
]->oid
, oid_stat
, size_out
, data_out
);
813 * Frees memory within pl which was allocated for exclude patterns and
814 * the file buffer. Does not free pl itself.
816 void clear_pattern_list(struct pattern_list
*pl
)
820 for (i
= 0; i
< pl
->nr
; i
++)
821 free(pl
->patterns
[i
]);
825 memset(pl
, 0, sizeof(*pl
));
828 static void trim_trailing_spaces(char *buf
)
830 char *p
, *last_space
= NULL
;
832 for (p
= buf
; *p
; p
++)
852 * Given a subdirectory name and "dir" of the current directory,
853 * search the subdir in "dir" and return it, or create a new one if it
854 * does not exist in "dir".
856 * If "name" has the trailing slash, it'll be excluded in the search.
858 static struct untracked_cache_dir
*lookup_untracked(struct untracked_cache
*uc
,
859 struct untracked_cache_dir
*dir
,
860 const char *name
, int len
)
863 struct untracked_cache_dir
*d
;
866 if (len
&& name
[len
- 1] == '/')
870 while (last
> first
) {
871 int cmp
, next
= first
+ ((last
- first
) >> 1);
873 cmp
= strncmp(name
, d
->name
, len
);
874 if (!cmp
&& strlen(d
->name
) > len
)
886 FLEX_ALLOC_MEM(d
, name
, name
, len
);
888 ALLOC_GROW(dir
->dirs
, dir
->dirs_nr
+ 1, dir
->dirs_alloc
);
889 MOVE_ARRAY(dir
->dirs
+ first
+ 1, dir
->dirs
+ first
,
890 dir
->dirs_nr
- first
);
892 dir
->dirs
[first
] = d
;
896 static void do_invalidate_gitignore(struct untracked_cache_dir
*dir
)
900 dir
->untracked_nr
= 0;
901 for (i
= 0; i
< dir
->dirs_nr
; i
++)
902 do_invalidate_gitignore(dir
->dirs
[i
]);
905 static void invalidate_gitignore(struct untracked_cache
*uc
,
906 struct untracked_cache_dir
*dir
)
908 uc
->gitignore_invalidated
++;
909 do_invalidate_gitignore(dir
);
912 static void invalidate_directory(struct untracked_cache
*uc
,
913 struct untracked_cache_dir
*dir
)
918 * Invalidation increment here is just roughly correct. If
919 * untracked_nr or any of dirs[].recurse is non-zero, we
920 * should increment dir_invalidated too. But that's more
924 uc
->dir_invalidated
++;
927 dir
->untracked_nr
= 0;
928 for (i
= 0; i
< dir
->dirs_nr
; i
++)
929 dir
->dirs
[i
]->recurse
= 0;
932 static int add_patterns_from_buffer(char *buf
, size_t size
,
933 const char *base
, int baselen
,
934 struct pattern_list
*pl
);
937 * Given a file with name "fname", read it (either from disk, or from
938 * an index if 'istate' is non-null), parse it and store the
939 * exclude rules in "pl".
941 * If "ss" is not NULL, compute SHA-1 of the exclude file and fill
942 * stat data from disk (only valid if add_patterns returns zero). If
943 * ss_valid is non-zero, "ss" must contain good value as input.
945 static int add_patterns(const char *fname
, const char *base
, int baselen
,
946 struct pattern_list
*pl
, struct index_state
*istate
,
947 struct oid_stat
*oid_stat
)
955 fd
= open(fname
, O_RDONLY
);
956 if (fd
< 0 || fstat(fd
, &st
) < 0) {
958 warn_on_fopen_errors(fname
);
963 r
= read_skip_worktree_file_from_index(istate
, fname
,
969 size
= xsize_t(st
.st_size
);
972 fill_stat_data(&oid_stat
->stat
, &st
);
973 oidcpy(&oid_stat
->oid
, the_hash_algo
->empty_blob
);
979 buf
= xmallocz(size
);
980 if (read_in_full(fd
, buf
, size
) != size
) {
989 if (oid_stat
->valid
&&
990 !match_stat_data_racy(istate
, &oid_stat
->stat
, &st
))
991 ; /* no content change, ss->sha1 still good */
993 (pos
= index_name_pos(istate
, fname
, strlen(fname
))) >= 0 &&
994 !ce_stage(istate
->cache
[pos
]) &&
995 ce_uptodate(istate
->cache
[pos
]) &&
996 !would_convert_to_git(istate
, fname
))
997 oidcpy(&oid_stat
->oid
,
998 &istate
->cache
[pos
]->oid
);
1000 hash_object_file(buf
, size
, "blob",
1002 fill_stat_data(&oid_stat
->stat
, &st
);
1003 oid_stat
->valid
= 1;
1007 add_patterns_from_buffer(buf
, size
, base
, baselen
, pl
);
1011 static int add_patterns_from_buffer(char *buf
, size_t size
,
1012 const char *base
, int baselen
,
1013 struct pattern_list
*pl
)
1018 hashmap_init(&pl
->recursive_hashmap
, pl_hashmap_cmp
, NULL
, 0);
1019 hashmap_init(&pl
->parent_hashmap
, pl_hashmap_cmp
, NULL
, 0);
1023 if (skip_utf8_bom(&buf
, size
))
1024 size
-= buf
- pl
->filebuf
;
1028 for (i
= 0; i
< size
; i
++) {
1029 if (buf
[i
] == '\n') {
1030 if (entry
!= buf
+ i
&& entry
[0] != '#') {
1031 buf
[i
- (i
&& buf
[i
-1] == '\r')] = 0;
1032 trim_trailing_spaces(entry
);
1033 add_pattern(entry
, base
, baselen
, pl
, lineno
);
1036 entry
= buf
+ i
+ 1;
1042 int add_patterns_from_file_to_list(const char *fname
, const char *base
,
1043 int baselen
, struct pattern_list
*pl
,
1044 struct index_state
*istate
)
1046 return add_patterns(fname
, base
, baselen
, pl
, istate
, NULL
);
1049 int add_patterns_from_blob_to_list(
1050 struct object_id
*oid
,
1051 const char *base
, int baselen
,
1052 struct pattern_list
*pl
)
1058 r
= do_read_blob(oid
, NULL
, &size
, &buf
);
1062 add_patterns_from_buffer(buf
, size
, base
, baselen
, pl
);
1066 struct pattern_list
*add_pattern_list(struct dir_struct
*dir
,
1067 int group_type
, const char *src
)
1069 struct pattern_list
*pl
;
1070 struct exclude_list_group
*group
;
1072 group
= &dir
->exclude_list_group
[group_type
];
1073 ALLOC_GROW(group
->pl
, group
->nr
+ 1, group
->alloc
);
1074 pl
= &group
->pl
[group
->nr
++];
1075 memset(pl
, 0, sizeof(*pl
));
1081 * Used to set up core.excludesfile and .git/info/exclude lists.
1083 static void add_patterns_from_file_1(struct dir_struct
*dir
, const char *fname
,
1084 struct oid_stat
*oid_stat
)
1086 struct pattern_list
*pl
;
1088 * catch setup_standard_excludes() that's called before
1089 * dir->untracked is assigned. That function behaves
1090 * differently when dir->untracked is non-NULL.
1092 if (!dir
->untracked
)
1093 dir
->unmanaged_exclude_files
++;
1094 pl
= add_pattern_list(dir
, EXC_FILE
, fname
);
1095 if (add_patterns(fname
, "", 0, pl
, NULL
, oid_stat
) < 0)
1096 die(_("cannot use %s as an exclude file"), fname
);
1099 void add_patterns_from_file(struct dir_struct
*dir
, const char *fname
)
1101 dir
->unmanaged_exclude_files
++; /* see validate_untracked_cache() */
1102 add_patterns_from_file_1(dir
, fname
, NULL
);
1105 int match_basename(const char *basename
, int basenamelen
,
1106 const char *pattern
, int prefix
, int patternlen
,
1109 if (prefix
== patternlen
) {
1110 if (patternlen
== basenamelen
&&
1111 !fspathncmp(pattern
, basename
, basenamelen
))
1113 } else if (flags
& PATTERN_FLAG_ENDSWITH
) {
1114 /* "*literal" matching against "fooliteral" */
1115 if (patternlen
- 1 <= basenamelen
&&
1116 !fspathncmp(pattern
+ 1,
1117 basename
+ basenamelen
- (patternlen
- 1),
1121 if (fnmatch_icase_mem(pattern
, patternlen
,
1122 basename
, basenamelen
,
1129 int match_pathname(const char *pathname
, int pathlen
,
1130 const char *base
, int baselen
,
1131 const char *pattern
, int prefix
, int patternlen
,
1138 * match with FNM_PATHNAME; the pattern has base implicitly
1141 if (*pattern
== '/') {
1148 * baselen does not count the trailing slash. base[] may or
1149 * may not end with a trailing slash though.
1151 if (pathlen
< baselen
+ 1 ||
1152 (baselen
&& pathname
[baselen
] != '/') ||
1153 fspathncmp(pathname
, base
, baselen
))
1156 namelen
= baselen
? pathlen
- baselen
- 1 : pathlen
;
1157 name
= pathname
+ pathlen
- namelen
;
1161 * if the non-wildcard part is longer than the
1162 * remaining pathname, surely it cannot match.
1164 if (prefix
> namelen
)
1167 if (fspathncmp(pattern
, name
, prefix
))
1170 patternlen
-= prefix
;
1175 * If the whole pattern did not have a wildcard,
1176 * then our prefix match is all we need; we
1177 * do not need to call fnmatch at all.
1179 if (!patternlen
&& !namelen
)
1183 return fnmatch_icase_mem(pattern
, patternlen
,
1189 * Scan the given exclude list in reverse to see whether pathname
1190 * should be ignored. The first match (i.e. the last on the list), if
1191 * any, determines the fate. Returns the exclude_list element which
1192 * matched, or NULL for undecided.
1194 static struct path_pattern
*last_matching_pattern_from_list(const char *pathname
,
1196 const char *basename
,
1198 struct pattern_list
*pl
,
1199 struct index_state
*istate
)
1201 struct path_pattern
*res
= NULL
; /* undecided */
1205 return NULL
; /* undefined */
1207 for (i
= pl
->nr
- 1; 0 <= i
; i
--) {
1208 struct path_pattern
*pattern
= pl
->patterns
[i
];
1209 const char *exclude
= pattern
->pattern
;
1210 int prefix
= pattern
->nowildcardlen
;
1212 if (pattern
->flags
& PATTERN_FLAG_MUSTBEDIR
) {
1213 if (*dtype
== DT_UNKNOWN
)
1214 *dtype
= get_dtype(NULL
, istate
, pathname
, pathlen
);
1215 if (*dtype
!= DT_DIR
)
1219 if (pattern
->flags
& PATTERN_FLAG_NODIR
) {
1220 if (match_basename(basename
,
1221 pathlen
- (basename
- pathname
),
1222 exclude
, prefix
, pattern
->patternlen
,
1230 assert(pattern
->baselen
== 0 ||
1231 pattern
->base
[pattern
->baselen
- 1] == '/');
1232 if (match_pathname(pathname
, pathlen
,
1234 pattern
->baselen
? pattern
->baselen
- 1 : 0,
1235 exclude
, prefix
, pattern
->patternlen
,
1245 * Scan the list of patterns to determine if the ordered list
1246 * of patterns matches on 'pathname'.
1248 * Return 1 for a match, 0 for not matched and -1 for undecided.
1250 enum pattern_match_result
path_matches_pattern_list(
1251 const char *pathname
, int pathlen
,
1252 const char *basename
, int *dtype
,
1253 struct pattern_list
*pl
,
1254 struct index_state
*istate
)
1256 struct path_pattern
*pattern
;
1257 struct strbuf parent_pathname
= STRBUF_INIT
;
1258 int result
= NOT_MATCHED
;
1259 const char *slash_pos
;
1261 if (!pl
->use_cone_patterns
) {
1262 pattern
= last_matching_pattern_from_list(pathname
, pathlen
, basename
,
1265 if (pattern
->flags
& PATTERN_FLAG_NEGATIVE
)
1277 strbuf_addch(&parent_pathname
, '/');
1278 strbuf_add(&parent_pathname
, pathname
, pathlen
);
1280 if (hashmap_contains_path(&pl
->recursive_hashmap
,
1281 &parent_pathname
)) {
1282 result
= MATCHED_RECURSIVE
;
1286 slash_pos
= strrchr(parent_pathname
.buf
, '/');
1288 if (slash_pos
== parent_pathname
.buf
) {
1289 /* include every file in root */
1294 strbuf_setlen(&parent_pathname
, slash_pos
- parent_pathname
.buf
);
1296 if (hashmap_contains_path(&pl
->parent_hashmap
, &parent_pathname
)) {
1301 if (hashmap_contains_parent(&pl
->recursive_hashmap
,
1304 result
= MATCHED_RECURSIVE
;
1307 strbuf_release(&parent_pathname
);
1311 static struct path_pattern
*last_matching_pattern_from_lists(
1312 struct dir_struct
*dir
, struct index_state
*istate
,
1313 const char *pathname
, int pathlen
,
1314 const char *basename
, int *dtype_p
)
1317 struct exclude_list_group
*group
;
1318 struct path_pattern
*pattern
;
1319 for (i
= EXC_CMDL
; i
<= EXC_FILE
; i
++) {
1320 group
= &dir
->exclude_list_group
[i
];
1321 for (j
= group
->nr
- 1; j
>= 0; j
--) {
1322 pattern
= last_matching_pattern_from_list(
1323 pathname
, pathlen
, basename
, dtype_p
,
1324 &group
->pl
[j
], istate
);
1333 * Loads the per-directory exclude list for the substring of base
1334 * which has a char length of baselen.
1336 static void prep_exclude(struct dir_struct
*dir
,
1337 struct index_state
*istate
,
1338 const char *base
, int baselen
)
1340 struct exclude_list_group
*group
;
1341 struct pattern_list
*pl
;
1342 struct exclude_stack
*stk
= NULL
;
1343 struct untracked_cache_dir
*untracked
;
1346 group
= &dir
->exclude_list_group
[EXC_DIRS
];
1349 * Pop the exclude lists from the EXCL_DIRS exclude_list_group
1350 * which originate from directories not in the prefix of the
1351 * path being checked.
1353 while ((stk
= dir
->exclude_stack
) != NULL
) {
1354 if (stk
->baselen
<= baselen
&&
1355 !strncmp(dir
->basebuf
.buf
, base
, stk
->baselen
))
1357 pl
= &group
->pl
[dir
->exclude_stack
->exclude_ix
];
1358 dir
->exclude_stack
= stk
->prev
;
1359 dir
->pattern
= NULL
;
1360 free((char *)pl
->src
); /* see strbuf_detach() below */
1361 clear_pattern_list(pl
);
1366 /* Skip traversing into sub directories if the parent is excluded */
1371 * Lazy initialization. All call sites currently just
1372 * memset(dir, 0, sizeof(*dir)) before use. Changing all of
1373 * them seems lots of work for little benefit.
1375 if (!dir
->basebuf
.buf
)
1376 strbuf_init(&dir
->basebuf
, PATH_MAX
);
1378 /* Read from the parent directories and push them down. */
1379 current
= stk
? stk
->baselen
: -1;
1380 strbuf_setlen(&dir
->basebuf
, current
< 0 ? 0 : current
);
1382 untracked
= stk
? stk
->ucd
: dir
->untracked
->root
;
1386 while (current
< baselen
) {
1388 struct oid_stat oid_stat
;
1390 stk
= xcalloc(1, sizeof(*stk
));
1395 cp
= strchr(base
+ current
+ 1, '/');
1397 die("oops in prep_exclude");
1400 lookup_untracked(dir
->untracked
, untracked
,
1402 cp
- base
- current
);
1404 stk
->prev
= dir
->exclude_stack
;
1405 stk
->baselen
= cp
- base
;
1406 stk
->exclude_ix
= group
->nr
;
1407 stk
->ucd
= untracked
;
1408 pl
= add_pattern_list(dir
, EXC_DIRS
, NULL
);
1409 strbuf_add(&dir
->basebuf
, base
+ current
, stk
->baselen
- current
);
1410 assert(stk
->baselen
== dir
->basebuf
.len
);
1412 /* Abort if the directory is excluded */
1415 dir
->basebuf
.buf
[stk
->baselen
- 1] = 0;
1416 dir
->pattern
= last_matching_pattern_from_lists(dir
,
1418 dir
->basebuf
.buf
, stk
->baselen
- 1,
1419 dir
->basebuf
.buf
+ current
, &dt
);
1420 dir
->basebuf
.buf
[stk
->baselen
- 1] = '/';
1422 dir
->pattern
->flags
& PATTERN_FLAG_NEGATIVE
)
1423 dir
->pattern
= NULL
;
1425 dir
->exclude_stack
= stk
;
1430 /* Try to read per-directory file */
1431 oidclr(&oid_stat
.oid
);
1433 if (dir
->exclude_per_dir
&&
1435 * If we know that no files have been added in
1436 * this directory (i.e. valid_cached_dir() has
1437 * been executed and set untracked->valid) ..
1439 (!untracked
|| !untracked
->valid
||
1441 * .. and .gitignore does not exist before
1442 * (i.e. null exclude_oid). Then we can skip
1443 * loading .gitignore, which would result in
1446 !is_null_oid(&untracked
->exclude_oid
))) {
1448 * dir->basebuf gets reused by the traversal, but we
1449 * need fname to remain unchanged to ensure the src
1450 * member of each struct path_pattern correctly
1451 * back-references its source file. Other invocations
1452 * of add_pattern_list provide stable strings, so we
1453 * strbuf_detach() and free() here in the caller.
1455 struct strbuf sb
= STRBUF_INIT
;
1456 strbuf_addbuf(&sb
, &dir
->basebuf
);
1457 strbuf_addstr(&sb
, dir
->exclude_per_dir
);
1458 pl
->src
= strbuf_detach(&sb
, NULL
);
1459 add_patterns(pl
->src
, pl
->src
, stk
->baselen
, pl
, istate
,
1460 untracked
? &oid_stat
: NULL
);
1463 * NEEDSWORK: when untracked cache is enabled, prep_exclude()
1464 * will first be called in valid_cached_dir() then maybe many
1465 * times more in last_matching_pattern(). When the cache is
1466 * used, last_matching_pattern() will not be called and
1467 * reading .gitignore content will be a waste.
1469 * So when it's called by valid_cached_dir() and we can get
1470 * .gitignore SHA-1 from the index (i.e. .gitignore is not
1471 * modified on work tree), we could delay reading the
1472 * .gitignore content until we absolutely need it in
1473 * last_matching_pattern(). Be careful about ignore rule
1474 * order, though, if you do that.
1477 !oideq(&oid_stat
.oid
, &untracked
->exclude_oid
)) {
1478 invalidate_gitignore(dir
->untracked
, untracked
);
1479 oidcpy(&untracked
->exclude_oid
, &oid_stat
.oid
);
1481 dir
->exclude_stack
= stk
;
1482 current
= stk
->baselen
;
1484 strbuf_setlen(&dir
->basebuf
, baselen
);
1488 * Loads the exclude lists for the directory containing pathname, then
1489 * scans all exclude lists to determine whether pathname is excluded.
1490 * Returns the exclude_list element which matched, or NULL for
1493 struct path_pattern
*last_matching_pattern(struct dir_struct
*dir
,
1494 struct index_state
*istate
,
1495 const char *pathname
,
1498 int pathlen
= strlen(pathname
);
1499 const char *basename
= strrchr(pathname
, '/');
1500 basename
= (basename
) ? basename
+1 : pathname
;
1502 prep_exclude(dir
, istate
, pathname
, basename
-pathname
);
1505 return dir
->pattern
;
1507 return last_matching_pattern_from_lists(dir
, istate
, pathname
, pathlen
,
1512 * Loads the exclude lists for the directory containing pathname, then
1513 * scans all exclude lists to determine whether pathname is excluded.
1514 * Returns 1 if true, otherwise 0.
1516 int is_excluded(struct dir_struct
*dir
, struct index_state
*istate
,
1517 const char *pathname
, int *dtype_p
)
1519 struct path_pattern
*pattern
=
1520 last_matching_pattern(dir
, istate
, pathname
, dtype_p
);
1522 return pattern
->flags
& PATTERN_FLAG_NEGATIVE
? 0 : 1;
1526 static struct dir_entry
*dir_entry_new(const char *pathname
, int len
)
1528 struct dir_entry
*ent
;
1530 FLEX_ALLOC_MEM(ent
, name
, pathname
, len
);
1535 static struct dir_entry
*dir_add_name(struct dir_struct
*dir
,
1536 struct index_state
*istate
,
1537 const char *pathname
, int len
)
1539 if (index_file_exists(istate
, pathname
, len
, ignore_case
))
1542 ALLOC_GROW(dir
->entries
, dir
->nr
+1, dir
->alloc
);
1543 return dir
->entries
[dir
->nr
++] = dir_entry_new(pathname
, len
);
1546 struct dir_entry
*dir_add_ignored(struct dir_struct
*dir
,
1547 struct index_state
*istate
,
1548 const char *pathname
, int len
)
1550 if (!index_name_is_other(istate
, pathname
, len
))
1553 ALLOC_GROW(dir
->ignored
, dir
->ignored_nr
+1, dir
->ignored_alloc
);
1554 return dir
->ignored
[dir
->ignored_nr
++] = dir_entry_new(pathname
, len
);
1558 index_nonexistent
= 0,
1564 * Do not use the alphabetically sorted index to look up
1565 * the directory name; instead, use the case insensitive
1568 static enum exist_status
directory_exists_in_index_icase(struct index_state
*istate
,
1569 const char *dirname
, int len
)
1571 struct cache_entry
*ce
;
1573 if (index_dir_exists(istate
, dirname
, len
))
1574 return index_directory
;
1576 ce
= index_file_exists(istate
, dirname
, len
, ignore_case
);
1577 if (ce
&& S_ISGITLINK(ce
->ce_mode
))
1578 return index_gitdir
;
1580 return index_nonexistent
;
1584 * The index sorts alphabetically by entry name, which
1585 * means that a gitlink sorts as '\0' at the end, while
1586 * a directory (which is defined not as an entry, but as
1587 * the files it contains) will sort with the '/' at the
1590 static enum exist_status
directory_exists_in_index(struct index_state
*istate
,
1591 const char *dirname
, int len
)
1596 return directory_exists_in_index_icase(istate
, dirname
, len
);
1598 pos
= index_name_pos(istate
, dirname
, len
);
1601 while (pos
< istate
->cache_nr
) {
1602 const struct cache_entry
*ce
= istate
->cache
[pos
++];
1603 unsigned char endchar
;
1605 if (strncmp(ce
->name
, dirname
, len
))
1607 endchar
= ce
->name
[len
];
1611 return index_directory
;
1612 if (!endchar
&& S_ISGITLINK(ce
->ce_mode
))
1613 return index_gitdir
;
1615 return index_nonexistent
;
1619 * When we find a directory when traversing the filesystem, we
1620 * have three distinct cases:
1623 * - see it as a directory
1626 * and which one we choose depends on a combination of existing
1627 * git index contents and the flags passed into the directory
1628 * traversal routine.
1630 * Case 1: If we *already* have entries in the index under that
1631 * directory name, we always recurse into the directory to see
1634 * Case 2: If we *already* have that directory name as a gitlink,
1635 * we always continue to see it as a gitlink, regardless of whether
1636 * there is an actual git directory there or not (it might not
1637 * be checked out as a subproject!)
1639 * Case 3: if we didn't have it in the index previously, we
1640 * have a few sub-cases:
1642 * (a) if "show_other_directories" is true, we show it as
1643 * just a directory, unless "hide_empty_directories" is
1644 * also true, in which case we need to check if it contains any
1645 * untracked and / or ignored files.
1646 * (b) if it looks like a git directory, and we don't have
1647 * 'no_gitlinks' set we treat it as a gitlink, and show it
1649 * (c) otherwise, we recurse into it.
1651 static enum path_treatment
treat_directory(struct dir_struct
*dir
,
1652 struct index_state
*istate
,
1653 struct untracked_cache_dir
*untracked
,
1654 const char *dirname
, int len
, int baselen
, int exclude
,
1655 const struct pathspec
*pathspec
)
1657 /* The "len-1" is to strip the final '/' */
1658 switch (directory_exists_in_index(istate
, dirname
, len
-1)) {
1659 case index_directory
:
1660 return path_recurse
;
1665 case index_nonexistent
:
1666 if (dir
->flags
& DIR_SKIP_NESTED_GIT
) {
1668 struct strbuf sb
= STRBUF_INIT
;
1669 strbuf_addstr(&sb
, dirname
);
1670 nested_repo
= is_nonbare_repository_dir(&sb
);
1671 strbuf_release(&sb
);
1676 if (dir
->flags
& DIR_SHOW_OTHER_DIRECTORIES
)
1679 (dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
1680 (dir
->flags
& DIR_SHOW_IGNORED_TOO_MODE_MATCHING
)) {
1683 * This is an excluded directory and we are
1684 * showing ignored paths that match an exclude
1685 * pattern. (e.g. show directory as ignored
1686 * only if it matches an exclude pattern).
1687 * This path will either be 'path_excluded`
1688 * (if we are showing empty directories or if
1689 * the directory is not empty), or will be
1690 * 'path_none' (empty directory, and we are
1691 * not showing empty directories).
1693 if (!(dir
->flags
& DIR_HIDE_EMPTY_DIRECTORIES
))
1694 return path_excluded
;
1696 if (read_directory_recursive(dir
, istate
, dirname
, len
,
1697 untracked
, 1, 1, pathspec
) == path_excluded
)
1698 return path_excluded
;
1702 if (!(dir
->flags
& DIR_NO_GITLINKS
)) {
1703 struct strbuf sb
= STRBUF_INIT
;
1704 strbuf_addstr(&sb
, dirname
);
1705 if (is_nonbare_repository_dir(&sb
))
1706 return exclude
? path_excluded
: path_untracked
;
1707 strbuf_release(&sb
);
1709 return path_recurse
;
1712 /* This is the "show_other_directories" case */
1714 if (!(dir
->flags
& DIR_HIDE_EMPTY_DIRECTORIES
))
1715 return exclude
? path_excluded
: path_untracked
;
1717 untracked
= lookup_untracked(dir
->untracked
, untracked
,
1718 dirname
+ baselen
, len
- baselen
);
1721 * If this is an excluded directory, then we only need to check if
1722 * the directory contains any files.
1724 return read_directory_recursive(dir
, istate
, dirname
, len
,
1725 untracked
, 1, exclude
, pathspec
);
1729 * This is an inexact early pruning of any recursive directory
1730 * reading - if the path cannot possibly be in the pathspec,
1731 * return true, and we'll skip it early.
1733 static int simplify_away(const char *path
, int pathlen
,
1734 const struct pathspec
*pathspec
)
1738 if (!pathspec
|| !pathspec
->nr
)
1741 GUARD_PATHSPEC(pathspec
,
1750 for (i
= 0; i
< pathspec
->nr
; i
++) {
1751 const struct pathspec_item
*item
= &pathspec
->items
[i
];
1752 int len
= item
->nowildcard_len
;
1756 if (!ps_strncmp(item
, item
->match
, path
, len
))
1764 * This function tells us whether an excluded path matches a
1765 * list of "interesting" pathspecs. That is, whether a path matched
1766 * by any of the pathspecs could possibly be ignored by excluding
1767 * the specified path. This can happen if:
1769 * 1. the path is mentioned explicitly in the pathspec
1771 * 2. the path is a directory prefix of some element in the
1774 static int exclude_matches_pathspec(const char *path
, int pathlen
,
1775 const struct pathspec
*pathspec
)
1779 if (!pathspec
|| !pathspec
->nr
)
1782 GUARD_PATHSPEC(pathspec
,
1790 for (i
= 0; i
< pathspec
->nr
; i
++) {
1791 const struct pathspec_item
*item
= &pathspec
->items
[i
];
1792 int len
= item
->nowildcard_len
;
1794 if (len
== pathlen
&&
1795 !ps_strncmp(item
, item
->match
, path
, pathlen
))
1797 if (len
> pathlen
&&
1798 item
->match
[pathlen
] == '/' &&
1799 !ps_strncmp(item
, item
->match
, path
, pathlen
))
1805 static int get_index_dtype(struct index_state
*istate
,
1806 const char *path
, int len
)
1809 const struct cache_entry
*ce
;
1811 ce
= index_file_exists(istate
, path
, len
, 0);
1813 if (!ce_uptodate(ce
))
1815 if (S_ISGITLINK(ce
->ce_mode
))
1818 * Nobody actually cares about the
1819 * difference between DT_LNK and DT_REG
1824 /* Try to look it up as a directory */
1825 pos
= index_name_pos(istate
, path
, len
);
1829 while (pos
< istate
->cache_nr
) {
1830 ce
= istate
->cache
[pos
++];
1831 if (strncmp(ce
->name
, path
, len
))
1833 if (ce
->name
[len
] > '/')
1835 if (ce
->name
[len
] < '/')
1837 if (!ce_uptodate(ce
))
1838 break; /* continue? */
1844 static int get_dtype(struct dirent
*de
, struct index_state
*istate
,
1845 const char *path
, int len
)
1847 int dtype
= de
? DTYPE(de
) : DT_UNKNOWN
;
1850 if (dtype
!= DT_UNKNOWN
)
1852 dtype
= get_index_dtype(istate
, path
, len
);
1853 if (dtype
!= DT_UNKNOWN
)
1855 if (lstat(path
, &st
))
1857 if (S_ISREG(st
.st_mode
))
1859 if (S_ISDIR(st
.st_mode
))
1861 if (S_ISLNK(st
.st_mode
))
1866 static enum path_treatment
treat_one_path(struct dir_struct
*dir
,
1867 struct untracked_cache_dir
*untracked
,
1868 struct index_state
*istate
,
1869 struct strbuf
*path
,
1871 const struct pathspec
*pathspec
,
1872 int dtype
, struct dirent
*de
)
1875 int has_path_in_index
= !!index_file_exists(istate
, path
->buf
, path
->len
, ignore_case
);
1876 enum path_treatment path_treatment
;
1878 if (dtype
== DT_UNKNOWN
)
1879 dtype
= get_dtype(de
, istate
, path
->buf
, path
->len
);
1881 /* Always exclude indexed files */
1882 if (dtype
!= DT_DIR
&& has_path_in_index
)
1886 * When we are looking at a directory P in the working tree,
1887 * there are three cases:
1889 * (1) P exists in the index. Everything inside the directory P in
1890 * the working tree needs to go when P is checked out from the
1893 * (2) P does not exist in the index, but there is P/Q in the index.
1894 * We know P will stay a directory when we check out the contents
1895 * of the index, but we do not know yet if there is a directory
1896 * P/Q in the working tree to be killed, so we need to recurse.
1898 * (3) P does not exist in the index, and there is no P/Q in the index
1899 * to require P to be a directory, either. Only in this case, we
1900 * know that everything inside P will not be killed without
1903 if ((dir
->flags
& DIR_COLLECT_KILLED_ONLY
) &&
1904 (dtype
== DT_DIR
) &&
1905 !has_path_in_index
&&
1906 (directory_exists_in_index(istate
, path
->buf
, path
->len
) == index_nonexistent
))
1909 exclude
= is_excluded(dir
, istate
, path
->buf
, &dtype
);
1912 * Excluded? If we don't explicitly want to show
1913 * ignored files, ignore it
1915 if (exclude
&& !(dir
->flags
& (DIR_SHOW_IGNORED
|DIR_SHOW_IGNORED_TOO
)))
1916 return path_excluded
;
1922 strbuf_addch(path
, '/');
1923 path_treatment
= treat_directory(dir
, istate
, untracked
,
1924 path
->buf
, path
->len
,
1925 baselen
, exclude
, pathspec
);
1927 * If 1) we only want to return directories that
1928 * match an exclude pattern and 2) this directory does
1929 * not match an exclude pattern but all of its
1930 * contents are excluded, then indicate that we should
1931 * recurse into this directory (instead of marking the
1932 * directory itself as an ignored path).
1935 path_treatment
== path_excluded
&&
1936 (dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
1937 (dir
->flags
& DIR_SHOW_IGNORED_TOO_MODE_MATCHING
))
1938 return path_recurse
;
1939 return path_treatment
;
1942 return exclude
? path_excluded
: path_untracked
;
1946 static enum path_treatment
treat_path_fast(struct dir_struct
*dir
,
1947 struct untracked_cache_dir
*untracked
,
1948 struct cached_dir
*cdir
,
1949 struct index_state
*istate
,
1950 struct strbuf
*path
,
1952 const struct pathspec
*pathspec
)
1954 strbuf_setlen(path
, baselen
);
1956 strbuf_addstr(path
, cdir
->file
);
1957 return path_untracked
;
1959 strbuf_addstr(path
, cdir
->ucd
->name
);
1960 /* treat_one_path() does this before it calls treat_directory() */
1961 strbuf_complete(path
, '/');
1962 if (cdir
->ucd
->check_only
)
1964 * check_only is set as a result of treat_directory() getting
1965 * to its bottom. Verify again the same set of directories
1966 * with check_only set.
1968 return read_directory_recursive(dir
, istate
, path
->buf
, path
->len
,
1969 cdir
->ucd
, 1, 0, pathspec
);
1971 * We get path_recurse in the first run when
1972 * directory_exists_in_index() returns index_nonexistent. We
1973 * are sure that new changes in the index does not impact the
1974 * outcome. Return now.
1976 return path_recurse
;
1979 static enum path_treatment
treat_path(struct dir_struct
*dir
,
1980 struct untracked_cache_dir
*untracked
,
1981 struct cached_dir
*cdir
,
1982 struct index_state
*istate
,
1983 struct strbuf
*path
,
1985 const struct pathspec
*pathspec
)
1988 struct dirent
*de
= cdir
->de
;
1991 return treat_path_fast(dir
, untracked
, cdir
, istate
, path
,
1993 if (is_dot_or_dotdot(de
->d_name
) || !fspathcmp(de
->d_name
, ".git"))
1995 strbuf_setlen(path
, baselen
);
1996 strbuf_addstr(path
, de
->d_name
);
1997 if (simplify_away(path
->buf
, path
->len
, pathspec
))
2001 return treat_one_path(dir
, untracked
, istate
, path
, baselen
, pathspec
, dtype
, de
);
2004 static void add_untracked(struct untracked_cache_dir
*dir
, const char *name
)
2008 ALLOC_GROW(dir
->untracked
, dir
->untracked_nr
+ 1,
2009 dir
->untracked_alloc
);
2010 dir
->untracked
[dir
->untracked_nr
++] = xstrdup(name
);
2013 static int valid_cached_dir(struct dir_struct
*dir
,
2014 struct untracked_cache_dir
*untracked
,
2015 struct index_state
*istate
,
2016 struct strbuf
*path
,
2025 * With fsmonitor, we can trust the untracked cache's valid field.
2027 refresh_fsmonitor(istate
);
2028 if (!(dir
->untracked
->use_fsmonitor
&& untracked
->valid
)) {
2029 if (lstat(path
->len
? path
->buf
: ".", &st
)) {
2030 memset(&untracked
->stat_data
, 0, sizeof(untracked
->stat_data
));
2033 if (!untracked
->valid
||
2034 match_stat_data_racy(istate
, &untracked
->stat_data
, &st
)) {
2035 fill_stat_data(&untracked
->stat_data
, &st
);
2040 if (untracked
->check_only
!= !!check_only
)
2044 * prep_exclude will be called eventually on this directory,
2045 * but it's called much later in last_matching_pattern(). We
2046 * need it now to determine the validity of the cache for this
2047 * path. The next calls will be nearly no-op, the way
2048 * prep_exclude() is designed.
2050 if (path
->len
&& path
->buf
[path
->len
- 1] != '/') {
2051 strbuf_addch(path
, '/');
2052 prep_exclude(dir
, istate
, path
->buf
, path
->len
);
2053 strbuf_setlen(path
, path
->len
- 1);
2055 prep_exclude(dir
, istate
, path
->buf
, path
->len
);
2057 /* hopefully prep_exclude() haven't invalidated this entry... */
2058 return untracked
->valid
;
2061 static int open_cached_dir(struct cached_dir
*cdir
,
2062 struct dir_struct
*dir
,
2063 struct untracked_cache_dir
*untracked
,
2064 struct index_state
*istate
,
2065 struct strbuf
*path
,
2070 memset(cdir
, 0, sizeof(*cdir
));
2071 cdir
->untracked
= untracked
;
2072 if (valid_cached_dir(dir
, untracked
, istate
, path
, check_only
))
2074 c_path
= path
->len
? path
->buf
: ".";
2075 cdir
->fdir
= opendir(c_path
);
2077 warning_errno(_("could not open directory '%s'"), c_path
);
2078 if (dir
->untracked
) {
2079 invalidate_directory(dir
->untracked
, untracked
);
2080 dir
->untracked
->dir_opened
++;
2087 static int read_cached_dir(struct cached_dir
*cdir
)
2090 cdir
->de
= readdir(cdir
->fdir
);
2095 while (cdir
->nr_dirs
< cdir
->untracked
->dirs_nr
) {
2096 struct untracked_cache_dir
*d
= cdir
->untracked
->dirs
[cdir
->nr_dirs
];
2106 if (cdir
->nr_files
< cdir
->untracked
->untracked_nr
) {
2107 struct untracked_cache_dir
*d
= cdir
->untracked
;
2108 cdir
->file
= d
->untracked
[cdir
->nr_files
++];
2114 static void close_cached_dir(struct cached_dir
*cdir
)
2117 closedir(cdir
->fdir
);
2119 * We have gone through this directory and found no untracked
2120 * entries. Mark it valid.
2122 if (cdir
->untracked
) {
2123 cdir
->untracked
->valid
= 1;
2124 cdir
->untracked
->recurse
= 1;
2129 * Read a directory tree. We currently ignore anything but
2130 * directories, regular files and symlinks. That's because git
2131 * doesn't handle them at all yet. Maybe that will change some
2134 * Also, we ignore the name ".git" (even if it is not a directory).
2135 * That likely will not change.
2137 * If 'stop_at_first_file' is specified, 'path_excluded' is returned
2138 * to signal that a file was found. This is the least significant value that
2139 * indicates that a file was encountered that does not depend on the order of
2140 * whether an untracked or exluded path was encountered first.
2142 * Returns the most significant path_treatment value encountered in the scan.
2143 * If 'stop_at_first_file' is specified, `path_excluded` is the most
2144 * significant path_treatment value that will be returned.
2147 static enum path_treatment
read_directory_recursive(struct dir_struct
*dir
,
2148 struct index_state
*istate
, const char *base
, int baselen
,
2149 struct untracked_cache_dir
*untracked
, int check_only
,
2150 int stop_at_first_file
, const struct pathspec
*pathspec
)
2152 struct cached_dir cdir
;
2153 enum path_treatment state
, subdir_state
, dir_state
= path_none
;
2154 struct strbuf path
= STRBUF_INIT
;
2156 strbuf_add(&path
, base
, baselen
);
2158 if (open_cached_dir(&cdir
, dir
, untracked
, istate
, &path
, check_only
))
2162 untracked
->check_only
= !!check_only
;
2164 while (!read_cached_dir(&cdir
)) {
2165 /* check how the file or directory should be treated */
2166 state
= treat_path(dir
, untracked
, &cdir
, istate
, &path
,
2169 if (state
> dir_state
)
2172 /* recurse into subdir if instructed by treat_path */
2173 if ((state
== path_recurse
) ||
2174 ((state
== path_untracked
) &&
2175 (get_dtype(cdir
.de
, istate
, path
.buf
, path
.len
) == DT_DIR
) &&
2176 ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) ||
2178 do_match_pathspec(istate
, pathspec
, path
.buf
, path
.len
,
2179 baselen
, NULL
, DO_MATCH_LEADING_PATHSPEC
) == MATCHED_RECURSIVELY_LEADING_PATHSPEC
)))) {
2180 struct untracked_cache_dir
*ud
;
2181 ud
= lookup_untracked(dir
->untracked
, untracked
,
2183 path
.len
- baselen
);
2185 read_directory_recursive(dir
, istate
, path
.buf
,
2187 check_only
, stop_at_first_file
, pathspec
);
2188 if (subdir_state
> dir_state
)
2189 dir_state
= subdir_state
;
2192 !match_pathspec(istate
, pathspec
, path
.buf
, path
.len
,
2193 0 /* prefix */, NULL
,
2194 0 /* do NOT special case dirs */))
2199 if (stop_at_first_file
) {
2201 * If stopping at first file, then
2202 * signal that a file was found by
2203 * returning `path_excluded`. This is
2204 * to return a consistent value
2205 * regardless of whether an ignored or
2206 * excluded file happened to be
2209 * In current usage, the
2210 * `stop_at_first_file` is passed when
2211 * an ancestor directory has matched
2212 * an exclude pattern, so any found
2213 * files will be excluded.
2215 if (dir_state
>= path_excluded
) {
2216 dir_state
= path_excluded
;
2221 /* abort early if maximum state has been reached */
2222 if (dir_state
== path_untracked
) {
2224 add_untracked(untracked
, path
.buf
+ baselen
);
2227 /* skip the dir_add_* part */
2231 /* add the path to the appropriate result list */
2234 if (dir
->flags
& DIR_SHOW_IGNORED
)
2235 dir_add_name(dir
, istate
, path
.buf
, path
.len
);
2236 else if ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) ||
2237 ((dir
->flags
& DIR_COLLECT_IGNORED
) &&
2238 exclude_matches_pathspec(path
.buf
, path
.len
,
2240 dir_add_ignored(dir
, istate
, path
.buf
, path
.len
);
2243 case path_untracked
:
2244 if (dir
->flags
& DIR_SHOW_IGNORED
)
2246 dir_add_name(dir
, istate
, path
.buf
, path
.len
);
2248 add_untracked(untracked
, path
.buf
+ baselen
);
2255 close_cached_dir(&cdir
);
2257 strbuf_release(&path
);
2262 int cmp_dir_entry(const void *p1
, const void *p2
)
2264 const struct dir_entry
*e1
= *(const struct dir_entry
**)p1
;
2265 const struct dir_entry
*e2
= *(const struct dir_entry
**)p2
;
2267 return name_compare(e1
->name
, e1
->len
, e2
->name
, e2
->len
);
2270 /* check if *out lexically strictly contains *in */
2271 int check_dir_entry_contains(const struct dir_entry
*out
, const struct dir_entry
*in
)
2273 return (out
->len
< in
->len
) &&
2274 (out
->name
[out
->len
- 1] == '/') &&
2275 !memcmp(out
->name
, in
->name
, out
->len
);
2278 static int treat_leading_path(struct dir_struct
*dir
,
2279 struct index_state
*istate
,
2280 const char *path
, int len
,
2281 const struct pathspec
*pathspec
)
2283 struct strbuf sb
= STRBUF_INIT
;
2284 int baselen
, rc
= 0;
2286 int old_flags
= dir
->flags
;
2288 while (len
&& path
[len
- 1] == '/')
2293 dir
->flags
&= ~DIR_SHOW_OTHER_DIRECTORIES
;
2295 cp
= path
+ baselen
+ !!baselen
;
2296 cp
= memchr(cp
, '/', path
+ len
- cp
);
2300 baselen
= cp
- path
;
2301 strbuf_setlen(&sb
, 0);
2302 strbuf_add(&sb
, path
, baselen
);
2303 if (!is_directory(sb
.buf
))
2305 if (simplify_away(sb
.buf
, sb
.len
, pathspec
))
2307 if (treat_one_path(dir
, NULL
, istate
, &sb
, baselen
, pathspec
,
2308 DT_DIR
, NULL
) == path_none
)
2309 break; /* do not recurse into it */
2310 if (len
<= baselen
) {
2312 break; /* finished checking */
2315 strbuf_release(&sb
);
2316 dir
->flags
= old_flags
;
2320 static const char *get_ident_string(void)
2322 static struct strbuf sb
= STRBUF_INIT
;
2327 if (uname(&uts
) < 0)
2328 die_errno(_("failed to get kernel name and information"));
2329 strbuf_addf(&sb
, "Location %s, system %s", get_git_work_tree(),
2334 static int ident_in_untracked(const struct untracked_cache
*uc
)
2337 * Previous git versions may have saved many NUL separated
2338 * strings in the "ident" field, but it is insane to manage
2339 * many locations, so just take care of the first one.
2342 return !strcmp(uc
->ident
.buf
, get_ident_string());
2345 static void set_untracked_ident(struct untracked_cache
*uc
)
2347 strbuf_reset(&uc
->ident
);
2348 strbuf_addstr(&uc
->ident
, get_ident_string());
2351 * This strbuf used to contain a list of NUL separated
2352 * strings, so save NUL too for backward compatibility.
2354 strbuf_addch(&uc
->ident
, 0);
2357 static void new_untracked_cache(struct index_state
*istate
)
2359 struct untracked_cache
*uc
= xcalloc(1, sizeof(*uc
));
2360 strbuf_init(&uc
->ident
, 100);
2361 uc
->exclude_per_dir
= ".gitignore";
2362 /* should be the same flags used by git-status */
2363 uc
->dir_flags
= DIR_SHOW_OTHER_DIRECTORIES
| DIR_HIDE_EMPTY_DIRECTORIES
;
2364 set_untracked_ident(uc
);
2365 istate
->untracked
= uc
;
2366 istate
->cache_changed
|= UNTRACKED_CHANGED
;
2369 void add_untracked_cache(struct index_state
*istate
)
2371 if (!istate
->untracked
) {
2372 new_untracked_cache(istate
);
2374 if (!ident_in_untracked(istate
->untracked
)) {
2375 free_untracked_cache(istate
->untracked
);
2376 new_untracked_cache(istate
);
2381 void remove_untracked_cache(struct index_state
*istate
)
2383 if (istate
->untracked
) {
2384 free_untracked_cache(istate
->untracked
);
2385 istate
->untracked
= NULL
;
2386 istate
->cache_changed
|= UNTRACKED_CHANGED
;
2390 static struct untracked_cache_dir
*validate_untracked_cache(struct dir_struct
*dir
,
2392 const struct pathspec
*pathspec
)
2394 struct untracked_cache_dir
*root
;
2395 static int untracked_cache_disabled
= -1;
2397 if (!dir
->untracked
)
2399 if (untracked_cache_disabled
< 0)
2400 untracked_cache_disabled
= git_env_bool("GIT_DISABLE_UNTRACKED_CACHE", 0);
2401 if (untracked_cache_disabled
)
2405 * We only support $GIT_DIR/info/exclude and core.excludesfile
2406 * as the global ignore rule files. Any other additions
2407 * (e.g. from command line) invalidate the cache. This
2408 * condition also catches running setup_standard_excludes()
2409 * before setting dir->untracked!
2411 if (dir
->unmanaged_exclude_files
)
2415 * Optimize for the main use case only: whole-tree git
2416 * status. More work involved in treat_leading_path() if we
2417 * use cache on just a subset of the worktree. pathspec
2418 * support could make the matter even worse.
2420 if (base_len
|| (pathspec
&& pathspec
->nr
))
2423 /* Different set of flags may produce different results */
2424 if (dir
->flags
!= dir
->untracked
->dir_flags
||
2426 * See treat_directory(), case index_nonexistent. Without
2427 * this flag, we may need to also cache .git file content
2428 * for the resolve_gitlink_ref() call, which we don't.
2430 !(dir
->flags
& DIR_SHOW_OTHER_DIRECTORIES
) ||
2431 /* We don't support collecting ignore files */
2432 (dir
->flags
& (DIR_SHOW_IGNORED
| DIR_SHOW_IGNORED_TOO
|
2433 DIR_COLLECT_IGNORED
)))
2437 * If we use .gitignore in the cache and now you change it to
2438 * .gitexclude, everything will go wrong.
2440 if (dir
->exclude_per_dir
!= dir
->untracked
->exclude_per_dir
&&
2441 strcmp(dir
->exclude_per_dir
, dir
->untracked
->exclude_per_dir
))
2445 * EXC_CMDL is not considered in the cache. If people set it,
2448 if (dir
->exclude_list_group
[EXC_CMDL
].nr
)
2451 if (!ident_in_untracked(dir
->untracked
)) {
2452 warning(_("untracked cache is disabled on this system or location"));
2456 if (!dir
->untracked
->root
) {
2457 const int len
= sizeof(*dir
->untracked
->root
);
2458 dir
->untracked
->root
= xmalloc(len
);
2459 memset(dir
->untracked
->root
, 0, len
);
2462 /* Validate $GIT_DIR/info/exclude and core.excludesfile */
2463 root
= dir
->untracked
->root
;
2464 if (!oideq(&dir
->ss_info_exclude
.oid
,
2465 &dir
->untracked
->ss_info_exclude
.oid
)) {
2466 invalidate_gitignore(dir
->untracked
, root
);
2467 dir
->untracked
->ss_info_exclude
= dir
->ss_info_exclude
;
2469 if (!oideq(&dir
->ss_excludes_file
.oid
,
2470 &dir
->untracked
->ss_excludes_file
.oid
)) {
2471 invalidate_gitignore(dir
->untracked
, root
);
2472 dir
->untracked
->ss_excludes_file
= dir
->ss_excludes_file
;
2475 /* Make sure this directory is not dropped out at saving phase */
2480 int read_directory(struct dir_struct
*dir
, struct index_state
*istate
,
2481 const char *path
, int len
, const struct pathspec
*pathspec
)
2483 struct untracked_cache_dir
*untracked
;
2485 trace_performance_enter();
2487 if (has_symlink_leading_path(path
, len
)) {
2488 trace_performance_leave("read directory %.*s", len
, path
);
2492 untracked
= validate_untracked_cache(dir
, len
, pathspec
);
2495 * make sure untracked cache code path is disabled,
2496 * e.g. prep_exclude()
2498 dir
->untracked
= NULL
;
2499 if (!len
|| treat_leading_path(dir
, istate
, path
, len
, pathspec
))
2500 read_directory_recursive(dir
, istate
, path
, len
, untracked
, 0, 0, pathspec
);
2501 QSORT(dir
->entries
, dir
->nr
, cmp_dir_entry
);
2502 QSORT(dir
->ignored
, dir
->ignored_nr
, cmp_dir_entry
);
2505 * If DIR_SHOW_IGNORED_TOO is set, read_directory_recursive() will
2506 * also pick up untracked contents of untracked dirs; by default
2507 * we discard these, but given DIR_KEEP_UNTRACKED_CONTENTS we do not.
2509 if ((dir
->flags
& DIR_SHOW_IGNORED_TOO
) &&
2510 !(dir
->flags
& DIR_KEEP_UNTRACKED_CONTENTS
)) {
2513 /* remove from dir->entries untracked contents of untracked dirs */
2514 for (i
= j
= 0; j
< dir
->nr
; j
++) {
2516 check_dir_entry_contains(dir
->entries
[i
- 1], dir
->entries
[j
])) {
2517 FREE_AND_NULL(dir
->entries
[j
]);
2519 dir
->entries
[i
++] = dir
->entries
[j
];
2526 trace_performance_leave("read directory %.*s", len
, path
);
2527 if (dir
->untracked
) {
2528 static int force_untracked_cache
= -1;
2529 static struct trace_key trace_untracked_stats
= TRACE_KEY_INIT(UNTRACKED_STATS
);
2531 if (force_untracked_cache
< 0)
2532 force_untracked_cache
=
2533 git_env_bool("GIT_FORCE_UNTRACKED_CACHE", 0);
2534 trace_printf_key(&trace_untracked_stats
,
2535 "node creation: %u\n"
2536 "gitignore invalidation: %u\n"
2537 "directory invalidation: %u\n"
2539 dir
->untracked
->dir_created
,
2540 dir
->untracked
->gitignore_invalidated
,
2541 dir
->untracked
->dir_invalidated
,
2542 dir
->untracked
->dir_opened
);
2543 if (force_untracked_cache
&&
2544 dir
->untracked
== istate
->untracked
&&
2545 (dir
->untracked
->dir_opened
||
2546 dir
->untracked
->gitignore_invalidated
||
2547 dir
->untracked
->dir_invalidated
))
2548 istate
->cache_changed
|= UNTRACKED_CHANGED
;
2549 if (dir
->untracked
!= istate
->untracked
) {
2550 FREE_AND_NULL(dir
->untracked
);
2556 int file_exists(const char *f
)
2559 return lstat(f
, &sb
) == 0;
2562 int repo_file_exists(struct repository
*repo
, const char *path
)
2564 if (repo
!= the_repository
)
2565 BUG("do not know how to check file existence in arbitrary repo");
2567 return file_exists(path
);
2570 static int cmp_icase(char a
, char b
)
2575 return toupper(a
) - toupper(b
);
2580 * Given two normalized paths (a trailing slash is ok), if subdir is
2581 * outside dir, return -1. Otherwise return the offset in subdir that
2582 * can be used as relative path to dir.
2584 int dir_inside_of(const char *subdir
, const char *dir
)
2588 assert(dir
&& subdir
&& *dir
&& *subdir
);
2590 while (*dir
&& *subdir
&& !cmp_icase(*dir
, *subdir
)) {
2596 /* hel[p]/me vs hel[l]/yeah */
2597 if (*dir
&& *subdir
)
2601 return !*dir
? offset
: -1; /* same dir */
2603 /* foo/[b]ar vs foo/[] */
2604 if (is_dir_sep(dir
[-1]))
2605 return is_dir_sep(subdir
[-1]) ? offset
: -1;
2607 /* foo[/]bar vs foo[] */
2608 return is_dir_sep(*subdir
) ? offset
+ 1 : -1;
2611 int is_inside_dir(const char *dir
)
2620 rc
= (dir_inside_of(cwd
, dir
) >= 0);
2625 int is_empty_dir(const char *path
)
2627 DIR *dir
= opendir(path
);
2634 while ((e
= readdir(dir
)) != NULL
)
2635 if (!is_dot_or_dotdot(e
->d_name
)) {
2644 static int remove_dir_recurse(struct strbuf
*path
, int flag
, int *kept_up
)
2648 int ret
= 0, original_len
= path
->len
, len
, kept_down
= 0;
2649 int only_empty
= (flag
& REMOVE_DIR_EMPTY_ONLY
);
2650 int keep_toplevel
= (flag
& REMOVE_DIR_KEEP_TOPLEVEL
);
2651 struct object_id submodule_head
;
2653 if ((flag
& REMOVE_DIR_KEEP_NESTED_GIT
) &&
2654 !resolve_gitlink_ref(path
->buf
, "HEAD", &submodule_head
)) {
2655 /* Do not descend and nuke a nested git work tree. */
2661 flag
&= ~REMOVE_DIR_KEEP_TOPLEVEL
;
2662 dir
= opendir(path
->buf
);
2664 if (errno
== ENOENT
)
2665 return keep_toplevel
? -1 : 0;
2666 else if (errno
== EACCES
&& !keep_toplevel
)
2668 * An empty dir could be removable even if it
2671 return rmdir(path
->buf
);
2675 strbuf_complete(path
, '/');
2678 while ((e
= readdir(dir
)) != NULL
) {
2680 if (is_dot_or_dotdot(e
->d_name
))
2683 strbuf_setlen(path
, len
);
2684 strbuf_addstr(path
, e
->d_name
);
2685 if (lstat(path
->buf
, &st
)) {
2686 if (errno
== ENOENT
)
2688 * file disappeared, which is what we
2693 } else if (S_ISDIR(st
.st_mode
)) {
2694 if (!remove_dir_recurse(path
, flag
, &kept_down
))
2695 continue; /* happy */
2696 } else if (!only_empty
&&
2697 (!unlink(path
->buf
) || errno
== ENOENT
)) {
2698 continue; /* happy, too */
2701 /* path too long, stat fails, or non-directory still exists */
2707 strbuf_setlen(path
, original_len
);
2708 if (!ret
&& !keep_toplevel
&& !kept_down
)
2709 ret
= (!rmdir(path
->buf
) || errno
== ENOENT
) ? 0 : -1;
2712 * report the uplevel that it is not an error that we
2713 * did not rmdir() our directory.
2719 int remove_dir_recursively(struct strbuf
*path
, int flag
)
2721 return remove_dir_recurse(path
, flag
, NULL
);
2724 static GIT_PATH_FUNC(git_path_info_exclude
, "info/exclude")
2726 void setup_standard_excludes(struct dir_struct
*dir
)
2728 dir
->exclude_per_dir
= ".gitignore";
2730 /* core.excludesfile defaulting to $XDG_CONFIG_HOME/git/ignore */
2732 excludes_file
= xdg_config_home("ignore");
2733 if (excludes_file
&& !access_or_warn(excludes_file
, R_OK
, 0))
2734 add_patterns_from_file_1(dir
, excludes_file
,
2735 dir
->untracked
? &dir
->ss_excludes_file
: NULL
);
2737 /* per repository user preference */
2738 if (startup_info
->have_repository
) {
2739 const char *path
= git_path_info_exclude();
2740 if (!access_or_warn(path
, R_OK
, 0))
2741 add_patterns_from_file_1(dir
, path
,
2742 dir
->untracked
? &dir
->ss_info_exclude
: NULL
);
2746 int remove_path(const char *name
)
2750 if (unlink(name
) && !is_missing_file_error(errno
))
2753 slash
= strrchr(name
, '/');
2755 char *dirs
= xstrdup(name
);
2756 slash
= dirs
+ (slash
- name
);
2759 } while (rmdir(dirs
) == 0 && (slash
= strrchr(dirs
, '/')));
2766 * Frees memory within dir which was allocated for exclude lists and
2767 * the exclude_stack. Does not free dir itself.
2769 void clear_directory(struct dir_struct
*dir
)
2772 struct exclude_list_group
*group
;
2773 struct pattern_list
*pl
;
2774 struct exclude_stack
*stk
;
2776 for (i
= EXC_CMDL
; i
<= EXC_FILE
; i
++) {
2777 group
= &dir
->exclude_list_group
[i
];
2778 for (j
= 0; j
< group
->nr
; j
++) {
2781 free((char *)pl
->src
);
2782 clear_pattern_list(pl
);
2787 stk
= dir
->exclude_stack
;
2789 struct exclude_stack
*prev
= stk
->prev
;
2793 strbuf_release(&dir
->basebuf
);
2796 struct ondisk_untracked_cache
{
2797 struct stat_data info_exclude_stat
;
2798 struct stat_data excludes_file_stat
;
2802 #define ouc_offset(x) offsetof(struct ondisk_untracked_cache, x)
2805 int index
; /* number of written untracked_cache_dir */
2806 struct ewah_bitmap
*check_only
; /* from untracked_cache_dir */
2807 struct ewah_bitmap
*valid
; /* from untracked_cache_dir */
2808 struct ewah_bitmap
*sha1_valid
; /* set if exclude_sha1 is not null */
2810 struct strbuf sb_stat
;
2811 struct strbuf sb_sha1
;
2814 static void stat_data_to_disk(struct stat_data
*to
, const struct stat_data
*from
)
2816 to
->sd_ctime
.sec
= htonl(from
->sd_ctime
.sec
);
2817 to
->sd_ctime
.nsec
= htonl(from
->sd_ctime
.nsec
);
2818 to
->sd_mtime
.sec
= htonl(from
->sd_mtime
.sec
);
2819 to
->sd_mtime
.nsec
= htonl(from
->sd_mtime
.nsec
);
2820 to
->sd_dev
= htonl(from
->sd_dev
);
2821 to
->sd_ino
= htonl(from
->sd_ino
);
2822 to
->sd_uid
= htonl(from
->sd_uid
);
2823 to
->sd_gid
= htonl(from
->sd_gid
);
2824 to
->sd_size
= htonl(from
->sd_size
);
2827 static void write_one_dir(struct untracked_cache_dir
*untracked
,
2828 struct write_data
*wd
)
2830 struct stat_data stat_data
;
2831 struct strbuf
*out
= &wd
->out
;
2832 unsigned char intbuf
[16];
2833 unsigned int intlen
, value
;
2834 int i
= wd
->index
++;
2837 * untracked_nr should be reset whenever valid is clear, but
2840 if (!untracked
->valid
) {
2841 untracked
->untracked_nr
= 0;
2842 untracked
->check_only
= 0;
2845 if (untracked
->check_only
)
2846 ewah_set(wd
->check_only
, i
);
2847 if (untracked
->valid
) {
2848 ewah_set(wd
->valid
, i
);
2849 stat_data_to_disk(&stat_data
, &untracked
->stat_data
);
2850 strbuf_add(&wd
->sb_stat
, &stat_data
, sizeof(stat_data
));
2852 if (!is_null_oid(&untracked
->exclude_oid
)) {
2853 ewah_set(wd
->sha1_valid
, i
);
2854 strbuf_add(&wd
->sb_sha1
, untracked
->exclude_oid
.hash
,
2855 the_hash_algo
->rawsz
);
2858 intlen
= encode_varint(untracked
->untracked_nr
, intbuf
);
2859 strbuf_add(out
, intbuf
, intlen
);
2861 /* skip non-recurse directories */
2862 for (i
= 0, value
= 0; i
< untracked
->dirs_nr
; i
++)
2863 if (untracked
->dirs
[i
]->recurse
)
2865 intlen
= encode_varint(value
, intbuf
);
2866 strbuf_add(out
, intbuf
, intlen
);
2868 strbuf_add(out
, untracked
->name
, strlen(untracked
->name
) + 1);
2870 for (i
= 0; i
< untracked
->untracked_nr
; i
++)
2871 strbuf_add(out
, untracked
->untracked
[i
],
2872 strlen(untracked
->untracked
[i
]) + 1);
2874 for (i
= 0; i
< untracked
->dirs_nr
; i
++)
2875 if (untracked
->dirs
[i
]->recurse
)
2876 write_one_dir(untracked
->dirs
[i
], wd
);
2879 void write_untracked_extension(struct strbuf
*out
, struct untracked_cache
*untracked
)
2881 struct ondisk_untracked_cache
*ouc
;
2882 struct write_data wd
;
2883 unsigned char varbuf
[16];
2885 const unsigned hashsz
= the_hash_algo
->rawsz
;
2887 ouc
= xcalloc(1, sizeof(*ouc
));
2888 stat_data_to_disk(&ouc
->info_exclude_stat
, &untracked
->ss_info_exclude
.stat
);
2889 stat_data_to_disk(&ouc
->excludes_file_stat
, &untracked
->ss_excludes_file
.stat
);
2890 ouc
->dir_flags
= htonl(untracked
->dir_flags
);
2892 varint_len
= encode_varint(untracked
->ident
.len
, varbuf
);
2893 strbuf_add(out
, varbuf
, varint_len
);
2894 strbuf_addbuf(out
, &untracked
->ident
);
2896 strbuf_add(out
, ouc
, sizeof(*ouc
));
2897 strbuf_add(out
, untracked
->ss_info_exclude
.oid
.hash
, hashsz
);
2898 strbuf_add(out
, untracked
->ss_excludes_file
.oid
.hash
, hashsz
);
2899 strbuf_add(out
, untracked
->exclude_per_dir
, strlen(untracked
->exclude_per_dir
) + 1);
2902 if (!untracked
->root
) {
2903 varint_len
= encode_varint(0, varbuf
);
2904 strbuf_add(out
, varbuf
, varint_len
);
2909 wd
.check_only
= ewah_new();
2910 wd
.valid
= ewah_new();
2911 wd
.sha1_valid
= ewah_new();
2912 strbuf_init(&wd
.out
, 1024);
2913 strbuf_init(&wd
.sb_stat
, 1024);
2914 strbuf_init(&wd
.sb_sha1
, 1024);
2915 write_one_dir(untracked
->root
, &wd
);
2917 varint_len
= encode_varint(wd
.index
, varbuf
);
2918 strbuf_add(out
, varbuf
, varint_len
);
2919 strbuf_addbuf(out
, &wd
.out
);
2920 ewah_serialize_strbuf(wd
.valid
, out
);
2921 ewah_serialize_strbuf(wd
.check_only
, out
);
2922 ewah_serialize_strbuf(wd
.sha1_valid
, out
);
2923 strbuf_addbuf(out
, &wd
.sb_stat
);
2924 strbuf_addbuf(out
, &wd
.sb_sha1
);
2925 strbuf_addch(out
, '\0'); /* safe guard for string lists */
2927 ewah_free(wd
.valid
);
2928 ewah_free(wd
.check_only
);
2929 ewah_free(wd
.sha1_valid
);
2930 strbuf_release(&wd
.out
);
2931 strbuf_release(&wd
.sb_stat
);
2932 strbuf_release(&wd
.sb_sha1
);
2935 static void free_untracked(struct untracked_cache_dir
*ucd
)
2940 for (i
= 0; i
< ucd
->dirs_nr
; i
++)
2941 free_untracked(ucd
->dirs
[i
]);
2942 for (i
= 0; i
< ucd
->untracked_nr
; i
++)
2943 free(ucd
->untracked
[i
]);
2944 free(ucd
->untracked
);
2949 void free_untracked_cache(struct untracked_cache
*uc
)
2952 free_untracked(uc
->root
);
2958 struct untracked_cache_dir
**ucd
;
2959 struct ewah_bitmap
*check_only
;
2960 struct ewah_bitmap
*valid
;
2961 struct ewah_bitmap
*sha1_valid
;
2962 const unsigned char *data
;
2963 const unsigned char *end
;
2966 static void stat_data_from_disk(struct stat_data
*to
, const unsigned char *data
)
2968 memcpy(to
, data
, sizeof(*to
));
2969 to
->sd_ctime
.sec
= ntohl(to
->sd_ctime
.sec
);
2970 to
->sd_ctime
.nsec
= ntohl(to
->sd_ctime
.nsec
);
2971 to
->sd_mtime
.sec
= ntohl(to
->sd_mtime
.sec
);
2972 to
->sd_mtime
.nsec
= ntohl(to
->sd_mtime
.nsec
);
2973 to
->sd_dev
= ntohl(to
->sd_dev
);
2974 to
->sd_ino
= ntohl(to
->sd_ino
);
2975 to
->sd_uid
= ntohl(to
->sd_uid
);
2976 to
->sd_gid
= ntohl(to
->sd_gid
);
2977 to
->sd_size
= ntohl(to
->sd_size
);
2980 static int read_one_dir(struct untracked_cache_dir
**untracked_
,
2981 struct read_data
*rd
)
2983 struct untracked_cache_dir ud
, *untracked
;
2984 const unsigned char *data
= rd
->data
, *end
= rd
->end
;
2985 const unsigned char *eos
;
2989 memset(&ud
, 0, sizeof(ud
));
2991 value
= decode_varint(&data
);
2995 ud
.untracked_alloc
= value
;
2996 ud
.untracked_nr
= value
;
2997 if (ud
.untracked_nr
)
2998 ALLOC_ARRAY(ud
.untracked
, ud
.untracked_nr
);
3000 ud
.dirs_alloc
= ud
.dirs_nr
= decode_varint(&data
);
3003 ALLOC_ARRAY(ud
.dirs
, ud
.dirs_nr
);
3005 eos
= memchr(data
, '\0', end
- data
);
3006 if (!eos
|| eos
== end
)
3009 *untracked_
= untracked
= xmalloc(st_add3(sizeof(*untracked
), eos
- data
, 1));
3010 memcpy(untracked
, &ud
, sizeof(ud
));
3011 memcpy(untracked
->name
, data
, eos
- data
+ 1);
3014 for (i
= 0; i
< untracked
->untracked_nr
; i
++) {
3015 eos
= memchr(data
, '\0', end
- data
);
3016 if (!eos
|| eos
== end
)
3018 untracked
->untracked
[i
] = xmemdupz(data
, eos
- data
);
3022 rd
->ucd
[rd
->index
++] = untracked
;
3025 for (i
= 0; i
< untracked
->dirs_nr
; i
++) {
3026 if (read_one_dir(untracked
->dirs
+ i
, rd
) < 0)
3032 static void set_check_only(size_t pos
, void *cb
)
3034 struct read_data
*rd
= cb
;
3035 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
3039 static void read_stat(size_t pos
, void *cb
)
3041 struct read_data
*rd
= cb
;
3042 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
3043 if (rd
->data
+ sizeof(struct stat_data
) > rd
->end
) {
3044 rd
->data
= rd
->end
+ 1;
3047 stat_data_from_disk(&ud
->stat_data
, rd
->data
);
3048 rd
->data
+= sizeof(struct stat_data
);
3052 static void read_oid(size_t pos
, void *cb
)
3054 struct read_data
*rd
= cb
;
3055 struct untracked_cache_dir
*ud
= rd
->ucd
[pos
];
3056 if (rd
->data
+ the_hash_algo
->rawsz
> rd
->end
) {
3057 rd
->data
= rd
->end
+ 1;
3060 hashcpy(ud
->exclude_oid
.hash
, rd
->data
);
3061 rd
->data
+= the_hash_algo
->rawsz
;
3064 static void load_oid_stat(struct oid_stat
*oid_stat
, const unsigned char *data
,
3065 const unsigned char *sha1
)
3067 stat_data_from_disk(&oid_stat
->stat
, data
);
3068 hashcpy(oid_stat
->oid
.hash
, sha1
);
3069 oid_stat
->valid
= 1;
3072 struct untracked_cache
*read_untracked_extension(const void *data
, unsigned long sz
)
3074 struct untracked_cache
*uc
;
3075 struct read_data rd
;
3076 const unsigned char *next
= data
, *end
= (const unsigned char *)data
+ sz
;
3080 const char *exclude_per_dir
;
3081 const unsigned hashsz
= the_hash_algo
->rawsz
;
3082 const unsigned offset
= sizeof(struct ondisk_untracked_cache
);
3083 const unsigned exclude_per_dir_offset
= offset
+ 2 * hashsz
;
3085 if (sz
<= 1 || end
[-1] != '\0')
3089 ident_len
= decode_varint(&next
);
3090 if (next
+ ident_len
> end
)
3092 ident
= (const char *)next
;
3095 if (next
+ exclude_per_dir_offset
+ 1 > end
)
3098 uc
= xcalloc(1, sizeof(*uc
));
3099 strbuf_init(&uc
->ident
, ident_len
);
3100 strbuf_add(&uc
->ident
, ident
, ident_len
);
3101 load_oid_stat(&uc
->ss_info_exclude
,
3102 next
+ ouc_offset(info_exclude_stat
),
3104 load_oid_stat(&uc
->ss_excludes_file
,
3105 next
+ ouc_offset(excludes_file_stat
),
3106 next
+ offset
+ hashsz
);
3107 uc
->dir_flags
= get_be32(next
+ ouc_offset(dir_flags
));
3108 exclude_per_dir
= (const char *)next
+ exclude_per_dir_offset
;
3109 uc
->exclude_per_dir
= xstrdup(exclude_per_dir
);
3110 /* NUL after exclude_per_dir is covered by sizeof(*ouc) */
3111 next
+= exclude_per_dir_offset
+ strlen(exclude_per_dir
) + 1;
3115 len
= decode_varint(&next
);
3116 if (next
> end
|| len
== 0)
3119 rd
.valid
= ewah_new();
3120 rd
.check_only
= ewah_new();
3121 rd
.sha1_valid
= ewah_new();
3125 ALLOC_ARRAY(rd
.ucd
, len
);
3127 if (read_one_dir(&uc
->root
, &rd
) || rd
.index
!= len
)
3131 len
= ewah_read_mmap(rd
.valid
, next
, end
- next
);
3136 len
= ewah_read_mmap(rd
.check_only
, next
, end
- next
);
3141 len
= ewah_read_mmap(rd
.sha1_valid
, next
, end
- next
);
3145 ewah_each_bit(rd
.check_only
, set_check_only
, &rd
);
3146 rd
.data
= next
+ len
;
3147 ewah_each_bit(rd
.valid
, read_stat
, &rd
);
3148 ewah_each_bit(rd
.sha1_valid
, read_oid
, &rd
);
3153 ewah_free(rd
.valid
);
3154 ewah_free(rd
.check_only
);
3155 ewah_free(rd
.sha1_valid
);
3158 free_untracked_cache(uc
);
3164 static void invalidate_one_directory(struct untracked_cache
*uc
,
3165 struct untracked_cache_dir
*ucd
)
3167 uc
->dir_invalidated
++;
3169 ucd
->untracked_nr
= 0;
3173 * Normally when an entry is added or removed from a directory,
3174 * invalidating that directory is enough. No need to touch its
3175 * ancestors. When a directory is shown as "foo/bar/" in git-status
3176 * however, deleting or adding an entry may have cascading effect.
3178 * Say the "foo/bar/file" has become untracked, we need to tell the
3179 * untracked_cache_dir of "foo" that "bar/" is not an untracked
3180 * directory any more (because "bar" is managed by foo as an untracked
3183 * Similarly, if "foo/bar/file" moves from untracked to tracked and it
3184 * was the last untracked entry in the entire "foo", we should show
3185 * "foo/" instead. Which means we have to invalidate past "bar" up to
3188 * This function traverses all directories from root to leaf. If there
3189 * is a chance of one of the above cases happening, we invalidate back
3190 * to root. Otherwise we just invalidate the leaf. There may be a more
3191 * sophisticated way than checking for SHOW_OTHER_DIRECTORIES to
3192 * detect these cases and avoid unnecessary invalidation, for example,
3193 * checking for the untracked entry named "bar/" in "foo", but for now
3194 * stick to something safe and simple.
3196 static int invalidate_one_component(struct untracked_cache
*uc
,
3197 struct untracked_cache_dir
*dir
,
3198 const char *path
, int len
)
3200 const char *rest
= strchr(path
, '/');
3203 int component_len
= rest
- path
;
3204 struct untracked_cache_dir
*d
=
3205 lookup_untracked(uc
, dir
, path
, component_len
);
3207 invalidate_one_component(uc
, d
, rest
+ 1,
3208 len
- (component_len
+ 1));
3210 invalidate_one_directory(uc
, dir
);
3214 invalidate_one_directory(uc
, dir
);
3215 return uc
->dir_flags
& DIR_SHOW_OTHER_DIRECTORIES
;
3218 void untracked_cache_invalidate_path(struct index_state
*istate
,
3219 const char *path
, int safe_path
)
3221 if (!istate
->untracked
|| !istate
->untracked
->root
)
3223 if (!safe_path
&& !verify_path(path
, 0))
3225 invalidate_one_component(istate
->untracked
, istate
->untracked
->root
,
3226 path
, strlen(path
));
3229 void untracked_cache_remove_from_index(struct index_state
*istate
,
3232 untracked_cache_invalidate_path(istate
, path
, 1);
3235 void untracked_cache_add_to_index(struct index_state
*istate
,
3238 untracked_cache_invalidate_path(istate
, path
, 1);
3241 static void connect_wt_gitdir_in_nested(const char *sub_worktree
,
3242 const char *sub_gitdir
)
3245 struct repository subrepo
;
3246 struct strbuf sub_wt
= STRBUF_INIT
;
3247 struct strbuf sub_gd
= STRBUF_INIT
;
3249 const struct submodule
*sub
;
3251 /* If the submodule has no working tree, we can ignore it. */
3252 if (repo_init(&subrepo
, sub_gitdir
, sub_worktree
))
3255 if (repo_read_index(&subrepo
) < 0)
3256 die(_("index file corrupt in repo %s"), subrepo
.gitdir
);
3258 for (i
= 0; i
< subrepo
.index
->cache_nr
; i
++) {
3259 const struct cache_entry
*ce
= subrepo
.index
->cache
[i
];
3261 if (!S_ISGITLINK(ce
->ce_mode
))
3264 while (i
+ 1 < subrepo
.index
->cache_nr
&&
3265 !strcmp(ce
->name
, subrepo
.index
->cache
[i
+ 1]->name
))
3267 * Skip entries with the same name in different stages
3268 * to make sure an entry is returned only once.
3272 sub
= submodule_from_path(&subrepo
, &null_oid
, ce
->name
);
3273 if (!sub
|| !is_submodule_active(&subrepo
, ce
->name
))
3274 /* .gitmodules broken or inactive sub */
3277 strbuf_reset(&sub_wt
);
3278 strbuf_reset(&sub_gd
);
3279 strbuf_addf(&sub_wt
, "%s/%s", sub_worktree
, sub
->path
);
3280 strbuf_addf(&sub_gd
, "%s/modules/%s", sub_gitdir
, sub
->name
);
3282 connect_work_tree_and_git_dir(sub_wt
.buf
, sub_gd
.buf
, 1);
3284 strbuf_release(&sub_wt
);
3285 strbuf_release(&sub_gd
);
3286 repo_clear(&subrepo
);
3289 void connect_work_tree_and_git_dir(const char *work_tree_
,
3290 const char *git_dir_
,
3291 int recurse_into_nested
)
3293 struct strbuf gitfile_sb
= STRBUF_INIT
;
3294 struct strbuf cfg_sb
= STRBUF_INIT
;
3295 struct strbuf rel_path
= STRBUF_INIT
;
3296 char *git_dir
, *work_tree
;
3298 /* Prepare .git file */
3299 strbuf_addf(&gitfile_sb
, "%s/.git", work_tree_
);
3300 if (safe_create_leading_directories_const(gitfile_sb
.buf
))
3301 die(_("could not create directories for %s"), gitfile_sb
.buf
);
3303 /* Prepare config file */
3304 strbuf_addf(&cfg_sb
, "%s/config", git_dir_
);
3305 if (safe_create_leading_directories_const(cfg_sb
.buf
))
3306 die(_("could not create directories for %s"), cfg_sb
.buf
);
3308 git_dir
= real_pathdup(git_dir_
, 1);
3309 work_tree
= real_pathdup(work_tree_
, 1);
3311 /* Write .git file */
3312 write_file(gitfile_sb
.buf
, "gitdir: %s",
3313 relative_path(git_dir
, work_tree
, &rel_path
));
3314 /* Update core.worktree setting */
3315 git_config_set_in_file(cfg_sb
.buf
, "core.worktree",
3316 relative_path(work_tree
, git_dir
, &rel_path
));
3318 strbuf_release(&gitfile_sb
);
3319 strbuf_release(&cfg_sb
);
3320 strbuf_release(&rel_path
);
3322 if (recurse_into_nested
)
3323 connect_wt_gitdir_in_nested(work_tree
, git_dir
);
3330 * Migrate the git directory of the given path from old_git_dir to new_git_dir.
3332 void relocate_gitdir(const char *path
, const char *old_git_dir
, const char *new_git_dir
)
3334 if (rename(old_git_dir
, new_git_dir
) < 0)
3335 die_errno(_("could not migrate git directory from '%s' to '%s'"),
3336 old_git_dir
, new_git_dir
);
3338 connect_work_tree_and_git_dir(path
, new_git_dir
, 0);