global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-17 04:00:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

names_conflict(): new function, extracted from is_refname_available()

Browse Source 
This costs an extra strlen() in the loop, but even that small price
will be clawed back in the next patch.

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
2011-10-19 23:44:50 +02:00
committed by Junio C Hamano
parent 782aee6c38
commit 53699dc56b
1 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
refs.c
View File

@@ -1074,6 +1074,30 @@ static int remove_empty_directories(const char *file)
return result;
}
/*
* Return true iff refname1 and refname2 conflict with each other.
* Two reference names conflict if one of them exactly matches the
* leading components of the other; e.g., "foo/bar" conflicts with
* both "foo" and with "foo/bar/baz" but not with "foo/bar" or
* "foo/barbados".
*/
static int names_conflict(const char *refname1, const char *refname2)
{
int len1 = strlen(refname1);
int len2 = strlen(refname2);
int cmplen;
const char *lead;
if (len1 < len2) {
cmplen = len1;
lead = refname2;
} else {
cmplen = len2;
lead = refname1;
}
return !strncmp(refname1, refname2, cmplen) && lead[cmplen] == '/';
}
/*
* Return true iff a reference named refname could be created without
* conflicting with the name of an existing reference. If oldrefname
@@ -1084,20 +1108,15 @@ static int remove_empty_directories(const char *file)
static int is_refname_available(const char *refname, const char *oldrefname,
struct ref_array *array)
{
int i, namlen = strlen(refname); /* e.g. 'foo/bar' */
int i;
for (i = 0; i < array->nr; i++ ) {
struct ref_entry *entry = array->refs[i];
/* entry->name could be 'foo' or 'foo/bar/baz' */
if (!oldrefname || strcmp(oldrefname, entry->name)) {
int len = strlen(entry->name);
int cmplen = (namlen < len) ? namlen : len;
const char *lead = (namlen < len) ? entry->name : refname;
if (!strncmp(refname, entry->name, cmplen) &&
lead[cmplen] == '/') {
error("'%s' exists; cannot create '%s'",
entry->name, refname);
return 0;
}
if (oldrefname && !strcmp(oldrefname, entry->name))
continue;
if (names_conflict(refname, entry->name)) {
error("'%s' exists; cannot create '%s'",
entry->name, refname);
return 0;
}
}
return 1;