is_refname_available(): remove the "quiet" argument
quiet was always set to 0, so get rid of it. Add a function docstring for good measure. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Dec 12, 2011 at 06:38 UTC
19b68b1e632ba989dc62d0956b7fd06978347370
1 file changed
+13
-7
refs.c
+13
-7
@@ -1057,8 +1057,15 @@ static int remove_empty_directories(const char *file)
1057
return result;
1058
}
1059
1060
+/*
1061
+ * Return true iff a reference named refname could be created without
1062
+ * conflicting with the name of an existing reference. If oldrefname
1063
+ * is non-NULL, ignore potential conflicts with oldrefname (e.g.,
1064
+ * because oldrefname is scheduled for deletion in the same
1065
+ * operation).
1066
+ */
1067
static int is_refname_available(const char *refname, const char *oldrefname,
1061
- struct ref_array *array, int quiet)
1068
+ struct ref_array *array)
1069
{
1070
int i, namlen = strlen(refname); /* e.g. 'foo/bar' */
1071
for (i = 0; i < array->nr; i++ ) {
@@ -1070,9 +1077,8 @@ static int is_refname_available(const char *refname, const char *oldrefname,
1077
const char *lead = (namlen < len) ? entry->name : refname;
1078
if (!strncmp(refname, entry->name, cmplen) &&
1079
lead[cmplen] == '/') {
1073
- if (!quiet)
1074
- error("'%s' exists; cannot create '%s'",
1075
- entry->name, refname);
1080
+ error("'%s' exists; cannot create '%s'",
1081
+ entry->name, refname);
1082
return 0;
1083
}
1084
}
@@ -1213,7 +1219,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
1219
* name is a proper prefix of our refname.
1220
*/
1221
if (missing &&
1216
- !is_refname_available(refname, NULL, get_packed_refs(NULL), 0)) {
1222
+ !is_refname_available(refname, NULL, get_packed_refs(NULL))) {
1223
last_errno = ENOTDIR;
1224
goto error_return;
1225
}
@@ -1367,10 +1373,10 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
1373
if (!symref)
1374
return error("refname %s not found", oldrefname);
1375
1370
- if (!is_refname_available(newrefname, oldrefname, get_packed_refs(NULL), 0))
1376
+ if (!is_refname_available(newrefname, oldrefname, get_packed_refs(NULL)))
1377
return 1;
1378
1373
- if (!is_refname_available(newrefname, oldrefname, get_loose_refs(NULL), 0))
1379
+ if (!is_refname_available(newrefname, oldrefname, get_loose_refs(NULL)))
1380
return 1;
1381
1382
if (log && rename(git_path("logs/%s", oldrefname), git_path(TMP_RENAMED_LOG)))