summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-07-25 21:39:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-02 21:35:08 (GMT)
commit9ef23f91fc22be9327288c8dbb10646bb0bf4340 (patch)
treeccad710b035a444190716c38de437c3ce13144cc
parent5ea50954d0632342d38bd1a4d86c5aa601ef5207 (diff)
downloadgit-9ef23f91fc22be9327288c8dbb10646bb0bf4340.zip
git-9ef23f91fc22be9327288c8dbb10646bb0bf4340.tar.gz
git-9ef23f91fc22be9327288c8dbb10646bb0bf4340.tar.bz2
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>
-rw-r--r--submodule.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c
index 5139b92..19bd13b 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) {