From patchwork Sun Sep 9 08:53:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10593263 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EC0E714E0 for ; Sun, 9 Sep 2018 08:54:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD145294A3 for ; Sun, 9 Sep 2018 08:54:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0CD529493; Sun, 9 Sep 2018 08:54:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C668F292DC for ; Sun, 9 Sep 2018 08:54:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726653AbeIINnf (ORCPT ); Sun, 9 Sep 2018 09:43:35 -0400 Received: from mail-lj1-f175.google.com ([209.85.208.175]:41958 "EHLO mail-lj1-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726632AbeIINne (ORCPT ); Sun, 9 Sep 2018 09:43:34 -0400 Received: by mail-lj1-f175.google.com with SMTP id y17-v6so15384797ljy.8 for ; Sun, 09 Sep 2018 01:54:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LlcnVYvluW6oU0NzmwKOAMwd2+XpzJ0lygMtZINsPec=; b=qFBTFbSIkz3rTquHeKXmigzQZTZSOo2nIMGcSdlR7tdHKbj6yKJhT2/R5ai+Ssj0HY ob8Tl8jWkenyXb8Ne9FbiYIvQY8enupPLMVovjSaiXINLBj7jawCF2ohsjsZAImsxaeo uwt8ulDfYcs8oTXtEpLydFk4P3HxfXYQh89yFp9cwqa6INZbI7T/EOYhlWyV+NjkhewL Ix47FxZB9prMHrjYkUHePJGitEY/BVpHqdf1K80I1E0f+/0qvbQOE/9X6PbQBe5IdpZk 2jklzl3kDTPwXy/zW8ofzS3jXEU/lNXxBe9b72kZj0h/uqtLJEAL1N1tgNpfliexXBGX 4XYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LlcnVYvluW6oU0NzmwKOAMwd2+XpzJ0lygMtZINsPec=; b=EYKDxgKaQyVGCy7cfaBkgau40MqwDh2f7GcEcTezTkUkYLEm8BroX0r6DK41zuUJxU 841XcDaaB8wawDERRfFX8RWVNcar64QFde/BRI+/nuaIvTFDx+9Z9z1gb8a4Jc+wDVh9 q9po+UlIZcarRMvvGygZE2BbIufEtaNBWtJAn+svGA5QIAJq5UhHHCioaVF6gyqHMLUe tz6oNvkHo7j/yXO1FL6USXyQ2mqpXP7Rjv7CQER5Ew1r0pIdm6rqrdofGgi3/xpyXttf gb+dV7y6ygnmL/m29R3iJHrFl4snSXZRA/MtagRJZ3uKTECAxRDOTrbefLnLigZCip2E wGCg== X-Gm-Message-State: APzg51AyJ+4zY/M/ko/tcEEsMWtxB9IyL4rsEFWebW5k6MbxrHHgGHRb Aj/8Bs0EkhGOv05ZTqzCHkU= X-Google-Smtp-Source: ANB0VdZDgYN6kCzvFiQtzliAc1P6NtmhKyBbhpYUFglOSCJvLm3+B+4mM1MRrRQrQZ07e+5srYY4/Q== X-Received: by 2002:a2e:9c0f:: with SMTP id s15-v6mr9882586lji.97.1536483276073; Sun, 09 Sep 2018 01:54:36 -0700 (PDT) Received: from localhost.localdomain (c80-216-12-205.bredband.comhem.se. [80.216.12.205]) by smtp.gmail.com with ESMTPSA id g16-v6sm2102525lfb.5.2018.09.09.01.54.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Sep 2018 01:54:35 -0700 (PDT) From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: pclouds@gmail.com Cc: git@vger.kernel.org, sbeller@google.com, Junio C Hamano Subject: [PATCH v3 04/23] combine-diff.c: remove implicit dependency on the_index Date: Sun, 9 Sep 2018 10:53:59 +0200 Message-Id: <20180909085418.31531-5-pclouds@gmail.com> X-Mailer: git-send-email 2.19.0.rc0.337.ge906d732e7 In-Reply-To: <20180909085418.31531-1-pclouds@gmail.com> References: <20180903180932.32260-1-pclouds@gmail.com> <20180909085418.31531-1-pclouds@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP --- combine-diff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/combine-diff.c b/combine-diff.c index de7695e728..4fa7707b57 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1054,7 +1054,8 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, if (is_file) { struct strbuf buf = STRBUF_INIT; - if (convert_to_git(&the_index, elem->path, result, len, &buf, global_conv_flags_eol)) { + if (convert_to_git(rev->diffopt.repo->index, + elem->path, result, len, &buf, global_conv_flags_eol)) { free(result); result = strbuf_detach(&buf, &len); result_size = len;