Merge branch 'sb/submodule-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 19:41:33 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 19:41:33 +0000 (12:41 -0700)
A few preliminary minor clean-ups in the area around submodules.

* sb/submodule-cleanup:
builtin/submodule--helper: remove stray new line
t7410: update to new style

1  2 
builtin/submodule--helper.c
index a4440a31094323581c696f4eb7b9048b02d3462e,65f8760ee2a18fc5511b27172517295afb4cc105..2bcc70fdfe2608ccbbab02b6f593dd81781ada41
@@@ -331,7 -331,7 +331,7 @@@ static int module_list_compute(int argc
        for (i = 0; i < active_nr; i++) {
                const struct cache_entry *ce = active_cache[i];
  
 -              if (!match_pathspec(pathspec, ce->name, ce_namelen(ce),
 +              if (!match_pathspec(&the_index, pathspec, ce->name, ce_namelen(ce),
                                    0, ps_matched, 1) ||
                    !S_ISGITLINK(ce->ce_mode))
                        continue;
@@@ -1024,7 -1024,6 +1024,6 @@@ static void sync_submodule_cb(const str
  {
        struct sync_cb *info = cb_data;
        sync_submodule(list_item->name, info->prefix, info->flags);
  }
  
  static int module_sync(int argc, const char **argv, const char *prefix)