global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-23 00:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1427 from atetubou/reset_fscache

Browse Source 
reset.c: enable fscache
This commit is contained in:
Johannes Schindelin
2018-01-17 19:43:01 +01:00
committed by GitHub
parent d0192a7c4e ce7699f6ef
commit 4584fb7323
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/reset.c
View File

@@ -52,6 +52,7 @@ 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;
@@ -91,7 +92,11 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet)
}
nr++;
if (unpack_trees(nr, desc, &opts))
enable_fscache(1);
unpack_result = unpack_trees(nr, desc, &opts);
enable_fscache(0);
if (unpack_result)
goto out;
if (reset_type == MIXED || reset_type == HARD) {