Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache-tree
* jc/dirwalk-n-cache-tree: (212 commits) builtin-rm: squelch compiler warnings. Add builtin "git rm" command Move pathspec matching from builtin-add.c into dir.c Prevent bogus paths from being added to the index. builtin-add: fix unmatched pathspec warnings. Remove old "git-add.sh" remnants builtin-add: warn on unmatched pathspecs Do "git add" as a builtin Clean up git-ls-file directory walking library interface libify git-ls-files directory traversal Add a conversion tool to migrate remote information into the config fetch, pull: ask config for remote information Fix build procedure for builtin-init-db read-tree -m -u: do not overwrite or remove untracked working tree files. apply --cached: do not check newly added file in the working tree Implement a --dry-run option to git-quiltimport Implement git-quiltimport Revert "builtin-grep: workaround for non GNU grep." builtin-grep: workaround for non GNU grep. builtin-grep: workaround for non GNU grep. ...
This commit is contained in:
Junio C Hamano
185
read-cache.c
185
read-cache.c
@ -346,6 +346,70 @@ int ce_path_match(const struct cache_entry *ce, const char **pathspec)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* We fundamentally don't like some paths: we don't want
|
||||
* dot or dot-dot anywhere, and for obvious reasons don't
|
||||
* want to recurse into ".git" either.
|
||||
*
|
||||
* Also, we don't want double slashes or slashes at the
|
||||
* end that can make pathnames ambiguous.
|
||||
*/
|
||||
static int verify_dotfile(const char *rest)
|
||||
{
|
||||
/*
|
||||
* The first character was '.', but that
|
||||
* has already been discarded, we now test
|
||||
* the rest.
|
||||
*/
|
||||
switch (*rest) {
|
||||
/* "." is not allowed */
|
||||
case '\0': case '/':
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* ".git" followed by NUL or slash is bad. This
|
||||
* shares the path end test with the ".." case.
|
||||
*/
|
||||
case 'g':
|
||||
if (rest[1] != 'i')
|
||||
break;
|
||||
if (rest[2] != 't')
|
||||
break;
|
||||
rest += 2;
|
||||
/* fallthrough */
|
||||
case '.':
|
||||
if (rest[1] == '\0' || rest[1] == '/')
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int verify_path(const char *path)
|
||||
{
|
||||
char c;
|
||||
|
||||
goto inside;
|
||||
for (;;) {
|
||||
if (!c)
|
||||
return 1;
|
||||
if (c == '/') {
|
||||
inside:
|
||||
c = *path++;
|
||||
switch (c) {
|
||||
default:
|
||||
continue;
|
||||
case '/': case '\0':
|
||||
break;
|
||||
case '.':
|
||||
if (verify_dotfile(path))
|
||||
continue;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
c = *path++;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Do we have another file that has the beginning components being a
|
||||
* proper superset of the name we're trying to add?
|
||||
@ -487,6 +551,8 @@ int add_cache_entry(struct cache_entry *ce, int option)
|
||||
|
||||
if (!ok_to_add)
|
||||
return -1;
|
||||
if (!verify_path(ce->name))
|
||||
return -1;
|
||||
|
||||
if (!skip_df_check &&
|
||||
check_file_directory_conflict(ce, pos, ok_to_replace)) {
|
||||
@ -511,6 +577,123 @@ int add_cache_entry(struct cache_entry *ce, int option)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Three functions to allow overloaded pointer return; see linux/err.h */
|
||||
static inline void *ERR_PTR(long error)
|
||||
{
|
||||
return (void *) error;
|
||||
}
|
||||
|
||||
static inline long PTR_ERR(const void *ptr)
|
||||
{
|
||||
return (long) ptr;
|
||||
}
|
||||
|
||||
static inline long IS_ERR(const void *ptr)
|
||||
{
|
||||
return (unsigned long)ptr > (unsigned long)-1000L;
|
||||
}
|
||||
|
||||
/*
|
||||
* "refresh" does not calculate a new sha1 file or bring the
|
||||
* cache up-to-date for mode/content changes. But what it
|
||||
* _does_ do is to "re-match" the stat information of a file
|
||||
* with the cache, so that you can refresh the cache for a
|
||||
* file that hasn't been changed but where the stat entry is
|
||||
* out of date.
|
||||
*
|
||||
* For example, you'd want to do this after doing a "git-read-tree",
|
||||
* to link up the stat cache details with the proper files.
|
||||
*/
|
||||
static struct cache_entry *refresh_entry(struct cache_entry *ce, int really)
|
||||
{
|
||||
struct stat st;
|
||||
struct cache_entry *updated;
|
||||
int changed, size;
|
||||
|
||||
if (lstat(ce->name, &st) < 0)
|
||||
return ERR_PTR(-errno);
|
||||
|
||||
changed = ce_match_stat(ce, &st, really);
|
||||
if (!changed) {
|
||||
if (really && assume_unchanged &&
|
||||
!(ce->ce_flags & htons(CE_VALID)))
|
||||
; /* mark this one VALID again */
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (ce_modified(ce, &st, really))
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
size = ce_size(ce);
|
||||
updated = xmalloc(size);
|
||||
memcpy(updated, ce, size);
|
||||
fill_stat_cache_info(updated, &st);
|
||||
|
||||
/* In this case, if really is not set, we should leave
|
||||
* CE_VALID bit alone. Otherwise, paths marked with
|
||||
* --no-assume-unchanged (i.e. things to be edited) will
|
||||
* reacquire CE_VALID bit automatically, which is not
|
||||
* really what we want.
|
||||
*/
|
||||
if (!really && assume_unchanged && !(ce->ce_flags & htons(CE_VALID)))
|
||||
updated->ce_flags &= ~htons(CE_VALID);
|
||||
|
||||
return updated;
|
||||
}
|
||||
|
||||
int refresh_cache(unsigned int flags)
|
||||
{
|
||||
int i;
|
||||
int has_errors = 0;
|
||||
int really = (flags & REFRESH_REALLY) != 0;
|
||||
int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
|
||||
int quiet = (flags & REFRESH_QUIET) != 0;
|
||||
int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
|
||||
|
||||
for (i = 0; i < active_nr; i++) {
|
||||
struct cache_entry *ce, *new;
|
||||
ce = active_cache[i];
|
||||
if (ce_stage(ce)) {
|
||||
while ((i < active_nr) &&
|
||||
! strcmp(active_cache[i]->name, ce->name))
|
||||
i++;
|
||||
i--;
|
||||
if (allow_unmerged)
|
||||
continue;
|
||||
printf("%s: needs merge\n", ce->name);
|
||||
has_errors = 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
new = refresh_entry(ce, really);
|
||||
if (!new)
|
||||
continue;
|
||||
if (IS_ERR(new)) {
|
||||
if (not_new && PTR_ERR(new) == -ENOENT)
|
||||
continue;
|
||||
if (really && PTR_ERR(new) == -EINVAL) {
|
||||
/* If we are doing --really-refresh that
|
||||
* means the index is not valid anymore.
|
||||
*/
|
||||
ce->ce_flags &= ~htons(CE_VALID);
|
||||
active_cache_changed = 1;
|
||||
}
|
||||
if (quiet)
|
||||
continue;
|
||||
printf("%s: needs update\n", ce->name);
|
||||
has_errors = 1;
|
||||
continue;
|
||||
}
|
||||
active_cache_changed = 1;
|
||||
/* You can NOT just free active_cache[i] here, since it
|
||||
* might not be necessarily malloc()ed but can also come
|
||||
* from mmap(). */
|
||||
active_cache[i] = new;
|
||||
}
|
||||
return has_errors;
|
||||
}
|
||||
|
||||
static int verify_hdr(struct cache_header *hdr, unsigned long size)
|
||||
{
|
||||
SHA_CTX c;
|
||||
@ -583,7 +766,7 @@ int read_cache(void)
|
||||
|
||||
active_nr = ntohl(hdr->hdr_entries);
|
||||
active_alloc = alloc_nr(active_nr);
|
||||
active_cache = calloc(active_alloc, sizeof(struct cache_entry *));
|
||||
active_cache = xcalloc(active_alloc, sizeof(struct cache_entry *));
|
||||
|
||||
offset = sizeof(*hdr);
|
||||
for (i = 0; i < active_nr; i++) {
|
||||
|
||||
Reference in New Issue
Block a user