submodule: don't use submodule_from_name
authorBrandon Williams <bmwill@google.com>
Tue, 25 Jul 2017 21:39:15 +0000 (14:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Aug 2017 21:35:08 +0000 (14:35 -0700)
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>
submodule.c
index 5139b9256b589a6524e6158dbb1c2ae492ea4f70..19bd13bb2a343479aa3c4a567d3bb9b915a697b5 100644 (file)
@@ -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) {