In our 'oneway_merge()' we always do an 'lstat()' to see if we might
need to mark the entry for updating.
But we really shouldn't need to do that when the cache entry is already
marked as being ce_uptodate(), and this makes us do unnecessary lstat()
calls if we have index preloading enabled.
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
---
As Junio noticed, I meant "ce_uptodate()", not "ce_valid()", but this is
basically the simplified version that replaces the one that cared about
CE_VALID.
On Tue, 14 Jul 2009, Linus Torvalds wrote:
>
> And in that case, I guess it's also fine. In fact, for that case CE_VALID
> would tend to really mean "always assume CE_UPTODATE", so then the patch I
> sent out doesn't really necessarily need the whole "known_uptodate()"
> thing, and could just use
>
> if (o->reset && !ce_valid(old)) {
>
> instead.
>
> Which also makes my other worries go away.
>
> Linus
>
unpack-trees.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index f9d12aa..48d862d 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1004,7 +1004,7 @@ int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
if (old && same(old, a)) {
int update = 0;
- if (o->reset) {
+ if (o->reset && !ce_uptodate(old)) {
struct stat st;
if (lstat(old->name, &st) ||
ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID))
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html