Merge branch 'jk/prune-mtime' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:08 +0000 (13:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2015 21:13:08 +0000 (13:13 -0800)
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

1  2 
cache.h
sha1_file.c

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