Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/utf8-fprintf' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 10 Jul 2017 20:59:08 +0000
(13:59 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 10 Jul 2017 20:59:09 +0000
(13:59 -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:
8e7b78a
dc4b4a6
)
diff --cc
builtin/submodule--helper.c
index 566a5b6a6f8937742e83577918a94f0dcb20c66c,704df874d168cf43aa465448af4b65cc193a3689..cbb17a90212cb7fadc00b36d16dd770ff93bbef0
---
1
/
builtin/submodule--helper.c
---
2
/
builtin/submodule--helper.c
+++ b/
builtin/submodule--helper.c
@@@
-323,10
-295,9
+322,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;
}