From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-9.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 03E491FEAA for ; Fri, 24 Jun 2016 23:09:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751524AbcFXXJp (ORCPT ); Fri, 24 Jun 2016 19:09:45 -0400 Received: from castro.crustytoothpaste.net ([75.10.60.170]:52558 "EHLO castro.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019AbcFXXJk (ORCPT ); Fri, 24 Jun 2016 19:09:40 -0400 Received: from vauxhall.crustytoothpaste.net (unknown [107.18.82.227]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by castro.crustytoothpaste.net (Postfix) with ESMTPSA id 2FF99280A3; Fri, 24 Jun 2016 23:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1466809779; bh=DGWHcEgVtZV0jvFMtyK27dlhNuqPUr7rgXWAd2KunCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JaI4FLMNQqDKNSDM0dHHrFh+Cn6KmqEncMkWN+xIZYAzCZVhPiIiB59DOHyley3z2 /goOtXiTmF95JTC5RMQ162VJZnhD2TB9T6Bh5n/9kA6bSk/TmIyZKDKvUh12R9arOu Hwc5eaEPUh11UHOXK/gfNqk3zIA/Z7snSk1JEKTLWNA8n+UYDjesq7mCTO8CJ8QKEm SPWZVmzk/p0MBDpD8WJBbTw8xHx18+WA6ZaKrzyu/55bZdy70cvZSRQThWAo9z29q9 5UoLYKOksHEj3haqvjchyd4MqP4L5dKBw0/rsS3qd8O3IBy0F26M9Dlvg3wznbfPY+ mxJ2EUldLa3xeWgTJ1wGOS5BCYRIes+1egNwlSgPn8jsBSDYyIqjfs2BmylSTK5nuW xjg0jpBFOHFU8xDdX4UbXmFRHpKze/OpxOiYqQgRYTkK6JbFPyUZig4jdTUwXYUYhV 7tGVa9vR/GP6XjpDYDdKVhkfc3TxCQAgHVCIg7d+8qH9PvITfe3 From: "brian m. carlson" To: git@vger.kernel.org Cc: Elijah Newren , Junio C Hamano , Stefan Beller , Jeff King , Johannes Sixt Subject: [PATCH v3 04/11] coccinelle: apply object_id Coccinelle transformations Date: Fri, 24 Jun 2016 23:09:22 +0000 Message-Id: <20160624230929.82222-5-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160624230929.82222-1-sandals@crustytoothpaste.net> References: <20160624230929.82222-1-sandals@crustytoothpaste.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 Signed-off-by: Junio C Hamano --- bisect.c | 2 +- builtin/merge.c | 13 ++++++------- refs/files-backend.c | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/bisect.c b/bisect.c index 6d93edbc..ff147589 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] " diff --git a/builtin/merge.c b/builtin/merge.c index a9b99c9f..f66d06ce 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -501,7 +501,7 @@ static void merge_name(const char *remote, struct strbuf *msg) if (ref_exists(truname.buf)) { strbuf_addf(msg, "%s\t\tbranch '%s'%s of .\n", - sha1_to_hex(remote_head->object.oid.hash), + oid_to_hex(&remote_head->object.oid), truname.buf + 11, (early ? " (early part)" : "")); strbuf_release(&truname); @@ -515,7 +515,7 @@ static void merge_name(const char *remote, struct strbuf *msg) desc = merge_remote_util(remote_head); if (desc && desc->obj && desc->obj->type == OBJ_TAG) { strbuf_addf(msg, "%s\t\t%s '%s'\n", - sha1_to_hex(desc->obj->oid.hash), + oid_to_hex(&desc->obj->oid), typename(desc->obj->type), remote); goto cleanup; @@ -523,7 +523,7 @@ static void merge_name(const char *remote, struct strbuf *msg) } strbuf_addf(msg, "%s\t\tcommit '%s'\n", - sha1_to_hex(remote_head->object.oid.hash), remote); + oid_to_hex(&remote_head->object.oid), remote); cleanup: strbuf_release(&buf); strbuf_release(&bname); @@ -1366,7 +1366,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) for (p = remoteheads; p; p = p->next) { struct commit *commit = p->item; strbuf_addf(&buf, "GITHEAD_%s", - sha1_to_hex(commit->object.oid.hash)); + oid_to_hex(&commit->object.oid)); setenv(buf.buf, merge_remote_util(commit)->name, 1); strbuf_reset(&buf); if (fast_forward != FF_ONLY && @@ -1425,7 +1425,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) goto done; } else if (fast_forward != FF_NO && !remoteheads->next && !common->next && - !hashcmp(common->item->object.oid.hash, head_commit->object.oid.hash)) { + !oidcmp(&common->item->object.oid, &head_commit->object.oid)) { /* Again the most common case of merging one remote. */ struct strbuf msg = STRBUF_INIT; struct commit *commit; @@ -1499,8 +1499,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * HEAD^^" would be missed. */ common_one = get_merge_bases(head_commit, j->item); - if (hashcmp(common_one->item->object.oid.hash, - j->item->object.oid.hash)) { + if (oidcmp(&common_one->item->object.oid, &j->item->object.oid)) { up_to_date = 0; break; } diff --git a/refs/files-backend.c b/refs/files-backend.c index 1f380764..dac3a222 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1725,14 +1725,14 @@ static int verify_lock(struct ref_lock *lock, errno = save_errno; return -1; } else { - hashclr(lock->old_oid.hash); + oidclr(&lock->old_oid); return 0; } } if (old_sha1 && hashcmp(lock->old_oid.hash, old_sha1)) { strbuf_addf(err, "ref %s is at %s but expected %s", lock->ref_name, - sha1_to_hex(lock->old_oid.hash), + oid_to_hex(&lock->old_oid), sha1_to_hex(old_sha1)); errno = EBUSY; return -1;