Merge branch 'jk/prune-mtime' into maint
commitcbc8d6d8f8e858072faa2f8fd03d0f255fe0c288
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:08 +0000 (5 13:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:08 +0000 (5 13:13 -0800)
tree348aa7a55aa16299c5935e18bbe69acdc5129f10
parentf5a191d3dcbd0deaae9eba2a141e0f086ea0eb20
parentb0a4264277b7968741580093e7ea1e366943d297
Merge branch 'jk/prune-mtime' into maint

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