]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/prune-mtime'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:37 +0000 (21:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:37 +0000 (21:00 -0700)
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

1  2 
cache.h
sha1_file.c

diff --cc cache.h
Simple merge
diff --cc sha1_file.c
Simple merge