summaryrefslogtreecommitdiff
path: root/reachable.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-13 14:05:50 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-13 14:05:50 -0700
commitebb464f0cba9efcb5552fad02f452f09f68fc9b2 (patch)
tree0e92a74cf718ef8fd1e0ac54d2e4669088d4200b /reachable.c
parenta60abe10f2d54c668966f804bb400d21d08008a3 (diff)
parentee1c6c34ac64c1e10b17a50710ea7002b7e7241f (diff)
downloadgit-ebb464f0cba9efcb5552fad02f452f09f68fc9b2.tar.gz
Merge branch 'jk/prune-mtime' into maint
Access to objects in repositories that borrow from another one on a slow NFS server unnecessarily got more expensive due to recent code becoming more cautious in a naive way not to lose objects to pruning. * jk/prune-mtime: sha1_file: only freshen packs once per run sha1_file: freshen pack objects before loose reachable: only mark local objects as recent
Diffstat (limited to 'reachable.c')
-rw-r--r--reachable.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/reachable.c b/reachable.c
index a647267ae9..69fa6851da 100644
--- a/reachable.c
+++ b/reachable.c
@@ -142,10 +142,12 @@ int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
data.revs = revs;
data.timestamp = timestamp;
- r = for_each_loose_object(add_recent_loose, &data);
+ r = for_each_loose_object(add_recent_loose, &data,
+ FOR_EACH_OBJECT_LOCAL_ONLY);
if (r)
return r;
- return for_each_packed_object(add_recent_packed, &data);
+ return for_each_packed_object(add_recent_packed, &data,
+ FOR_EACH_OBJECT_LOCAL_ONLY);
}
void mark_reachable_objects(struct rev_info *revs, int mark_reflog,