summaryrefslogtreecommitdiff
path: root/bisect.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-19 13:22:16 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-19 13:22:16 -0700
commita63d31b4d3640960d9a71606eee80c32459f906e (patch)
treef38215188f294761cbedca19d676e64a8788bd15 /bisect.c
parent63641fb07131bede8273c3b3057792c9dcf7356b (diff)
parent09bdff29e1b73ce264c7ddc3e19e1269ee7c610e (diff)
downloadgit-a63d31b4d3640960d9a71606eee80c32459f906e.tar.gz
Merge branch 'bc/cocci'
Conversion from unsigned char sha1[20] to struct object_id continues. * bc/cocci: diff: convert prep_temp_blob() to struct object_id merge-recursive: convert merge_recursive_generic() to object_id merge-recursive: convert leaf functions to use struct object_id merge-recursive: convert struct merge_file_info to object_id merge-recursive: convert struct stage_data to use object_id diff: rename struct diff_filespec's sha1_valid member diff: convert struct diff_filespec to struct object_id coccinelle: apply object_id Coccinelle transformations coccinelle: convert hashcpy() with null_sha1 to hashclr() contrib/coccinelle: add basic Coccinelle transforms hex: add oid_to_hex_r()
Diffstat (limited to 'bisect.c')
-rw-r--r--bisect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bisect.c b/bisect.c
index b2a75c60cf..47cccdfb0d 100644
--- a/bisect.c
+++ b/bisect.c
@@ -754,7 +754,7 @@ static void handle_bad_merge_base(void)
static void handle_skipped_merge_base(const unsigned char *mb)
{
char *mb_hex = sha1_to_hex(mb);
- char *bad_hex = sha1_to_hex(current_bad_oid->hash);
+ char *bad_hex = oid_to_hex(current_bad_oid);
char *good_hex = join_sha1_array_hex(&good_revs, ' ');
warning(_("the merge base between %s and [%s] "