Skip to content

Commit 50ddb08

Browse files
pcloudsgitster
pclouds
authored and
gitster
committed
tree-walk.c: remove the_repo from get_tree_entry()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 5e57580 commit 50ddb08

File tree

11 files changed

+38
-26
lines changed

11 files changed

+38
-26
lines changed

‎archive.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,9 @@ static void parse_treeish_arg(const char **argv,
418418
unsigned short mode;
419419
int err;
420420

421-
err = get_tree_entry(&tree->object.oid, prefix, &tree_oid,
421+
err = get_tree_entry(ar_args->repo,
422+
&tree->object.oid,
423+
prefix, &tree_oid,
422424
&mode);
423425
if (err || !S_ISDIR(mode))
424426
die(_("current working directory is untracked"));

‎blame.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ static void verify_working_tree_path(struct repository *r,
101101
struct object_id blob_oid;
102102
unsigned short mode;
103103

104-
if (!get_tree_entry(commit_oid, path, &blob_oid, &mode) &&
104+
if (!get_tree_entry(r, commit_oid, path, &blob_oid, &mode) &&
105105
oid_object_info(r, &blob_oid, NULL) == OBJ_BLOB)
106106
return;
107107
}
@@ -532,7 +532,7 @@ static int fill_blob_sha1_and_mode(struct repository *r,
532532
{
533533
if (!is_null_oid(&origin->blob_oid))
534534
return 0;
535-
if (get_tree_entry(&origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
535+
if (get_tree_entry(r, &origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
536536
goto error_out;
537537
if (oid_object_info(r, &origin->blob_oid, NULL) != OBJ_BLOB)
538538
goto error_out;

‎builtin/rm.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static int check_local_mod(struct object_id *head, int index_only)
179179
* way as changed from the HEAD.
180180
*/
181181
if (no_head
182-
|| get_tree_entry(head, name, &oid, &mode)
182+
|| get_tree_entry(the_repository, head, name, &oid, &mode)
183183
|| ce->ce_mode != create_ce_mode(mode)
184184
|| !oideq(&ce->oid, &oid))
185185
staged_changes = 1;

‎builtin/update-index.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ static struct cache_entry *read_one_ent(const char *which,
601601
struct object_id oid;
602602
struct cache_entry *ce;
603603

604-
if (get_tree_entry(ent, path, &oid, &mode)) {
604+
if (get_tree_entry(the_repository, ent, path, &oid, &mode)) {
605605
if (which)
606606
error("%s: not in %s branch.", path, which);
607607
return NULL;

‎line-log.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,12 +496,13 @@ static struct commit *check_single_commit(struct rev_info *revs)
496496
return (struct commit *) commit;
497497
}
498498

499-
static void fill_blob_sha1(struct commit *commit, struct diff_filespec *spec)
499+
static void fill_blob_sha1(struct repository *r, struct commit *commit,
500+
struct diff_filespec *spec)
500501
{
501502
unsigned short mode;
502503
struct object_id oid;
503504

504-
if (get_tree_entry(&commit->object.oid, spec->path, &oid, &mode))
505+
if (get_tree_entry(r, &commit->object.oid, spec->path, &oid, &mode))
505506
die("There is no path %s in the commit", spec->path);
506507
fill_filespec(spec, &oid, 1, mode);
507508

@@ -585,7 +586,7 @@ parse_lines(struct repository *r, struct commit *commit,
585586
name_part);
586587

587588
spec = alloc_filespec(full_name);
588-
fill_blob_sha1(commit, spec);
589+
fill_blob_sha1(r, commit, spec);
589590
fill_line_ends(r, spec, &lines, &ends);
590591
cb_data.spec = spec;
591592
cb_data.lines = lines;

‎match-trees.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ void shift_tree(const struct object_id *hash1,
290290
if (!*del_prefix)
291291
return;
292292

293-
if (get_tree_entry(hash2, del_prefix, shifted, &mode))
293+
if (get_tree_entry(the_repository, hash2, del_prefix, shifted, &mode))
294294
die("cannot find path %s in tree %s",
295295
del_prefix, oid_to_hex(hash2));
296296
return;
@@ -317,12 +317,12 @@ void shift_tree_by(const struct object_id *hash1,
317317
unsigned candidate = 0;
318318

319319
/* Can hash2 be a tree at shift_prefix in tree hash1? */
320-
if (!get_tree_entry(hash1, shift_prefix, &sub1, &mode1) &&
320+
if (!get_tree_entry(the_repository, hash1, shift_prefix, &sub1, &mode1) &&
321321
S_ISDIR(mode1))
322322
candidate |= 1;
323323

324324
/* Can hash1 be a tree at shift_prefix in tree hash2? */
325-
if (!get_tree_entry(hash2, shift_prefix, &sub2, &mode2) &&
325+
if (!get_tree_entry(the_repository, hash2, shift_prefix, &sub2, &mode2) &&
326326
S_ISDIR(mode2))
327327
candidate |= 2;
328328

‎merge-recursive.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ static int get_tree_entry_if_blob(const struct object_id *tree,
475475
{
476476
int ret;
477477

478-
ret = get_tree_entry(tree, path, &dfs->oid, &dfs->mode);
478+
ret = get_tree_entry(the_repository, tree, path, &dfs->oid, &dfs->mode);
479479
if (S_ISDIR(dfs->mode)) {
480480
oidcpy(&dfs->oid, &null_oid);
481481
dfs->mode = 0;
@@ -1905,7 +1905,8 @@ static int tree_has_path(struct tree *tree, const char *path)
19051905
struct object_id hashy;
19061906
unsigned short mode_o;
19071907

1908-
return !get_tree_entry(&tree->object.oid, path,
1908+
return !get_tree_entry(the_repository,
1909+
&tree->object.oid, path,
19091910
&hashy, &mode_o);
19101911
}
19111912

@@ -2500,7 +2501,8 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
25002501
* the various handle_rename_*() functions update the index
25012502
* explicitly rather than relying on unpack_trees() to have done it.
25022503
*/
2503-
get_tree_entry(&tree->object.oid,
2504+
get_tree_entry(opt->repo,
2505+
&tree->object.oid,
25042506
pair->two->path,
25052507
&re->dst_entry->stages[stage].oid,
25062508
&re->dst_entry->stages[stage].mode);

‎notes.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
10151015
return;
10161016
if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid))
10171017
die("Cannot use notes ref %s", notes_ref);
1018-
if (get_tree_entry(&object_oid, "", &oid, &mode))
1018+
if (get_tree_entry(the_repository, &object_oid, "", &oid, &mode))
10191019
die("Failed to read notes tree referenced by %s (%s)",
10201020
notes_ref, oid_to_hex(&object_oid));
10211021

‎sha1-name.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1677,7 +1677,8 @@ int repo_get_oid_blob(struct repository *r,
16771677
}
16781678

16791679
/* Must be called only when object_name:filename doesn't exist. */
1680-
static void diagnose_invalid_oid_path(const char *prefix,
1680+
static void diagnose_invalid_oid_path(struct repository *r,
1681+
const char *prefix,
16811682
const char *filename,
16821683
const struct object_id *tree_oid,
16831684
const char *object_name,
@@ -1695,7 +1696,7 @@ static void diagnose_invalid_oid_path(const char *prefix,
16951696
if (is_missing_file_error(errno)) {
16961697
char *fullname = xstrfmt("%s%s", prefix, filename);
16971698

1698-
if (!get_tree_entry(tree_oid, fullname, &oid, &mode)) {
1699+
if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) {
16991700
die("Path '%s' exists, but not '%s'.\n"
17001701
"Did you mean '%.*s:%s' aka '%.*s:./%s'?",
17011702
fullname,
@@ -1902,10 +1903,10 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
19021903
filename, oid, &oc->symlink_path,
19031904
&oc->mode);
19041905
} else {
1905-
ret = get_tree_entry(&tree_oid, filename, oid,
1906+
ret = get_tree_entry(repo, &tree_oid, filename, oid,
19061907
&oc->mode);
19071908
if (ret && only_to_die) {
1908-
diagnose_invalid_oid_path(prefix,
1909+
diagnose_invalid_oid_path(repo, prefix,
19091910
filename,
19101911
&tree_oid,
19111912
name, len);

‎tree-walk.c‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,9 @@ struct dir_state {
502502
struct object_id oid;
503503
};
504504

505-
static int find_tree_entry(struct tree_desc *t, const char *name, struct object_id *result, unsigned short *mode)
505+
static int find_tree_entry(struct repository *r, struct tree_desc *t,
506+
const char *name, struct object_id *result,
507+
unsigned short *mode)
506508
{
507509
int namelen = strlen(name);
508510
while (t->size) {
@@ -532,19 +534,23 @@ static int find_tree_entry(struct tree_desc *t, const char *name, struct object_
532534
oidcpy(result, &oid);
533535
return 0;
534536
}
535-
return get_tree_entry(&oid, name + entrylen, result, mode);
537+
return get_tree_entry(r, &oid, name + entrylen, result, mode);
536538
}
537539
return -1;
538540
}
539541

540-
int get_tree_entry(const struct object_id *tree_oid, const char *name, struct object_id *oid, unsigned short *mode)
542+
int get_tree_entry(struct repository *r,
543+
const struct object_id *tree_oid,
544+
const char *name,
545+
struct object_id *oid,
546+
unsigned short *mode)
541547
{
542548
int retval;
543549
void *tree;
544550
unsigned long size;
545551
struct object_id root;
546552

547-
tree = read_object_with_reference(the_repository, tree_oid, tree_type, &size, &root);
553+
tree = read_object_with_reference(r, tree_oid, tree_type, &size, &root);
548554
if (!tree)
549555
return -1;
550556

@@ -559,7 +565,7 @@ int get_tree_entry(const struct object_id *tree_oid, const char *name, struct ob
559565
} else {
560566
struct tree_desc t;
561567
init_tree_desc(&t, tree, size);
562-
retval = find_tree_entry(&t, name, oid, mode);
568+
retval = find_tree_entry(r, &t, name, oid, mode);
563569
}
564570
free(tree);
565571
return retval;
@@ -681,7 +687,7 @@ enum get_oid_result get_tree_entry_follow_symlinks(struct object_id *tree_oid, c
681687
}
682688

683689
/* Look up the first (or only) path component in the tree. */
684-
find_result = find_tree_entry(&t, namebuf.buf,
690+
find_result = find_tree_entry(the_repository, &t, namebuf.buf,
685691
&current_tree_oid, mode);
686692
if (find_result) {
687693
goto done;

0 commit comments

Comments
 (0)