From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Jul 2017 01:14:44 +0000 (-0700)
Subject: Merge branch 'jc/utf8-fprintf'
X-Git-Tag: v2.14.0-rc0~31
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=62458ea3338198560a22baa91124cea6d12d8bf5;p=git-core%2Fgit.git

Merge branch 'jc/utf8-fprintf'

Code cleanup.

* jc/utf8-fprintf:
  submodule--helper: do not call utf8_fprintf() unnecessarily
---

62458ea3338198560a22baa91124cea6d12d8bf5
diff --cc builtin/submodule--helper.c
index e1b06c41d,704df874d..6abdad329
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@@ -324,10 -295,9 +323,10 @@@ static int module_list(int argc, const 
  		if (ce_stage(ce))
  			printf("%06o %s U\t", ce->ce_mode, sha1_to_hex(null_sha1));
  		else
 -			printf("%06o %s %d\t", ce->ce_mode, sha1_to_hex(ce->sha1), ce_stage(ce));
 +			printf("%06o %s %d\t", ce->ce_mode,
 +			       oid_to_hex(&ce->oid), ce_stage(ce));
  
- 		utf8_fprintf(stdout, "%s\n", ce->name);
+ 		fprintf(stdout, "%s\n", ce->name);
  	}
  	return 0;
  }