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=-2.9 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=no 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 37A611F404 for ; Tue, 30 Jan 2018 23:44:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932143AbeA3Xox (ORCPT ); Tue, 30 Jan 2018 18:44:53 -0500 Received: from mx0a-00153501.pphosted.com ([67.231.148.48]:36638 "EHLO mx0a-00153501.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932130AbeA3Xol (ORCPT ); Tue, 30 Jan 2018 18:44:41 -0500 Received: from pps.filterd (m0131697.ppops.net [127.0.0.1]) by mx0a-00153501.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w0UNOJAU009746; Tue, 30 Jan 2018 15:25:35 -0800 Authentication-Results: palantir.com; spf=softfail smtp.mailfrom=newren@gmail.com Received: from smtp-transport.yojoe.local (mxw3.palantir.com [66.70.54.23] (may be forged)) by mx0a-00153501.pphosted.com with ESMTP id 2frr5qd2d9-1; Tue, 30 Jan 2018 15:25:34 -0800 Received: from mxw1.palantir.com (new-smtp.yojoe.local [172.19.0.45]) by smtp-transport.yojoe.local (Postfix) with ESMTP id D7F25221A56E; Tue, 30 Jan 2018 15:25:34 -0800 (PST) Received: from newren2-linux.yojoe.local (newren2-linux.dyn.yojoe.local [10.100.68.32]) by smtp.yojoe.local (Postfix) with ESMTP id C95562CDE88; Tue, 30 Jan 2018 15:25:34 -0800 (PST) From: Elijah Newren To: gitster@pobox.com Cc: git@vger.kernel.org, sbeller@google.com, szeder.dev@gmail.com, jrnieder@gmail.com, peff@peff.net, Elijah Newren Subject: [PATCH v7 15/31] merge-recursive: make !o->detect_rename codepath more obvious Date: Tue, 30 Jan 2018 15:25:17 -0800 Message-Id: <20180130232533.25846-16-newren@gmail.com> X-Mailer: git-send-email 2.16.1.106.gf69932adfe In-Reply-To: <20180130232533.25846-1-newren@gmail.com> References: <20180130232533.25846-1-newren@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-SPF-Result: softfail X-Proofpoint-SPF-Record: v=spf1 redirect=_spf.google.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-01-30_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=13 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=609 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1801300286 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Previously, if !o->detect_rename then get_renames() would return an empty string_list, and then process_renames() would have nothing to iterate over. It seems more straightforward to simply avoid calling either function in that case. Signed-off-by: Elijah Newren --- merge-recursive.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 1986af79a9..4e6d0c248e 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1338,8 +1338,6 @@ static struct string_list *get_renames(struct merge= _options *o, struct diff_options opts; =20 renames =3D xcalloc(1, sizeof(struct string_list)); - if (!o->detect_rename) - return renames; =20 diff_setup(&opts); opts.flags.recursive =3D 1; @@ -1657,6 +1655,12 @@ static int handle_renames(struct merge_options *o, struct string_list *entries, struct rename_info *ri) { + ri->head_renames =3D NULL; + ri->merge_renames =3D NULL; + + if (!o->detect_rename) + return 1; + ri->head_renames =3D get_renames(o, head, common, head, merge, entries= ); ri->merge_renames =3D get_renames(o, merge, common, head, merge, entrie= s); return process_renames(o, ri->head_renames, ri->merge_renames); @@ -1667,6 +1671,9 @@ static void cleanup_rename(struct string_list *rena= me) const struct rename *re; int i; =20 + if (rename =3D=3D NULL) + return; + for (i =3D 0; i < rename->nr; i++) { re =3D rename->items[i].util; diff_free_filepair(re->pair); --=20 2.16.1.106.gf69932adfe