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>

diff --git a/refs.c b/refs.c
index 7be91d16e0b0ab66d8ffb51a81514c9fbc1442e5..d7d422ffb9917b69287b54904aff2c7f30a23d62 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1057,8 +1057,15 @@ static int remove_empty_directories(const char *file)
        return result;
 }
 
        return result;
 }
 

+/*
+ * Return true iff a reference named refname could be created without
+ * conflicting with the name of an existing reference.  If oldrefname
+ * is non-NULL, ignore potential conflicts with oldrefname (e.g.,
+ * because oldrefname is scheduled for deletion in the same
+ * operation).
+ */

 static int is_refname_available(const char *refname, const char *oldrefname,
 static int is_refname_available(const char *refname, const char *oldrefname,

-                               struct ref_array *array, int quiet)
+                               struct ref_array *array)

 {
        int i, namlen = strlen(refname); /* e.g. 'foo/bar' */
        for (i = 0; i < array->nr; i++ ) {
 {
        int i, namlen = strlen(refname); /* e.g. 'foo/bar' */
        for (i = 0; i < array->nr; i++ ) {


@@ -1070,9 +1077,8 @@ static int is_refname_available(const char *refname, const char *oldrefname,
                        const char *lead = (namlen < len) ? entry->name : refname;
                        if (!strncmp(refname, entry->name, cmplen) &&
                            lead[cmplen] == '/') {
                        const char *lead = (namlen < len) ? entry->name : refname;
                        if (!strncmp(refname, entry->name, cmplen) &&
                            lead[cmplen] == '/') {

-                               if (!quiet)
-                                       error("'%s' exists; cannot create '%s'",
-                                             entry->name, refname);
+                               error("'%s' exists; cannot create '%s'",
+                                     entry->name, refname);

                                return 0;
                        }
                }
                                return 0;
                        }
                }


@@ -1213,7 +1219,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
         * name is a proper prefix of our refname.
         */
        if (missing &&
         * name is a proper prefix of our refname.
         */
        if (missing &&

-            !is_refname_available(refname, NULL, get_packed_refs(NULL), 0)) {
+            !is_refname_available(refname, NULL, get_packed_refs(NULL))) {

                last_errno = ENOTDIR;
                goto error_return;
        }
                last_errno = ENOTDIR;
                goto error_return;
        }


@@ -1367,10 +1373,10 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
        if (!symref)
                return error("refname %s not found", oldrefname);
 
        if (!symref)
                return error("refname %s not found", oldrefname);
 

-       if (!is_refname_available(newrefname, oldrefname, get_packed_refs(NULL), 0))
+       if (!is_refname_available(newrefname, oldrefname, get_packed_refs(NULL)))

                return 1;
 
                return 1;
 

-       if (!is_refname_available(newrefname, oldrefname, get_loose_refs(NULL), 0))
+       if (!is_refname_available(newrefname, oldrefname, get_loose_refs(NULL)))

                return 1;
 
        if (log && rename(git_path("logs/%s", oldrefname), git_path(TMP_RENAMED_LOG)))
                return 1;
 
        if (log && rename(git_path("logs/%s", oldrefname), git_path(TMP_RENAMED_LOG)))