James Bowes <jbowes@xxxxxxxxxxxxxxxxxx> writes:
> find_short_packed_object was not loading the pack index files.
> Teach it to do so.
>
> Signed-off-by: James Bowes <jbowes@xxxxxxxxxxxxxxxxxx>
I think this is the proper fix of the problem I was unhappy
about with 'next', rather than reverting the lazy index
loading. But I wonder how many _other_ places like this there
are that we might be missing...
Shawn, an Ack, and any ideas for futureproofing?
> sha1_name.c | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/sha1_name.c b/sha1_name.c
> index 8dfceb2..7df01af 100644
> --- a/sha1_name.c
> +++ b/sha1_name.c
> @@ -76,8 +76,11 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne
>
> prepare_packed_git();
> for (p = packed_git; p && found < 2; p = p->next) {
> - uint32_t num = p->num_objects;
> - uint32_t first = 0, last = num;
> + uint32_t num, last;
> + uint32_t first = 0;
> + open_pack_index(p);
> + num = p->num_objects;
> + last = num;
> while (first < last) {
> uint32_t mid = (first + last) / 2;
> const unsigned char *now;
> --
> 1.5.2.869.g6b3ba
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
