From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Oct 2018 06:43:43 +0000 (+0900)
Subject: Merge branch 'sb/submodule-helper-remove-cruft'
X-Git-Tag: v2.20.0-rc0~118
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7002cb97522418d978b308d8bce6446b2cc0fd79?ds=inline;hp=-c

Merge branch 'sb/submodule-helper-remove-cruft'

Code clean-up.

* sb/submodule-helper-remove-cruft:
builtin/submodule--helper: remove debugging leftover tracing
---

7002cb97522418d978b308d8bce6446b2cc0fd79
diff --combined builtin/submodule--helper.c
index 80474c3ff5,a131cd29cd..8e1db55e13
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@@ -792,7 -792,7 +792,7 @@@ static void status_submodule(const cha
  			 path, NULL);
  
  	git_config(git_diff_basic_config, NULL);
 -	init_revisions(&rev, prefix);
 +	repo_init_revisions(the_repository, &rev, prefix);
  	rev.abbrev = 0;
  	diff_files_args.argc = setup_revisions(diff_files_args.argc,
  					       diff_files_args.argv,
@@@ -1457,7 -1457,6 +1457,6 @@@ static void determine_submodule_update_
  	key = xstrfmt("submodule.%s.update", sub->name);
  
  	if (update) {
- 		trace_printf("parsing update");
  		if (parse_submodule_update_strategy(update, out) < 0)
  			die(_("Invalid update mode '%s' for submodule path '%s'"),
  				update, path);
@@@ -1466,7 -1465,6 +1465,6 @@@
  			die(_("Invalid update mode '%s' configured for submodule path '%s'"),
  				val, path);
  	} else if (sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
- 		trace_printf("loaded thing");
  		out->type = sub->update_strategy.type;
  		out->command = sub->update_strategy.command;
  	} else