[04/11] checkout: avoid the_index when possible

Message ID	20190124082912.24401-5-pclouds@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= <pclouds@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= <pclouds@gmail.com> Subject: [PATCH 04/11] checkout: avoid the_index when possible Date: Thu, 24 Jan 2019 15:29:05 +0700 Message-Id: <20190124082912.24401-5-pclouds@gmail.com> In-Reply-To: <20190124082912.24401-1-pclouds@gmail.com> References: <20190124082912.24401-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	nd/the-index-final small update \| expand [00/11] nd/the-index-final small update [01/11] grep: use grep_opt->repo instead of explict repo argument [02/11] notes-utils.c: remove the_repository references [03/11] repository.c: replace hold_locked_index() with repo_hold_locked_index() [04/11] checkout: avoid the_index when possible [05/11] read-cache.c: kill read_index() [06/11] read-cache.c: replace update_index_if_able with repo_& [07/11] sha1-name.c: remove implicit dependency on the_index [08/11] merge-recursive.c: remove implicit dependency on the_index [09/11] merge-recursive.c: remove implicit dependency on the_repository [10/11] read-cache.c: remove the_* from index_has_changes() [11/11] cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch

Message ID

20190124082912.24401-5-pclouds@gmail.com (mailing list archive)

State

New, archived

Headers

From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?=  <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?=
	=?utf-8?b?4buNYyBEdXk=?=  <pclouds@gmail.com>
Subject: [PATCH 04/11] checkout: avoid the_index when possible
Date: Thu, 24 Jan 2019 15:29:05 +0700
Message-Id: <20190124082912.24401-5-pclouds@gmail.com>
In-Reply-To: <20190124082912.24401-1-pclouds@gmail.com>
References: <20190124082912.24401-1-pclouds@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

nd/the-index-final small update | expand

Commit Message

Duy Nguyen Jan. 24, 2019, 8:29 a.m. UTC

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/checkout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 08b0ac48f3..1b672a9fd9 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -284,7 +284,7 @@  static int checkout_paths(const struct checkout_opts *opts,
 		return run_add_interactive(revision, "--patch=checkout",
 					   &opts->pathspec);
 
-	hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
+	repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR);
 	if (read_cache_preload(&opts->pathspec) < 0)
 		return error(_("index file corrupt"));

[04/11] checkout: avoid the_index when possible

Commit Message

Patch