From: mhagger@alum.mit.edu
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Drew Northup <drew.northup@maine.edu>,
Jakub Narebski <jnareb@gmail.com>,
Heiko Voigt <hvoigt@hvoigt.net>,
Johan Herland <johan@herland.net>,
Julian Phillips <julian@quantumfyre.co.uk>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v3 06/14] is_refname_available(): remove the "quiet" argument
Date: Fri, 28 Oct 2011 13:14:33 +0200 [thread overview]
Message-ID: <1319800481-15138-7-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1319800481-15138-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>
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>
---
refs.c | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/refs.c b/refs.c
index c9e14fd..d3dcb3c 100644
--- a/refs.c
+++ b/refs.c
@@ -1059,8 +1059,15 @@ static int remove_empty_directories(const char *file)
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,
- 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++ ) {
@@ -1072,9 +1079,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] == '/') {
- if (!quiet)
- error("'%s' exists; cannot create '%s'",
- entry->name, refname);
+ error("'%s' exists; cannot create '%s'",
+ entry->name, refname);
return 0;
}
}
@@ -1215,7 +1221,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
* 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;
}
@@ -1369,10 +1375,10 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
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;
- 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)))
--
1.7.7
next prev parent reply other threads:[~2011-10-28 11:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-28 11:14 [PATCH v3 00/14] Tidying up references code mhagger
2011-10-28 11:14 ` [PATCH v3 01/14] cache.h: add comments for git_path() and git_path_submodule() mhagger
2011-10-28 11:14 ` [PATCH v3 02/14] struct ref_entry: document name member mhagger
2011-10-28 11:14 ` [PATCH v3 03/14] refs: rename "refname" variables mhagger
2011-10-28 11:14 ` [PATCH v3 04/14] refs: rename parameters result -> sha1 mhagger
2011-10-28 11:14 ` [PATCH v3 05/14] clear_ref_array(): rename from free_ref_array() mhagger
2011-10-28 11:14 ` mhagger [this message]
2011-10-28 11:14 ` [PATCH v3 07/14] parse_ref_line(): add docstring mhagger
2011-10-28 11:14 ` [PATCH v3 08/14] add_ref(): " mhagger
2011-10-28 11:14 ` [PATCH v3 09/14] is_dup_ref(): extract function from sort_ref_array() mhagger
2011-10-28 11:14 ` [PATCH v3 10/14] refs: change signatures of get_packed_refs() and get_loose_refs() mhagger
2011-10-28 11:14 ` [PATCH v3 11/14] get_ref_dir(): change signature mhagger
2011-10-28 11:14 ` [PATCH v3 12/14] resolve_gitlink_ref(): improve docstring mhagger
2011-10-28 11:14 ` [PATCH v3 13/14] Pass a (ref_cache *) to the resolve_gitlink_*() helper functions mhagger
2011-10-28 11:14 ` [PATCH v3 14/14] resolve_gitlink_ref_recursive(): change to work with struct ref_cache mhagger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1319800481-15138-7-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=drew.northup@maine.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=jnareb@gmail.com \
--cc=johan@herland.net \
--cc=julian@quantumfyre.co.uk \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).