From b4f540b6cefdb33f35ffd5f8b2fb459c184a1bd7 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Fri, 10 Feb 2017 12:16:13 +0100 Subject: refs: remove some unnecessary handling of submodule == "" 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 Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- refs.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/refs.c b/refs.c index d7265ccc8f..63484140f6 100644 --- a/refs.c +++ b/refs.c @@ -1362,15 +1362,12 @@ static struct ref_store *submodule_ref_stores; * Return the ref_store instance for the specified submodule (or the * main repository if submodule is NULL). If that ref_store hasn't * 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) { struct ref_store *refs; - if (!submodule || !*submodule) + if (!submodule) return main_ref_store; 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 * 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) { @@ -1396,10 +1390,7 @@ static struct ref_store *ref_store_init(const char *submodule) if (!be) die("BUG: reference backend %s is unknown", be_name); - if (!submodule || !*submodule) - return be->init(NULL); - else - return be->init(submodule); + return be->init(submodule); } struct ref_store *get_ref_store(const char *submodule) -- cgit v1.2.3