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.3 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 799BB207F8 for ; Sat, 6 May 2017 22:13:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755171AbdEFWNV (ORCPT ); Sat, 6 May 2017 18:13:21 -0400 Received: from castro.crustytoothpaste.net ([75.10.60.170]:37866 "EHLO castro.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754683AbdEFWL4 (ORCPT ); Sat, 6 May 2017 18:11:56 -0400 Received: from genre.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:254c:7dd1:74c7:cde0]) (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 035D9280DC; Sat, 6 May 2017 22:11:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=crustytoothpaste.net; s=default; t=1494108679; bh=Vto8n0sF2z95bC/xXZreFC4KsEWTHN780kdYfW5w5GQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fe6TsgFDRhpNQuE4m4vP3OrTYRZMu8yM+X9n4OwInvj7Zeuvks6Bup9driy1fmiAY f6kNXpHcridPr+MBjZhX08pA3JbRMKrCUqDX0ThMvQY+HabWRBXXWBcxL46rAjBO60 8k0H5Q5tYeqzlXerFc55MxK88qkNEHP1c//79xMN4iRRxqTEiwCY7mgfFQ6csHg73D LcFZYoTuHgemHh82/6tGZThl9Rb4qKQIFcpCbDV8feIW89CZQTqno3K61M3Gdp1Umv qY99NWGEB/slKehZPfzolpQngRqS6SvHliXOr//RX2IbKO2/w/b6g0QFKAV234Z79J NsH85HGVTRvl2e2Ihg6PsYcQkNtl1ezomYL3iFUQwBDxtNjSRq7BX3rE/X17tmamyc bKlIcxnbeSjsDaSqgpSXZsmX01jurpKQnSq0blbvRxQbL0blu15Xb3mEBh8CVEnbK7 iiYSL9FI8dRIYeyeh+uIHOhPhCTugFv6juskRqCnbE6M7s+LbHS From: "brian m. carlson" To: git@vger.kernel.org Cc: Michael Haggerty , Jonathan Tan , Stefan Beller , Jeff King , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , Brandon Williams Subject: [PATCH v3 48/53] merge: convert checkout_fast_forward to struct object_id Date: Sat, 6 May 2017 22:10:33 +0000 Message-Id: <20170506221038.296722-49-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.13.0.rc1.294.g07d810a77f In-Reply-To: <20170506221038.296722-1-sandals@crustytoothpaste.net> References: <20170506221038.296722-1-sandals@crustytoothpaste.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Converting checkout_fast_forward is required to convert parse_tree_indirect. Signed-off-by: brian m. carlson --- builtin/merge.c | 4 ++-- builtin/pull.c | 4 ++-- cache.h | 4 ++-- merge.c | 8 ++++---- sequencer.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index f11b5f3de..5ea7f7da9 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1372,8 +1372,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix) goto done; } - if (checkout_fast_forward(head_commit->object.oid.hash, - commit->object.oid.hash, + if (checkout_fast_forward(&head_commit->object.oid, + &commit->object.oid, overwrite_ignore)) { ret = 1; goto done; diff --git a/builtin/pull.c b/builtin/pull.c index 2ffb6569a..318c273eb 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -523,7 +523,7 @@ static int pull_into_void(const struct object_id *merge_head, * index/worktree changes that the user already made on the unborn * branch. */ - if (checkout_fast_forward(EMPTY_TREE_SHA1_BIN, merge_head->hash, 0)) + if (checkout_fast_forward(&empty_tree_oid, merge_head, 0)) return 1; if (update_ref("initial pull", "HEAD", merge_head->hash, curr_head->hash, 0, UPDATE_REFS_DIE_ON_ERR)) @@ -839,7 +839,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) "fast-forwarding your working tree from\n" "commit %s."), oid_to_hex(&orig_head)); - if (checkout_fast_forward(orig_head.hash, curr_head.hash, 0)) + if (checkout_fast_forward(&orig_head, &curr_head, 0)) die(_("Cannot fast-forward your working tree.\n" "After making sure that you saved anything precious from\n" "$ git diff %s\n" diff --git a/cache.h b/cache.h index e1f0e182a..8862510f9 100644 --- a/cache.h +++ b/cache.h @@ -2198,8 +2198,8 @@ struct commit_list; int try_merge_command(const char *strategy, size_t xopts_nr, const char **xopts, struct commit_list *common, const char *head_arg, struct commit_list *remotes); -int checkout_fast_forward(const unsigned char *from, - const unsigned char *to, +int checkout_fast_forward(const struct object_id *from, + const struct object_id *to, int overwrite_ignore); diff --git a/merge.c b/merge.c index 04ee5fc91..b0cffe16f 100644 --- a/merge.c +++ b/merge.c @@ -44,8 +44,8 @@ int try_merge_command(const char *strategy, size_t xopts_nr, return ret; } -int checkout_fast_forward(const unsigned char *head, - const unsigned char *remote, +int checkout_fast_forward(const struct object_id *head, + const struct object_id *remote, int overwrite_ignore) { struct tree *trees[MAX_UNPACK_TREES]; @@ -79,10 +79,10 @@ int checkout_fast_forward(const unsigned char *head, opts.fn = twoway_merge; setup_unpack_trees_porcelain(&opts, "merge"); - trees[nr_trees] = parse_tree_indirect(head); + trees[nr_trees] = parse_tree_indirect(head->hash); if (!trees[nr_trees++]) return -1; - trees[nr_trees] = parse_tree_indirect(remote); + trees[nr_trees] = parse_tree_indirect(remote->hash); if (!trees[nr_trees++]) return -1; for (i = 0; i < nr_trees; i++) { diff --git a/sequencer.c b/sequencer.c index 9ca352ac7..dcc56a2b6 100644 --- a/sequencer.c +++ b/sequencer.c @@ -382,7 +382,7 @@ static int fast_forward_to(const struct object_id *to, const struct object_id *f struct strbuf err = STRBUF_INIT; read_cache(); - if (checkout_fast_forward(from->hash, to->hash, 1)) + if (checkout_fast_forward(from, to, 1)) return -1; /* the callee should have complained already */ strbuf_addf(&sb, _("%s: fast-forward"), _(action_name(opts)));