Switch empty tree and blob lookups to use hash abstraction

Switch the uses of empty_tree_oid and empty_blob_oid to use the
current_hash abstraction that represents the current hash algorithm in
use.

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

diff --git a/builtin/am.c b/builtin/am.c
index 92c48535052c2e32e46eeedfc86b009e7ae0726c..99dbde3e856a9533f2c2b316947fd8c631698efd 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1433,7 +1433,7 @@ static void write_index_patch(const struct am_state *state)
        if (!get_oid_tree("HEAD", &head))
                tree = lookup_tree(&head);
        else
        if (!get_oid_tree("HEAD", &head))
                tree = lookup_tree(&head);
        else

-               tree = lookup_tree(&empty_tree_oid);
+               tree = lookup_tree(the_hash_algo->empty_tree);

 
        fp = xfopen(am_path(state, "patch"), "w");
        init_revisions(&rev_info, NULL);
 
        fp = xfopen(am_path(state, "patch"), "w");
        init_revisions(&rev_info, NULL);

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 6c2b4cd419a4a588e73a3f12a9ebdd6c1365ce78..2b64805f353044539abc92c6b9320433bfdab2e9 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -514,7 +514,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
                }
                tree = parse_tree_indirect(old->commit ?
                                           &old->commit->object.oid :
                }
                tree = parse_tree_indirect(old->commit ?
                                           &old->commit->object.oid :

-                                          &empty_tree_oid);
+                                          the_hash_algo->empty_tree);

                init_tree_desc(&trees[0], tree->buffer, tree->size);
                tree = parse_tree_indirect(&new->commit->object.oid);
                init_tree_desc(&trees[1], tree->buffer, tree->size);
                init_tree_desc(&trees[0], tree->buffer, tree->size);
                tree = parse_tree_indirect(&new->commit->object.oid);
                init_tree_desc(&trees[1], tree->buffer, tree->size);

diff --git a/builtin/diff.c b/builtin/diff.c
index 9808d062a80a2ff07699fb0ea4cbd29f560630d3..16bfb22f7381ee8e6967ab836686c5def7cff892 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -379,7 +379,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                                add_head_to_pending(&rev);
                                if (!rev.pending.nr) {
                                        struct tree *tree;
                                add_head_to_pending(&rev);
                                if (!rev.pending.nr) {
                                        struct tree *tree;

-                                       tree = lookup_tree(&empty_tree_oid);
+                                       tree = lookup_tree(the_hash_algo->empty_tree);

                                        add_pending_object(&rev, &tree->object, "HEAD");
                                }
                                break;
                                        add_pending_object(&rev, &tree->object, "HEAD");
                                }
                                break;

diff --git a/builtin/pull.c b/builtin/pull.c
index a28f0ffadd13dfc207785b61425b35964cb43365..3d26f8ff32723f1e60450ecae493204dda9cbb6b 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -545,7 +545,7 @@ static int pull_into_void(const struct object_id *merge_head,
         * index/worktree changes that the user already made on the unborn
         * branch.
         */
         * index/worktree changes that the user already made on the unborn
         * branch.
         */

-       if (checkout_fast_forward(&empty_tree_oid, merge_head, 0))
+       if (checkout_fast_forward(the_hash_algo->empty_tree, merge_head, 0))

                return 1;
 
        if (update_ref("initial pull", "HEAD", merge_head, curr_head, 0, UPDATE_REFS_DIE_ON_ERR))
                return 1;
 
        if (update_ref("initial pull", "HEAD", merge_head, curr_head, 0, UPDATE_REFS_DIE_ON_ERR))

diff --git a/cache.h b/cache.h
index c238688f6c4056213554394c0c4469d23ebcba67..d68895b45fbeb95df893bf7c95efe639097ee0fc 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1024,22 +1024,22 @@ extern const struct object_id empty_blob_oid;
 
 static inline int is_empty_blob_sha1(const unsigned char *sha1)
 {
 
 static inline int is_empty_blob_sha1(const unsigned char *sha1)
 {

-       return !hashcmp(sha1, EMPTY_BLOB_SHA1_BIN);
+       return !hashcmp(sha1, the_hash_algo->empty_blob->hash);

 }
 
 static inline int is_empty_blob_oid(const struct object_id *oid)
 {
 }
 
 static inline int is_empty_blob_oid(const struct object_id *oid)
 {

-       return !hashcmp(oid->hash, EMPTY_BLOB_SHA1_BIN);
+       return !oidcmp(oid, the_hash_algo->empty_blob);

 }
 
 static inline int is_empty_tree_sha1(const unsigned char *sha1)
 {
 }
 
 static inline int is_empty_tree_sha1(const unsigned char *sha1)
 {

-       return !hashcmp(sha1, EMPTY_TREE_SHA1_BIN);
+       return !hashcmp(sha1, the_hash_algo->empty_tree->hash);

 }
 
 static inline int is_empty_tree_oid(const struct object_id *oid)
 {
 }
 
 static inline int is_empty_tree_oid(const struct object_id *oid)
 {

-       return !hashcmp(oid->hash, EMPTY_TREE_SHA1_BIN);
+       return !oidcmp(oid, the_hash_algo->empty_tree);

 }
 
 /* set default permissions by passing mode arguments to open(2) */
 }
 
 /* set default permissions by passing mode arguments to open(2) */

diff --git a/diff-lib.c b/diff-lib.c
index 731f0886d6e4146ca526f222381de50406957b30..893fee432cccef4ec82cb9ea3303709a48a8bb76 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -217,7 +217,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
                        } else if (revs->diffopt.ita_invisible_in_index &&
                                   ce_intent_to_add(ce)) {
                                diff_addremove(&revs->diffopt, '+', ce->ce_mode,
                        } else if (revs->diffopt.ita_invisible_in_index &&
                                   ce_intent_to_add(ce)) {
                                diff_addremove(&revs->diffopt, '+', ce->ce_mode,

-                                              &empty_tree_oid, 0,
+                                              the_hash_algo->empty_tree, 0,

                                               ce->name, 0);
                                continue;
                        }
                                               ce->name, 0);
                                continue;
                        }

diff --git a/merge-recursive.c b/merge-recursive.c
index 2ca8444c65836578e97f33761f0c7dda696c1f10..f89cc751e1fefd6e363fc4a52cd7d0957d985d47 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2081,7 +2081,7 @@ int merge_recursive(struct merge_options *o,
                /* if there is no common ancestor, use an empty tree */
                struct tree *tree;
 
                /* if there is no common ancestor, use an empty tree */
                struct tree *tree;
 

-               tree = lookup_tree(&empty_tree_oid);
+               tree = lookup_tree(the_hash_algo->empty_tree);

                merged_common_ancestors = make_virtual_commit(tree, "ancestor");
        }
 
                merged_common_ancestors = make_virtual_commit(tree, "ancestor");
        }
 

diff --git a/notes-merge.c b/notes-merge.c
index 4a83b0ebd5ce8b24da0b32820f5666571b099ecf..0f6573cb17cbbbc2219453bdca424fd7ebc156dc 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -595,7 +595,7 @@ int notes_merge(struct notes_merge_options *o,
        bases = get_merge_bases(local, remote);
        if (!bases) {
                base_oid = &null_oid;
        bases = get_merge_bases(local, remote);
        if (!bases) {
                base_oid = &null_oid;

-               base_tree_oid = &empty_tree_oid;
+               base_tree_oid = the_hash_algo->empty_tree;

                if (o->verbosity >= 4)
                        printf("No merge base found; doing history-less merge\n");
        } else if (!bases->next) {
                if (o->verbosity >= 4)
                        printf("No merge base found; doing history-less merge\n");
        } else if (!bases->next) {

diff --git a/sequencer.c b/sequencer.c
index 6d027b06c8d8dc69b14d05752637a65aa121ab24..2c191aeb36bb8222cd39b4749dcc5d062176a99b 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -347,7 +347,7 @@ static int read_oneliner(struct strbuf *buf,
 
 static struct tree *empty_tree(void)
 {
 
 static struct tree *empty_tree(void)
 {

-       return lookup_tree(&empty_tree_oid);
+       return lookup_tree(the_hash_algo->empty_tree);

 }
 
 static int error_dirty_index(struct replay_opts *opts)
 }
 
 static int error_dirty_index(struct replay_opts *opts)


@@ -705,7 +705,7 @@ static int is_original_commit_empty(struct commit *commit)
                                oid_to_hex(&parent->object.oid));
                ptree_oid = &parent->tree->object.oid;
        } else {
                                oid_to_hex(&parent->object.oid));
                ptree_oid = &parent->tree->object.oid;
        } else {

-               ptree_oid = &empty_tree_oid; /* commit is root */
+               ptree_oid = the_hash_algo->empty_tree; /* commit is root */

        }
 
        return !oidcmp(ptree_oid, &commit->tree->object.oid);
        }
 
        return !oidcmp(ptree_oid, &commit->tree->object.oid);


@@ -958,7 +958,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
        } else {
                unborn = get_oid("HEAD", &head);
                if (unborn)
        } else {
                unborn = get_oid("HEAD", &head);
                if (unborn)

-                       oidcpy(&head, &empty_tree_oid);
+                       oidcpy(&head, the_hash_algo->empty_tree);

                if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD",
                                       NULL, 0))
                        return error_dirty_index(opts);
                if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD",
                                       NULL, 0))
                        return error_dirty_index(opts);

diff --git a/submodule.c b/submodule.c
index 3ee4a0caa7e2db70ec1ba61a2fe152b989e9a186..ec269a6fc0dbe2621ddf56037a50fee323b0da14 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -587,7 +587,7 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
                struct object_id *one, struct object_id *two,
                unsigned dirty_submodule)
 {
                struct object_id *one, struct object_id *two,
                unsigned dirty_submodule)
 {

-       const struct object_id *old = &empty_tree_oid, *new = &empty_tree_oid;
+       const struct object_id *old = the_hash_algo->empty_tree, *new = the_hash_algo->empty_tree;

        struct commit *left = NULL, *right = NULL;
        struct commit_list *merge_bases = NULL;
        struct child_process cp = CHILD_PROCESS_INIT;
        struct commit *left = NULL, *right = NULL;
        struct commit_list *merge_bases = NULL;
        struct child_process cp = CHILD_PROCESS_INIT;