From: Brandon Williams <bmwill@google.com>
Date: Tue, 25 Jul 2017 21:39:15 +0000 (-0700)
Subject: submodule: don't use submodule_from_name
X-Git-Tag: v2.15.0-rc0~120^2~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9ef23f91fc22be9327288c8dbb10646bb0bf4340

submodule: don't use submodule_from_name

The function 'submodule_from_name()' is being used incorrectly here as a
submodule path is being used instead of a submodule name.  Since the
correct function to use with a path to a submodule is already being used
('submodule_from_path()') let's remove the call to
'submodule_from_name()'.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/submodule.c b/submodule.c
index 5139b9256b..19bd13bb2a 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1177,8 +1177,6 @@ static int get_next_submodule(struct child_process *cp,
 			continue;
 
 		submodule = submodule_from_path(&null_oid, ce->name);
-		if (!submodule)
-			submodule = submodule_from_name(&null_oid, ce->name);
 
 		default_argv = "yes";
 		if (spf->command_line_option == RECURSE_SUBMODULES_DEFAULT) {