From 8930fefb7efc0a13aef728f9aa7778166e16eceb Mon Sep 17 00:00:00 2001 From: Takuto Ikuta Date: Sun, 21 Jan 2018 23:05:05 +0900 Subject: [PATCH] Revert "reset.c: enable fscache" This reverts commit fcba80a2696c48fba77dd2ab3810092476e36fc2. Usinsg fscache for reset broke git worktree, git stash. Signed-off-by: Takuto Ikuta --- builtin/reset.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/builtin/reset.c b/builtin/reset.c index 82ef326246d796..627c76a23c4c74 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -52,7 +52,6 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet) struct tree *tree; struct unpack_trees_options opts; int ret = -1; - int unpack_result; memset(&opts, 0, sizeof(opts)); opts.head_idx = 1; @@ -92,11 +91,7 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet) } nr++; - enable_fscache(1); - unpack_result = unpack_trees(nr, desc, &opts); - enable_fscache(0); - - if (unpack_result) + if (unpack_trees(nr, desc, &opts)) goto out; if (reset_type == MIXED || reset_type == HARD) {