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
This commit is contained in:
9
cache.h
9
cache.h
@ -1254,6 +1254,10 @@ extern int unpack_object_header(struct packed_git *, struct pack_window **, off_
|
||||
*
|
||||
* Any callback that is NULL will be ignored. Callbacks returning non-zero
|
||||
* will end the iteration.
|
||||
*
|
||||
* In the "buf" variant, "path" is a strbuf which will also be used as a
|
||||
* scratch buffer, but restored to its original contents before
|
||||
* the function returns.
|
||||
*/
|
||||
typedef int each_loose_object_fn(const unsigned char *sha1,
|
||||
const char *path,
|
||||
@ -1269,6 +1273,11 @@ int for_each_loose_file_in_objdir(const char *path,
|
||||
each_loose_cruft_fn cruft_cb,
|
||||
each_loose_subdir_fn subdir_cb,
|
||||
void *data);
|
||||
int for_each_loose_file_in_objdir_buf(struct strbuf *path,
|
||||
each_loose_object_fn obj_cb,
|
||||
each_loose_cruft_fn cruft_cb,
|
||||
each_loose_subdir_fn subdir_cb,
|
||||
void *data);
|
||||
|
||||
/*
|
||||
* Iterate over loose and packed objects in both the local
|
||||
|
Reference in New Issue
Block a user