mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs: remove some unnecessary handling of submodule == ""

Browse Source 
The only external entry point to the ref_store lookup functions is
get_ref_store(), which ensures that submodule == "" is passed along as
NULL. So ref_store_init() and lookup_ref_store() don't have to handle
submodule being specified as the empty string.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2017-02-10 12:16:13 +01:00
committed by Junio C Hamano
parent c468da4e27
commit b4f540b6ce
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
refs.c
View File

@ -1362,15 +1362,12 @@ static struct ref_store *submodule_ref_stores;
* Return the ref_store instance for the specified submodule (or the * Return the ref_store instance for the specified submodule (or the
* main repository if submodule is NULL). If that ref_store hasn't * main repository if submodule is NULL). If that ref_store hasn't
* been initialized yet, return NULL. * been initialized yet, return NULL.
*
* For backwards compatibility, submodule=="" is treated the same as
* submodule==NULL.
*/ */
static struct ref_store *lookup_ref_store(const char *submodule) static struct ref_store *lookup_ref_store(const char *submodule)
{ {
struct ref_store *refs; struct ref_store *refs;
if (!submodule || !*submodule) if (!submodule)
return main_ref_store; return main_ref_store;
for (refs = submodule_ref_stores; refs; refs = refs->next) { for (refs = submodule_ref_stores; refs; refs = refs->next) {
@ -1384,9 +1381,6 @@ static struct ref_store *lookup_ref_store(const char *submodule)
/* /*
* Create, record, and return a ref_store instance for the specified * Create, record, and return a ref_store instance for the specified
* submodule (or the main repository if submodule is NULL). * submodule (or the main repository if submodule is NULL).
*
* For backwards compatibility, submodule=="" is treated the same as
* submodule==NULL.
*/ */
static struct ref_store *ref_store_init(const char *submodule) static struct ref_store *ref_store_init(const char *submodule)
{ {
@ -1396,10 +1390,7 @@ static struct ref_store *ref_store_init(const char *submodule)
if (!be) if (!be)
die("BUG: reference backend %s is unknown", be_name); die("BUG: reference backend %s is unknown", be_name);
if (!submodule || !*submodule) return be->init(submodule);
return be->init(NULL);
else
return be->init(submodule);
} }
struct ref_store *get_ref_store(const char *submodule) struct ref_store *get_ref_store(const char *submodule)