summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorDavid Turner <dturner@twopensource.com>2016-09-04 16:08:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-09 22:28:12 (GMT)
commitff3a299c457cb159a83df8382ed76731e03db530 (patch)
treedd29f026ee445bc19f5c2b5525fa6b72fc599ab3 /refs.c
parentf6e75467ca83f116e96525c33d9b669e47f310fd (diff)
downloadgit-ff3a299c457cb159a83df8382ed76731e03db530.zip
git-ff3a299c457cb159a83df8382ed76731e03db530.tar.gz
git-ff3a299c457cb159a83df8382ed76731e03db530.tar.bz2
rename_ref_available(): add docstring
And improve the internal variable names. Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/refs.c b/refs.c
index 814cad3..256fef5 100644
--- a/refs.c
+++ b/refs.c
@@ -1081,20 +1081,20 @@ const char *find_descendant_ref(const char *dirname,
return NULL;
}
-int rename_ref_available(const char *oldname, const char *newname)
+int rename_ref_available(const char *old_refname, const char *new_refname)
{
struct string_list skip = STRING_LIST_INIT_NODUP;
struct strbuf err = STRBUF_INIT;
- int ret;
+ int ok;
- string_list_insert(&skip, oldname);
- ret = !verify_refname_available(newname, NULL, &skip, &err);
- if (!ret)
+ string_list_insert(&skip, old_refname);
+ ok = !verify_refname_available(new_refname, NULL, &skip, &err);
+ if (!ok)
error("%s", err.buf);
string_list_clear(&skip, 0);
strbuf_release(&err);
- return ret;
+ return ok;
}
int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)