sha1-file.c: remove the_repo from read_object_with_reference()

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 0f092382e175cf7ebe43d2f53ef1c5c79c338568..995d47c85aad24a645786ed6480bd659c755997e 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -172,7 +172,8 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
                         * fall-back to the usual case.
                         */
                }
                         * fall-back to the usual case.
                         */
                }

-               buf = read_object_with_reference(&oid, exp_type, &size, NULL);
+               buf = read_object_with_reference(the_repository,
+                                                &oid, exp_type, &size, NULL);

                break;
 
        default:
                break;
 
        default:

diff --git a/builtin/grep.c b/builtin/grep.c
index 580fd38f41704b6d534c04f2dee1bf85eee67c3c..560051784ef7c222046d51ba8b8bf7f84223a26e 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -458,7 +458,8 @@ static int grep_submodule(struct grep_opt *opt,
                object = parse_object_or_die(oid, oid_to_hex(oid));
 
                grep_read_lock();
                object = parse_object_or_die(oid, oid_to_hex(oid));
 
                grep_read_lock();

-               data = read_object_with_reference(&object->oid, tree_type,
+               data = read_object_with_reference(&subrepo,
+                                                 &object->oid, tree_type,

                                                  &size, NULL);
                grep_read_unlock();
 
                                                  &size, NULL);
                grep_read_unlock();
 


@@ -623,7 +624,8 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
                int hit, len;
 
                grep_read_lock();
                int hit, len;
 
                grep_read_lock();

-               data = read_object_with_reference(&obj->oid, tree_type,
+               data = read_object_with_reference(opt->repo,
+                                                 &obj->oid, tree_type,

                                                  &size, NULL);
                grep_read_unlock();
 
                                                  &size, NULL);
                grep_read_unlock();
 

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index b2be8869c236378ca70517d2c7431a6993952a3c..a030c24a4a3f26c27ddd4ab9aa6c691bd72f33e2 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1428,7 +1428,8 @@ static void add_preferred_base(struct object_id *oid)
        if (window <= num_preferred_base++)
                return;
 
        if (window <= num_preferred_base++)
                return;
 

-       data = read_object_with_reference(oid, tree_type, &size, &tree_oid);
+       data = read_object_with_reference(the_repository, oid,
+                                         tree_type, &size, &tree_oid);

        if (!data)
                return;
 
        if (!data)
                return;
 

diff --git a/cache.h b/cache.h
index bf20337ef435234acf171f76137e683e66fb22d2..cd84cc9bbe1e6c6c3b6df55c9cdd7305af818589 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1500,7 +1500,8 @@ int df_name_compare(const char *name1, int len1, int mode1, const char *name2, i
 int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);
 int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);
 
 int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);
 int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);
 

-void *read_object_with_reference(const struct object_id *oid,
+void *read_object_with_reference(struct repository *r,
+                                const struct object_id *oid,

                                 const char *required_type,
                                 unsigned long *size,
                                 struct object_id *oid_ret);
                                 const char *required_type,
                                 unsigned long *size,
                                 struct object_id *oid_ret);

diff --git a/fast-import.c b/fast-import.c
index 76a7bd369987f7fed63c0f602efe59e0edbd01b8..3970b50acc28283b031bb2e7f3782d21eb6059a7 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -2410,7 +2410,8 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
                oidcpy(&commit_oid, &commit_oe->idx.oid);
        } else if (!get_oid(p, &commit_oid)) {
                unsigned long size;
                oidcpy(&commit_oid, &commit_oe->idx.oid);
        } else if (!get_oid(p, &commit_oid)) {
                unsigned long size;

-               char *buf = read_object_with_reference(&commit_oid,
+               char *buf = read_object_with_reference(the_repository,
+                                                      &commit_oid,

                                                       commit_type, &size,
                                                       &commit_oid);
                if (!buf || size < the_hash_algo->hexsz + 6)
                                                       commit_type, &size,
                                                       &commit_oid);
                if (!buf || size < the_hash_algo->hexsz + 6)


@@ -2482,7 +2483,8 @@ static void parse_from_existing(struct branch *b)
                unsigned long size;
                char *buf;
 
                unsigned long size;
                char *buf;
 

-               buf = read_object_with_reference(&b->oid, commit_type, &size,
+               buf = read_object_with_reference(the_repository,
+                                                &b->oid, commit_type, &size,

                                                 &b->oid);
                parse_from_commit(b, buf, size);
                free(buf);
                                                 &b->oid);
                parse_from_commit(b, buf, size);
                free(buf);


@@ -2560,7 +2562,8 @@ static struct hash_list *parse_merge(unsigned int *count)
                        oidcpy(&n->oid, &oe->idx.oid);
                } else if (!get_oid(from, &n->oid)) {
                        unsigned long size;
                        oidcpy(&n->oid, &oe->idx.oid);
                } else if (!get_oid(from, &n->oid)) {
                        unsigned long size;

-                       char *buf = read_object_with_reference(&n->oid,
+                       char *buf = read_object_with_reference(the_repository,
+                                                              &n->oid,

                                                               commit_type,
                                                               &size, &n->oid);
                        if (!buf || size < the_hash_algo->hexsz + 6)
                                                               commit_type,
                                                               &size, &n->oid);
                        if (!buf || size < the_hash_algo->hexsz + 6)

diff --git a/sha1-file.c b/sha1-file.c
index 888b6024d5de050753765e37b65ea0521d91f9fd..59b2e40cf3e05897ee67d2de56c19c48dc49fcc9 100644 (file)
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -1505,7 +1505,8 @@ void *read_object_file_extended(struct repository *r,
        return NULL;
 }
 
        return NULL;
 }
 

-void *read_object_with_reference(const struct object_id *oid,
+void *read_object_with_reference(struct repository *r,
+                                const struct object_id *oid,

                                 const char *required_type_name,
                                 unsigned long *size,
                                 struct object_id *actual_oid_return)
                                 const char *required_type_name,
                                 unsigned long *size,
                                 struct object_id *actual_oid_return)


@@ -1521,7 +1522,7 @@ void *read_object_with_reference(const struct object_id *oid,
                int ref_length = -1;
                const char *ref_type = NULL;
 
                int ref_length = -1;
                const char *ref_type = NULL;
 

-               buffer = read_object_file(&actual_oid, &type, &isize);
+               buffer = repo_read_object_file(r, &actual_oid, &type, &isize);

                if (!buffer)
                        return NULL;
                if (type == required_type) {
                if (!buffer)
                        return NULL;
                if (type == required_type) {

diff --git a/tree-walk.c b/tree-walk.c
index ec32a47b2e7664365f771f3955747794001d3f28..0c7722b2205107273cd5da5f70a6776c99006078 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -87,7 +87,7 @@ void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid)
        void *buf = NULL;
 
        if (oid) {
        void *buf = NULL;
 
        if (oid) {

-               buf = read_object_with_reference(oid, tree_type, &size, NULL);
+               buf = read_object_with_reference(the_repository, oid, tree_type, &size, NULL);

                if (!buf)
                        die("unable to read tree %s", oid_to_hex(oid));
        }
                if (!buf)
                        die("unable to read tree %s", oid_to_hex(oid));
        }


@@ -542,7 +542,7 @@ int get_tree_entry(const struct object_id *tree_oid, const char *name, struct ob
        unsigned long size;
        struct object_id root;
 
        unsigned long size;
        struct object_id root;
 

-       tree = read_object_with_reference(tree_oid, tree_type, &size, &root);
+       tree = read_object_with_reference(the_repository, tree_oid, tree_type, &size, &root);

        if (!tree)
                return -1;
 
        if (!tree)
                return -1;
 


@@ -609,7 +609,8 @@ enum get_oid_result get_tree_entry_follow_symlinks(struct object_id *tree_oid, c
                        void *tree;
                        struct object_id root;
                        unsigned long size;
                        void *tree;
                        struct object_id root;
                        unsigned long size;

-                       tree = read_object_with_reference(&current_tree_oid,
+                       tree = read_object_with_reference(the_repository,
+                                                         &current_tree_oid,

                                                          tree_type, &size,
                                                          &root);
                        if (!tree)
                                                          tree_type, &size,
                                                          &root);
                        if (!tree)