object-file-convert: always make sure object ID algo is valid

In some cases, we zero-initialize our object IDs, which sets the algo
member to zero as well, which is not a valid algorithm number.  This is
a bad practice, but we typically paper over it in many cases by simply
substituting the repository's hash algorithm.

However, our new Rust loose object map code doesn't handle this
gracefully and can't find object IDs when the algorithm is zero because
they don't compare equal to those with the correct algo field.  In
addition, the comparison code doesn't have any knowledge of what the
main algorithm is because that's global state, so we can't adjust the
comparison.

To make our code function properly and to avoid propagating these bad
entries, if we get a source object ID with a zero algo, just make a copy
of it with the fixed algorithm.  This has the benefit of also fixing the
object IDs if we're in a single algorithm mode as well.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/object-file-convert.c b/object-file-convert.c
index e44c8210840c58aad048edd8f3d1a70fbfa20aba..f8dce9481127d729b80f30fd2d7b007ef7b0640d 100644 (file)
--- a/object-file-convert.c
+++ b/object-file-convert.c
@@ -13,7 +13,7 @@
 #include "gpg-interface.h"
 #include "object-file-convert.h"
 
-int repo_oid_to_algop(struct repository *repo, const struct object_id *src,
+int repo_oid_to_algop(struct repository *repo, const struct object_id *srcoid,
                      const struct git_hash_algo *to, struct object_id *dest)
 {
        /*
@@ -21,7 +21,15 @@ int repo_oid_to_algop(struct repository *repo, const struct object_id *src,
         * default hash algorithm for that object.
         */
        const struct git_hash_algo *from =
-               src->algo ? &hash_algos[src->algo] : repo->hash_algo;
+               srcoid->algo ? &hash_algos[srcoid->algo] : repo->hash_algo;
+       struct object_id temp;
+       const struct object_id *src = srcoid;
+
+       if (!srcoid->algo) {
+               oidcpy(&temp, srcoid);
+               temp.algo = hash_algo_by_ptr(repo->hash_algo);
+               src = &temp;
+       }
 
        if (from == to || !to) {
                if (src != dest)