summaryrefslogtreecommitdiff
path: root/bisect.c
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2016-06-24 23:09:22 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-28 11:39:02 -0700
commitc368dde9245fa3d50b7e01e1ff4f9e5c12c718da (patch)
treea403a930011d189beac26ce291d9413032df2337 /bisect.c
parentcoccinelle: convert hashcpy() with null_sha1 to hashclr() (diff)
downloadtgif-c368dde9245fa3d50b7e01e1ff4f9e5c12c718da.tar.xz
coccinelle: apply object_id Coccinelle transformations
Apply the set of semantic patches from contrib/coccinelle to convert some leftover places using struct object_id's hash member to instead use the wrapper functions that take struct object_id natively. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 6d93edbcb9..ff147589c7 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] "