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
This commit is contained in:
Junio C Hamano 2015-03-05 13:13:08 -08:00
commit cbc8d6d8f8
3 changed files with 48 additions and 13 deletions

View File

@ -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 * Any callback that is NULL will be ignored. Callbacks returning non-zero
* will end the iteration. * 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, typedef int each_loose_object_fn(const unsigned char *sha1,
const char *path, 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_cruft_fn cruft_cb,
each_loose_subdir_fn subdir_cb, each_loose_subdir_fn subdir_cb,
void *data); 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 * Iterate over loose and packed objects in both the local

View File

@ -3359,31 +3359,42 @@ static int for_each_file_in_obj_subdir(int subdir_nr,
return r; return r;
} }
int for_each_loose_file_in_objdir(const char *path, int for_each_loose_file_in_objdir_buf(struct strbuf *path,
each_loose_object_fn obj_cb, each_loose_object_fn obj_cb,
each_loose_cruft_fn cruft_cb, each_loose_cruft_fn cruft_cb,
each_loose_subdir_fn subdir_cb, each_loose_subdir_fn subdir_cb,
void *data) void *data)
{ {
struct strbuf buf = STRBUF_INIT; size_t baselen = path->len;
size_t baselen;
int r = 0; int r = 0;
int i; int i;
strbuf_addstr(&buf, path);
strbuf_addch(&buf, '/');
baselen = buf.len;
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
strbuf_addf(&buf, "%02x", i); strbuf_addf(path, "/%02x", i);
r = for_each_file_in_obj_subdir(i, &buf, obj_cb, cruft_cb, r = for_each_file_in_obj_subdir(i, path, obj_cb, cruft_cb,
subdir_cb, data); subdir_cb, data);
strbuf_setlen(&buf, baselen); strbuf_setlen(path, baselen);
if (r) if (r)
break; break;
} }
return r;
}
int for_each_loose_file_in_objdir(const char *path,
each_loose_object_fn obj_cb,
each_loose_cruft_fn cruft_cb,
each_loose_subdir_fn subdir_cb,
void *data)
{
struct strbuf buf = STRBUF_INIT;
int r;
strbuf_addstr(&buf, path);
r = for_each_loose_file_in_objdir_buf(&buf, obj_cb, cruft_cb,
subdir_cb, data);
strbuf_release(&buf); strbuf_release(&buf);
return r; return r;
} }
@ -3396,9 +3407,16 @@ static int loose_from_alt_odb(struct alternate_object_database *alt,
void *vdata) void *vdata)
{ {
struct loose_alt_odb_data *data = vdata; struct loose_alt_odb_data *data = vdata;
return for_each_loose_file_in_objdir(alt->base, struct strbuf buf = STRBUF_INIT;
data->cb, NULL, NULL, int r;
data->data);
/* copy base not including trailing '/' */
strbuf_add(&buf, alt->base, alt->name - alt->base - 1);
r = for_each_loose_file_in_objdir_buf(&buf,
data->cb, NULL, NULL,
data->data);
strbuf_release(&buf);
return r;
} }
int for_each_loose_object(each_loose_object_fn cb, void *data) int for_each_loose_object(each_loose_object_fn cb, void *data)

View File

@ -253,4 +253,12 @@ test_expect_success 'prune .git/shallow' '
test_path_is_missing .git/shallow test_path_is_missing .git/shallow
' '
test_expect_success 'prune: handle alternate object database' '
test_create_repo A &&
git -C A commit --allow-empty -m "initial commit" &&
git clone --shared A B &&
git -C B commit --allow-empty -m "next commit" &&
git -C B prune
'
test_done test_done