undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] update-cache: add "--ignore-missing" option

Browse Source 
This adds an --ignore-missing option to update-cache, which makes it
ignore missing files.  Together with the "-n" option to checkout-cache,
it allows me to do

    checkout-cache -n -f -a && update-cache --ignore-missing --refresh

which only updates and refreshes the files I already have checked out.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
James Bottomley 2005-04-24 15:14:16 -07:00 committed by Linus Torvalds
parent 32718b6c5e
commit c6e007b094
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
update-cache.c
View File

@ -12,7 +12,23 @@
* like "update-cache *" and suddenly having all the object * like "update-cache *" and suddenly having all the object
* files be revision controlled. * files be revision controlled.
*/ */
static int allow_add = 0, allow_remove = 0; static int allow_add = 0, allow_remove = 0, not_new = 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;
}
static int index_fd(unsigned char *sha1, int fd, struct stat *st) static int index_fd(unsigned char *sha1, int fd, struct stat *st)
{ {
@ -172,7 +188,7 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
int changed, size; int changed, size;
if (stat(ce->name, &st) < 0) if (stat(ce->name, &st) < 0)
return NULL; return ERR_PTR(-errno);
changed = cache_match_stat(ce, &st); changed = cache_match_stat(ce, &st);
if (!changed) if (!changed)
@ -183,10 +199,10 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
* to refresh the entry - it's not going to match * to refresh the entry - it's not going to match
*/ */
if (changed & MODE_CHANGED) if (changed & MODE_CHANGED)
return NULL; return ERR_PTR(-EINVAL);
if (compare_data(ce, st.st_size)) if (compare_data(ce, st.st_size))
return NULL; return ERR_PTR(-EINVAL);
size = ce_size(ce); size = ce_size(ce);
updated = malloc(size); updated = malloc(size);
@ -212,8 +228,9 @@ static void refresh_cache(void)
} }
new = refresh_entry(ce); new = refresh_entry(ce);
if (!new) { if (IS_ERR(new)) {
printf("%s: needs update\n", ce->name); if (!(not_new && PTR_ERR(new) == -ENOENT))
printf("%s: needs update\n", ce->name);
continue; continue;
} }
active_cache[i] = new; active_cache[i] = new;
@ -328,6 +345,10 @@ int main(int argc, char **argv)
i += 3; i += 3;
continue; continue;
} }
if (!strcmp(path, "--ignore-missing")) {
not_new = 1;
continue;
}
die("unknown option %s", path); die("unknown option %s", path);
} }
if (!verify_path(path)) { if (!verify_path(path)) {