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>
Nguyễn Thái Ngọc Duy committed
Jun 27, 2019 at 16:28 UTC
d3b4705ab81c01cb57dd356d96e981de78d65a5d
7 files changed
+23
-13
builtin/cat-file.c
+2
-1
@@ -172,7 +172,8 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
172
* fall-back to the usual case.
173
*/
174
}
175
- buf = read_object_with_reference(&oid, exp_type, &size, NULL);
175
+ buf = read_object_with_reference(the_repository,
176
+ &oid, exp_type, &size, NULL);
177
break;
178
179
default:
builtin/grep.c
+4
-2
@@ -458,7 +458,8 @@ static int grep_submodule(struct grep_opt *opt,
458
object = parse_object_or_die(oid, oid_to_hex(oid));
459
460
grep_read_lock();
461
- data = read_object_with_reference(&object->oid, tree_type,
461
+ data = read_object_with_reference(&subrepo,
462
+ &object->oid, tree_type,
463
&size, NULL);
464
grep_read_unlock();
465
@@ -623,7 +624,8 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
624
int hit, len;
625
626
grep_read_lock();
626
- data = read_object_with_reference(&obj->oid, tree_type,
627
+ data = read_object_with_reference(opt->repo,
628
+ &obj->oid, tree_type,
629
&size, NULL);
630
grep_read_unlock();
631
builtin/pack-objects.c
+2
-1
@@ -1428,7 +1428,8 @@ static void add_preferred_base(struct object_id *oid)
1428
if (window <= num_preferred_base++)
1429
return;
1430
1431
- data = read_object_with_reference(oid, tree_type, &size, &tree_oid);
1431
+ data = read_object_with_reference(the_repository, oid,
1432
+ tree_type, &size, &tree_oid);
1433
if (!data)
1434
return;
1435
cache.h
+2
-1
@@ -1500,7 +1500,8 @@ int df_name_compare(const char *name1, int len1, int mode1, const char *name2, i
1500
int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);
1501
int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);
1502
1503
-void *read_object_with_reference(const struct object_id *oid,
1503
+void *read_object_with_reference(struct repository *r,
1504
+ const struct object_id *oid,
1505
const char *required_type,
1506
unsigned long *size,
1507
struct object_id *oid_ret);
fast-import.c
+6
-3
@@ -2410,7 +2410,8 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
2410
oidcpy(&commit_oid, &commit_oe->idx.oid);
2411
} else if (!get_oid(p, &commit_oid)) {
2412
unsigned long size;
2413
- char *buf = read_object_with_reference(&commit_oid,
2413
+ char *buf = read_object_with_reference(the_repository,
2414
+ &commit_oid,
2415
commit_type, &size,
2416
&commit_oid);
2417
if (!buf || size < the_hash_algo->hexsz + 6)
@@ -2482,7 +2483,8 @@ static void parse_from_existing(struct branch *b)
2483
unsigned long size;
2484
char *buf;
2485
2485
- buf = read_object_with_reference(&b->oid, commit_type, &size,
2486
+ buf = read_object_with_reference(the_repository,
2487
+ &b->oid, commit_type, &size,
2488
&b->oid);
2489
parse_from_commit(b, buf, size);
2490
free(buf);
@@ -2560,7 +2562,8 @@ static struct hash_list *parse_merge(unsigned int *count)
2562
oidcpy(&n->oid, &oe->idx.oid);
2563
} else if (!get_oid(from, &n->oid)) {
2564
unsigned long size;
2563
- char *buf = read_object_with_reference(&n->oid,
2565
+ char *buf = read_object_with_reference(the_repository,
2566
+ &n->oid,
2567
commit_type,
2568
&size, &n->oid);
2569
if (!buf || size < the_hash_algo->hexsz + 6)
sha1-file.c
+3
-2
@@ -1505,7 +1505,8 @@ void *read_object_file_extended(struct repository *r,
1505
return NULL;
1506
}
1507
1508
-void *read_object_with_reference(const struct object_id *oid,
1508
+void *read_object_with_reference(struct repository *r,
1509
+ const struct object_id *oid,
1510
const char *required_type_name,
1511
unsigned long *size,
1512
struct object_id *actual_oid_return)
@@ -1521,7 +1522,7 @@ void *read_object_with_reference(const struct object_id *oid,
1522
int ref_length = -1;
1523
const char *ref_type = NULL;
1524
1524
- buffer = read_object_file(&actual_oid, &type, &isize);
1525
+ buffer = repo_read_object_file(r, &actual_oid, &type, &isize);
1526
if (!buffer)
1527
return NULL;
1528
if (type == required_type) {
tree-walk.c
+4
-3
@@ -87,7 +87,7 @@ void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid)
87
void *buf = NULL;
88
89
if (oid) {
90
- buf = read_object_with_reference(oid, tree_type, &size, NULL);
90
+ buf = read_object_with_reference(the_repository, oid, tree_type, &size, NULL);
91
if (!buf)
92
die("unable to read tree %s", oid_to_hex(oid));
93
}
@@ -542,7 +542,7 @@ int get_tree_entry(const struct object_id *tree_oid, const char *name, struct ob
542
unsigned long size;
543
struct object_id root;
544
545
- tree = read_object_with_reference(tree_oid, tree_type, &size, &root);
545
+ tree = read_object_with_reference(the_repository, tree_oid, tree_type, &size, &root);
546
if (!tree)
547
return -1;
548
@@ -609,7 +609,8 @@ enum get_oid_result get_tree_entry_follow_symlinks(struct object_id *tree_oid, c
609
void *tree;
610
struct object_id root;
611
unsigned long size;
612
- tree = read_object_with_reference(¤t_tree_oid,
612
+ tree = read_object_with_reference(the_repository,
613
+ ¤t_tree_oid,
614
tree_type, &size,
615
&root);
616
if (!tree)