Merge branch 'jk/prune-mtime'
commit7cf6232e2c15a0052c78655d7014645cd20a377c
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Feb 2015 20:28:28 +0000 (22 12:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Feb 2015 20:28:28 +0000 (22 12:28 -0800)
tree01c4cf8a97024da88fae20236cfe2f6cf374dbea
parentdcc883dcbc25276784bb98dce5927d76d2ed5c6c
parentb0a4264277b7968741580093e7ea1e366943d297
Merge branch 'jk/prune-mtime'

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