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

refs: extract a function ref_resolves_to_object()

Browse Source 
It is a nice unit of work and soon will be needed from multiple
locations.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2013-04-22 21:52:18 +02:00 committed by Junio C Hamano
parent 7618fd808a
commit 662428f4e9
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
refs.c
View File

@ -529,6 +529,22 @@ static void sort_ref_dir(struct ref_dir *dir)
/* Include broken references in a do_for_each_ref*() iteration: */ /* Include broken references in a do_for_each_ref*() iteration: */
#define DO_FOR_EACH_INCLUDE_BROKEN 0x01 #define DO_FOR_EACH_INCLUDE_BROKEN 0x01
/*
* Return true iff the reference described by entry can be resolved to
* an object in the database. Emit a warning if the referred-to
* object does not exist.
*/
static int ref_resolves_to_object(struct ref_entry *entry)
{
if (entry->flag & REF_ISBROKEN)
return 0;
if (!has_sha1_file(entry->u.value.sha1)) {
error("%s does not point to a valid object!", entry->name);
return 0;
}
return 1;
}
/* /*
* current_ref is a performance hack: when iterating over references * current_ref is a performance hack: when iterating over references
* using the for_each_ref*() functions, current_ref is set to the * using the for_each_ref*() functions, current_ref is set to the
@ -550,14 +566,10 @@ static int do_one_ref(const char *base, each_ref_fn fn, int trim,
if (prefixcmp(entry->name, base)) if (prefixcmp(entry->name, base))
return 0; return 0;
if (!(flags & DO_FOR_EACH_INCLUDE_BROKEN)) { if (!(flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
if (entry->flag & REF_ISBROKEN) !ref_resolves_to_object(entry))
return 0; /* ignore broken refs e.g. dangling symref */ return 0;
if (!has_sha1_file(entry->u.value.sha1)) {
error("%s does not point to a valid object!", entry->name);
return 0;
}
}
current_ref = entry; current_ref = entry;
retval = fn(entry->name + trim, entry->u.value.sha1, entry->flag, cb_data); retval = fn(entry->name + trim, entry->u.value.sha1, entry->flag, cb_data);
current_ref = NULL; current_ref = NULL;