Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/utf8-fprintf'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 7 Jul 2017 01:14:44 +0000
(18:14 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 7 Jul 2017 01:14:44 +0000
(18:14 -0700)
Code cleanup.
* jc/utf8-fprintf:
submodule--helper: do not call utf8_fprintf() unnecessarily
1
2
builtin/submodule--helper.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
8f58a34
dc4b4a6
)
diff --cc
builtin/submodule--helper.c
index e1b06c41d8efe083e4a368d207720724e594ca65,704df874d168cf43aa465448af4b65cc193a3689..6abdad3294ce84652a55522aff55f6e7673d192f
---
1
/
builtin/submodule--helper.c
---
2
/
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;
}