path: root/log-tree.c
diff options
authorJunio C Hamano <>2018-08-02 22:30:39 (GMT)
committerJunio C Hamano <>2018-08-02 22:30:39 (GMT)
commit37aac3e408fa2348983e964f8bda2de581f2c44e (patch)
tree1a59edd1eb2ece6e597342460b5b199ef2c5624b /log-tree.c
parentbba1a5559cd0015165563fd01d23bbd5e52bea72 (diff)
parent580f0980e11b9dcfdaf0f8af12b8cef7c702a7e1 (diff)
Merge branch 'bc/object-id'
Conversion from uchar[40] to struct object_id continues. * bc/object-id: pretty: switch hard-coded constants to the_hash_algo sha1-file: convert constants to uses of the_hash_algo log-tree: switch GIT_SHA1_HEXSZ to the_hash_algo->hexsz diff: switch GIT_SHA1_HEXSZ to use the_hash_algo builtin/merge-recursive: make hash independent builtin/merge: switch to use the_hash_algo builtin/fmt-merge-msg: make hash independent builtin/update-index: simplify parsing of cacheinfo builtin/update-index: convert to using the_hash_algo refs/files-backend: use the_hash_algo for writing refs sha1-name: use the_hash_algo when parsing object names strbuf: allocate space with GIT_MAX_HEXSZ commit: express tree entry constants in terms of the_hash_algo hex: switch to using the_hash_algo tree-walk: replace hard-coded constants with the_hash_algo cache: update object ID functions for the_hash_algo
Diffstat (limited to 'log-tree.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c
index 4a3907f..f2ca0fb 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -546,7 +546,7 @@ void show_log(struct rev_info *opt)
struct strbuf msgbuf = STRBUF_INIT;
struct log_info *log = opt->loginfo;
struct commit *commit = log->commit, *parent = log->parent;
- int abbrev_commit = opt->abbrev_commit ? opt->abbrev : GIT_SHA1_HEXSZ;
+ int abbrev_commit = opt->abbrev_commit ? opt->abbrev : the_hash_algo->hexsz;
const char *extra_headers = opt->extra_headers;
struct pretty_print_context ctx = {0};