merge-ort: replace the_hash_algo with opt->repo->hash_algo

We have a perfectly valid repository available and do not need to use
the_hash_algo (a shorthand for the_repository->hash_algo), so use the
known repository instead.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-ort.c b/merge-ort.c
index 9b6a4c312e12c598e95f5143a4fb684919b5beba..60b4675f39d8c5c1a65214fe22a8f489c51da78c 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -1857,7 +1857,7 @@ static int merge_submodule(struct merge_options *opt,
                BUG("submodule deleted on one side; this should be handled outside of merge_submodule()");
 
        if ((sub_not_initialized = repo_submodule_init(&subrepo,
-               opt->repo, path, null_oid(the_hash_algo)))) {
+               opt->repo, path, null_oid(opt->repo->hash_algo)))) {
                path_msg(opt, CONFLICT_SUBMODULE_NOT_INITIALIZED, 0,
                         path, NULL, NULL, NULL,
                         _("Failed to merge submodule %s (not checked out)"),
@@ -2240,7 +2240,7 @@ static int handle_content_merge(struct merge_options *opt,
                two_way = ((S_IFMT & o->mode) != (S_IFMT & a->mode));
 
                merge_status = merge_3way(opt, path,
-                                         two_way ? null_oid(the_hash_algo) : &o->oid,
+                                         two_way ? null_oid(opt->repo->hash_algo) : &o->oid,
                                          &a->oid, &b->oid,
                                          pathnames, extra_marker_size,
                                          &result_buf);
@@ -2272,7 +2272,7 @@ static int handle_content_merge(struct merge_options *opt,
        } else if (S_ISGITLINK(a->mode)) {
                int two_way = ((S_IFMT & o->mode) != (S_IFMT & a->mode));
                clean = merge_submodule(opt, pathnames[0],
-                                       two_way ? null_oid(the_hash_algo) : &o->oid,
+                                       two_way ? null_oid(opt->repo->hash_algo) : &o->oid,
                                        &a->oid, &b->oid, &result->oid);
                if (clean < 0)
                        return -1;
@@ -2786,7 +2786,7 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
                assert(!new_ci->match_mask);
                new_ci->dirmask = 0;
                new_ci->stages[1].mode = 0;
-               oidcpy(&new_ci->stages[1].oid, null_oid(the_hash_algo));
+               oidcpy(&new_ci->stages[1].oid, null_oid(opt->repo->hash_algo));
 
                /*
                 * Now that we have the file information in new_ci, make sure
@@ -2799,7 +2799,7 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
                                continue;
                        /* zero out any entries related to files */
                        ci->stages[i].mode = 0;
-                       oidcpy(&ci->stages[i].oid, null_oid(the_hash_algo));
+                       oidcpy(&ci->stages[i].oid, null_oid(opt->repo->hash_algo));
                }
 
                /* Now we want to focus on new_ci, so reassign ci to it. */
@@ -3214,7 +3214,7 @@ static int process_renames(struct merge_options *opt,
                        if (type_changed) {
                                /* rename vs. typechange */
                                /* Mark the original as resolved by removal */
-                               memcpy(&oldinfo->stages[0].oid, null_oid(the_hash_algo),
+                               memcpy(&oldinfo->stages[0].oid, null_oid(opt->repo->hash_algo),
                                       sizeof(oldinfo->stages[0].oid));
                                oldinfo->stages[0].mode = 0;
                                oldinfo->filemask &= 0x06;
@@ -4102,7 +4102,7 @@ static int process_entry(struct merge_options *opt,
                        if (ci->filemask & (1 << i))
                                continue;
                        ci->stages[i].mode = 0;
-                       oidcpy(&ci->stages[i].oid, null_oid(the_hash_algo));
+                       oidcpy(&ci->stages[i].oid, null_oid(opt->repo->hash_algo));
                }
        } else if (ci->df_conflict && ci->merged.result.mode != 0) {
                /*
@@ -4149,7 +4149,7 @@ static int process_entry(struct merge_options *opt,
                                continue;
                        /* zero out any entries related to directories */
                        new_ci->stages[i].mode = 0;
-                       oidcpy(&new_ci->stages[i].oid, null_oid(the_hash_algo));
+                       oidcpy(&new_ci->stages[i].oid, null_oid(opt->repo->hash_algo));
                }
 
                /*
@@ -4271,11 +4271,11 @@ static int process_entry(struct merge_options *opt,
                        new_ci->merged.result.mode = ci->stages[2].mode;
                        oidcpy(&new_ci->merged.result.oid, &ci->stages[2].oid);
                        new_ci->stages[1].mode = 0;
-                       oidcpy(&new_ci->stages[1].oid, null_oid(the_hash_algo));
+                       oidcpy(&new_ci->stages[1].oid, null_oid(opt->repo->hash_algo));
                        new_ci->filemask = 5;
                        if ((S_IFMT & b_mode) != (S_IFMT & o_mode)) {
                                new_ci->stages[0].mode = 0;
-                               oidcpy(&new_ci->stages[0].oid, null_oid(the_hash_algo));
+                               oidcpy(&new_ci->stages[0].oid, null_oid(opt->repo->hash_algo));
                                new_ci->filemask = 4;
                        }
 
@@ -4283,11 +4283,11 @@ static int process_entry(struct merge_options *opt,
                        ci->merged.result.mode = ci->stages[1].mode;
                        oidcpy(&ci->merged.result.oid, &ci->stages[1].oid);
                        ci->stages[2].mode = 0;
-                       oidcpy(&ci->stages[2].oid, null_oid(the_hash_algo));
+                       oidcpy(&ci->stages[2].oid, null_oid(opt->repo->hash_algo));
                        ci->filemask = 3;
                        if ((S_IFMT & a_mode) != (S_IFMT & o_mode)) {
                                ci->stages[0].mode = 0;
-                               oidcpy(&ci->stages[0].oid, null_oid(the_hash_algo));
+                               oidcpy(&ci->stages[0].oid, null_oid(opt->repo->hash_algo));
                                ci->filemask = 2;
                        }
 
@@ -4415,7 +4415,7 @@ static int process_entry(struct merge_options *opt,
                /* Deleted on both sides */
                ci->merged.is_null = 1;
                ci->merged.result.mode = 0;
-               oidcpy(&ci->merged.result.oid, null_oid(the_hash_algo));
+               oidcpy(&ci->merged.result.oid, null_oid(opt->repo->hash_algo));
                assert(!ci->df_conflict);
                ci->merged.clean = !ci->path_conflict;
        }