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=-3.1 required=3.0 tests=AWL,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 A78B620958 for ; Sun, 26 Mar 2017 16:02:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751508AbdCZQCD (ORCPT ); Sun, 26 Mar 2017 12:02:03 -0400 Received: from castro.crustytoothpaste.net ([75.10.60.170]:58052 "EHLO castro.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751467AbdCZQCA (ORCPT ); Sun, 26 Mar 2017 12:02:00 -0400 Received: from genre.crustytoothpaste.net (unknown [172.16.2.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by castro.crustytoothpaste.net (Postfix) with ESMTPSA id CF3C9280B2; Sun, 26 Mar 2017 16:01:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1490544113; bh=VDRzm9rDcpMlVKT9VzC+P7AfyyS/Gd+ScXtF/5hft98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jL66IKuCh9DYtE7zjppwB8njqizQo0MqhUzaep6OMoLZFKfAvtQOB546QsCUGiuTe o+i6VeHSbXvworIcOcLc7WN08B29vpl1VIQTZxTfoxE02KFgdR6svcmhNUSYH9Xw9g mWmMYs+iEHE+URMesIJlA84DH6kVlzdpFptgKE5uiD5uo+2IasvHNcxKOOx4AO1NkC loGxU0y/msHhU7YTczv0YZsu649qDT1W7zrwn9O+lLzHq2n0v/8RGPV4qbeN4Yb8CL Mmwkss7QSRnUJSjhYkjfloSVzrYj7srKeT4on8AjCcEgkRA1j0mouONAWrA8+gUHl9 QFAs1EYXRxjvrOjCAUTp0E9wQCzHoHrJP4gCnMB/pX2k2Tq01Ek53kd9yqCEm3tKGq 4gvpQ2Wadw9BZk0wRSebktBLkWU4qz/uGN8H9eUT9VHnRNmmL2/bAmvfwhw3eY/Ki2 j5B67Jwtbj1cCl06uS07Z8v2wWEfAASVXktuouk76TeMTv3dJ76 From: "brian m. carlson" To: git@vger.kernel.org Cc: Jeff King , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Junio C Hamano Subject: [PATCH v2 05/21] builtin/pull: convert portions to struct object_id Date: Sun, 26 Mar 2017 16:01:27 +0000 Message-Id: <20170326160143.769630-6-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170326160143.769630-1-sandals@crustytoothpaste.net> References: <20170326160143.769630-1-sandals@crustytoothpaste.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Convert the caller of sha1_array_append to struct object_id. Signed-off-by: brian m. carlson --- builtin/pull.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/pull.c b/builtin/pull.c index 3ecb881b0b..a9f7553f30 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -335,16 +335,16 @@ static void get_merge_heads(struct sha1_array *merge_heads) const char *filename = git_path("FETCH_HEAD"); FILE *fp; struct strbuf sb = STRBUF_INIT; - unsigned char sha1[GIT_SHA1_RAWSZ]; + struct object_id oid; if (!(fp = fopen(filename, "r"))) die_errno(_("could not open '%s' for reading"), filename); while (strbuf_getline_lf(&sb, fp) != EOF) { - if (get_sha1_hex(sb.buf, sha1)) + if (get_oid_hex(sb.buf, &oid)) continue; /* invalid line: does not start with SHA1 */ if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t")) continue; /* ref is not-for-merge */ - sha1_array_append(merge_heads, sha1); + sha1_array_append(merge_heads, oid.hash); } fclose(fp); strbuf_release(&sb);