# [PATCH] Break down no-lstat() condition checks in verify_uptodate() 2 messages from 2011-07-30 to 2011-07-30. Participants: Nguyễn Thái Ngọc Duy, Clemens Buchacher. Thread: https://gitlist.dev/t/27960 ## Nguyễn Thái Ngọc Duy, 2011-07-30 03:55 Subject: [PATCH] Break down no-lstat() condition checks in verify_uptodate() Message-ID: <1311998105-6267-1-git-send-email-pclouds@gmail.com> URL: https://gitlist.dev/e/1311998105-6267-1-git-send-email-pclouds%40gmail.com ``` Make it easier to grok under what conditions we can skip lstat(). While at there, shorten ie_match_stat() line for the sake of my eyes. Signed-off-by: Nguyễn Thái Ngọc Duy --- unpack-trees.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 3a61d82..d8c7eb9 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1168,11 +1168,22 @@ static int verify_uptodate_1(struct cache_entry *ce, { struct stat st; - if (o->index_only || (!((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) && (o->reset || ce_uptodate(ce)))) + if (o->index_only) + return 0; + + /* + * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again + * if this entry is truely uptodate because this file may be + * overwritten. + */ + if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) + ; /* keep checking */ + else if (o->reset || ce_uptodate(ce)) return 0; if (!lstat(ce->name, &st)) { - unsigned changed = ie_match_stat(o->src_index, ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE); + int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE; + unsigned changed = ie_match_stat(o->src_index, ce, &st, flags); if (!changed) return 0; /* -- 1.7.4.74.g639db ``` ## Clemens Buchacher, 2011-07-30 16:22 Subject: Re: [PATCH] Break down no-lstat() condition checks in verify_uptodate() Message-ID: <20110730162258.GC7545@toss.lan> URL: https://gitlist.dev/e/20110730162258.GC7545%40toss.lan In-Reply-To: <1311998105-6267-1-git-send-email-pclouds@gmail.com> ``` On Sat, Jul 30, 2011 at 10:55:05AM +0700, Nguyễn Thái Ngọc Duy wrote: > > + /* > + * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again > + * if this entry is truely uptodate because this file may be > + * overwritten. > + */ s/truely/truly > + if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) > + ; /* keep checking */ > + else if (o->reset || ce_uptodate(ce)) > return 0; Nice! Acked-by: Clemens Buchacher ```