mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsmonitor: skip lstat deletion check during git diff-index

Browse Source 
Teach git to honor fsmonitor rather than issuing an lstat
when checking for dirty local deletes. Eliminates O(files)
lstats during `git diff HEAD`

Signed-off-by: Nipunn Koorapati <nipunn@dropbox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nipunn Koorapati 2021-03-17 21:22:21 +00:00 committed by Junio C Hamano
parent a5828ae6b5
commit 4f3d6d0261
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diff-lib.c
View File

@ -30,7 +30,7 @@
*/ */
static int check_removed(const struct cache_entry *ce, struct stat *st) static int check_removed(const struct cache_entry *ce, struct stat *st)
{ {
if (lstat(ce->name, st) < 0) { if (!(ce->ce_flags & CE_FSMONITOR_VALID) && lstat(ce->name, st) < 0) {
if (!is_missing_file_error(errno)) if (!is_missing_file_error(errno))
return -1; return -1;
return 1; return 1;
@ -574,6 +574,7 @@ int run_diff_index(struct rev_info *revs, unsigned int option)
struct object_id oid; struct object_id oid;
const char *name; const char *name;
char merge_base_hex[GIT_MAX_HEXSZ + 1]; char merge_base_hex[GIT_MAX_HEXSZ + 1];
struct index_state *istate = revs->diffopt.repo->index;
if (revs->pending.nr != 1) if (revs->pending.nr != 1)
BUG("run_diff_index must be passed exactly one tree"); BUG("run_diff_index must be passed exactly one tree");
@ -581,6 +582,8 @@ int run_diff_index(struct rev_info *revs, unsigned int option)
trace_performance_enter(); trace_performance_enter();
ent = revs->pending.objects; ent = revs->pending.objects;
refresh_fsmonitor(istate);
if (merge_base) { if (merge_base) {
diff_get_merge_base(revs, &oid); diff_get_merge_base(revs, &oid);
name = oid_to_hex_r(merge_base_hex, &oid); name = oid_to_hex_r(merge_base_hex, &oid);