From mboxrd@z Thu Jan 1 00:00:00 1970 From: mhagger@alum.mit.edu Subject: [PATCH v2 12/12] is_refname_available(): reimplement using do_for_each_ref_in_array() Date: Fri, 28 Oct 2011 13:28:04 +0200 Message-ID: <1319801284-15625-13-git-send-email-mhagger@alum.mit.edu> References: <1319801284-15625-1-git-send-email-mhagger@alum.mit.edu> Cc: git@vger.kernel.org, Jeff King , Drew Northup , Jakub Narebski , Heiko Voigt , Johan Herland , Julian Phillips , Michael Haggerty To: Junio C Hamano X-From: git-owner@vger.kernel.org Fri Oct 28 13:32:01 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RJkfH-0003vg-St for gcvg-git-2@lo.gmane.org; Fri, 28 Oct 2011 13:32:00 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755464Ab1J1Lby (ORCPT ); Fri, 28 Oct 2011 07:31:54 -0400 Received: from mail.berlin.jpk.com ([212.222.128.130]:55146 "EHLO mail.berlin.jpk.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755334Ab1J1Lby (ORCPT ); Fri, 28 Oct 2011 07:31:54 -0400 Received: from michael.berlin.jpk.com ([192.168.100.152]) by mail.berlin.jpk.com with esmtp (Exim 4.50) id 1RJkVI-0007Cx-NQ; Fri, 28 Oct 2011 13:21:40 +0200 X-Mailer: git-send-email 1.7.7 In-Reply-To: <1319801284-15625-1-git-send-email-mhagger@alum.mit.edu> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Michael Haggerty This implementation will survive upcoming changes to the ref_array data structure. Signed-off-by: Michael Haggerty --- refs.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/refs.c b/refs.c index 2a5d8b2..96466f3 100644 --- a/refs.c +++ b/refs.c @@ -1106,6 +1106,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 @@ -1116,16 +1135,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; } -- 1.7.7