diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2011-12-12 06:38:30 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-12-12 09:08:54 -0800 |
commit | fdeb34784201653f0f7a17682c12c7e634e96a15 (patch) | |
tree | d899e3278f76984021cd27084324c922056474b5 | |
parent | b7af3e4d3cd0d9da9b014ba036f1ab2dc7a5c5fe (diff) | |
download | git-fdeb34784201653f0f7a17682c12c7e634e96a15.tar.gz |
is_refname_available(): reimplement using do_for_each_ref_in_array()
This implementation will survive upcoming changes to the ref_array
data structure.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | refs.c | 40 |
1 files changed, 30 insertions, 10 deletions
@@ -1100,6 +1100,25 @@ static int names_conflict(const char *refname1, const char *refname2) || (*refname1 == '/' && *refname2 == '\0'); } +struct name_conflict_cb { + const char *refname; + const char *oldrefname; + const char *conflicting_refname; +}; + +static int name_conflict_fn(const char *existingrefname, const unsigned char *sha1, + int flags, void *cb_data) +{ + struct name_conflict_cb *data = (struct name_conflict_cb *)cb_data; + if (data->oldrefname && !strcmp(data->oldrefname, existingrefname)) + return 0; + if (names_conflict(data->refname, existingrefname)) { + data->conflicting_refname = existingrefname; + return 1; + } + return 0; +} + /* * Return true iff a reference named refname could be created without * conflicting with the name of an existing reference. If oldrefname @@ -1110,16 +1129,17 @@ static int names_conflict(const char *refname1, const char *refname2) static int is_refname_available(const char *refname, const char *oldrefname, struct ref_array *array) { - int i; - for (i = 0; i < array->nr; i++ ) { - struct ref_entry *entry = array->refs[i]; - if (oldrefname && !strcmp(oldrefname, entry->name)) - continue; - if (names_conflict(refname, entry->name)) { - error("'%s' exists; cannot create '%s'", - entry->name, refname); - return 0; - } + struct name_conflict_cb data; + data.refname = refname; + data.oldrefname = oldrefname; + data.conflicting_refname = NULL; + + if (do_for_each_ref_in_array(array, 0, "", name_conflict_fn, + 0, DO_FOR_EACH_INCLUDE_BROKEN, + &data)) { + error("'%s' exists; cannot create '%s'", + data.conflicting_refname, refname); + return 0; } return 1; } |