From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 19:41:33 +0000 (-0700)
Subject: Merge branch 'sb/submodule-cleanup'
X-Git-Tag: v2.19.0-rc0~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/85c54ecc5f26d5273f15ef64e8d756353b222d3b?ds=inline;hp=-c

Merge branch 'sb/submodule-cleanup'

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
---

85c54ecc5f26d5273f15ef64e8d756353b222d3b
diff --combined builtin/submodule--helper.c
index a4440a3109,65f8760ee2..2bcc70fdfe
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@@ -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)