Merge branch 'jk/prune-mtime' into next
commit3d46eaeb961252a678c407fe1c59be531cb960af
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Feb 2015 23:10:06 +0000 (16 15:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Feb 2015 23:10:07 +0000 (16 15:10 -0800)
treefa5e4ee290cfd09adf31f62d0fac2ea9e40f3ae3
parente6082399b7eec388603be49aa2ea6e1b312930f4
parentb0a4264277b7968741580093e7ea1e366943d297
Merge branch 'jk/prune-mtime' into next

In v2.2.0, we broke "git prune" that runs in a repository that
borrows from an alternate object store.

* jk/prune-mtime:
  sha1_file: fix iterating loose alternate objects
  for_each_loose_file_in_objdir: take an optional strbuf path
cache.h
sha1_file.c