Rename the get_tree_entry() function to get_tree_entry_mode(). This
change is only a search-replacement of the name and indentation of the
argument lists.
Subsequent commits will add another get_tree_entry_*() function. Those
changes will be much easier to read if we do this rename first.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
archive.c | 8 ++++----
blame.c | 5 ++---
builtin/rm.c | 2 +-
builtin/update-index.c | 2 +-
line-log.c | 2 +-
match-trees.c | 6 +++---
merge-recursive.c | 18 +++++++++---------
notes.c | 2 +-
object-name.c | 6 +++---
tree-walk.c | 14 +++++++-------
tree-walk.h | 8 ++++----
11 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/archive.c b/archive.c
index 6af35a66b56..fa07fb442b4 100644
--- a/archive.c
+++ b/archive.c
@@ -475,10 +475,10 @@ static void parse_treeish_arg(const char **argv,
unsigned short mode;
int err;
- err = get_tree_entry(ar_args->repo,
- &tree->object.oid,
- prefix, &tree_oid,
- &mode);
+ err = get_tree_entry_mode(ar_args->repo,
+ &tree->object.oid,
+ prefix, &tree_oid,
+ &mode);
if (err || !S_ISDIR(mode))
die(_("current working directory is untracked"));
diff --git a/blame.c b/blame.c
index d1fa3821a08..462809095be 100644
--- a/blame.c
+++ b/blame.c
@@ -102,8 +102,7 @@ static void verify_working_tree_path(struct repository *r,
const struct object_id *commit_oid = &parents->item->object.oid;
struct object_id blob_oid;
unsigned short mode;
-
- if (!get_tree_entry(r, commit_oid, path, &blob_oid, &mode))
+ if (!get_tree_entry_mode(r, commit_oid, path, &blob_oid, &mode))
return;
}
@@ -1237,7 +1236,7 @@ static int fill_blob_sha1_and_mode(struct repository *r,
{
if (!is_null_oid(&origin->blob_oid))
return 0;
- if (get_tree_entry(r, &origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
+ if (get_tree_entry_mode(r, &origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))
goto error_out;
if (oid_object_info(r, &origin->blob_oid, NULL) != OBJ_BLOB)
goto error_out;
diff --git a/builtin/rm.c b/builtin/rm.c
index 4858631e0f0..4617388b29a 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -179,7 +179,7 @@ static int check_local_mod(struct object_id *head, int index_only)
* way as changed from the HEAD.
*/
if (no_head
- || get_tree_entry(the_repository, head, name, &oid, &mode)
+ || get_tree_entry_mode(the_repository, head, name, &oid, &mode)
|| ce->ce_mode != create_ce_mode(mode)
|| !oideq(&ce->oid, &oid))
staged_changes = 1;
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 79087bccea4..070510d6a88 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -603,7 +603,7 @@ static struct cache_entry *read_one_ent(const char *which,
struct object_id oid;
struct cache_entry *ce;
- if (get_tree_entry(the_repository, ent, path, &oid, &mode)) {
+ if (get_tree_entry_mode(the_repository, ent, path, &oid, &mode)) {
if (which)
error("%s: not in %s branch.", path, which);
return NULL;
diff --git a/line-log.c b/line-log.c
index 51d93310a4d..d8ba9229212 100644
--- a/line-log.c
+++ b/line-log.c
@@ -503,7 +503,7 @@ static void fill_blob_sha1(struct repository *r, struct commit *commit,
unsigned short mode;
struct object_id oid;
- if (get_tree_entry(r, &commit->object.oid, spec->path, &oid, &mode))
+ if (get_tree_entry_mode(r, &commit->object.oid, spec->path, &oid, &mode))
die("There is no path %s in the commit", spec->path);
fill_filespec(spec, &oid, 1, mode);
diff --git a/match-trees.c b/match-trees.c
index bdd16adb70a..d4457eba997 100644
--- a/match-trees.c
+++ b/match-trees.c
@@ -293,7 +293,7 @@ void shift_tree(struct repository *r,
if (!*del_prefix)
return;
- if (get_tree_entry(r, hash2, del_prefix, shifted, &mode))
+ if (get_tree_entry_mode(r, hash2, del_prefix, shifted, &mode))
die("cannot find path %s in tree %s",
del_prefix, oid_to_hex(hash2));
return;
@@ -321,12 +321,12 @@ void shift_tree_by(struct repository *r,
unsigned candidate = 0;
/* Can hash2 be a tree at shift_prefix in tree hash1? */
- if (!get_tree_entry(r, hash1, shift_prefix, &sub1, &tmp) &&
+ if (!get_tree_entry_mode(r, hash1, shift_prefix, &sub1, &tmp) &&
S_ISDIR(tmp))
candidate |= 1;
/* Can hash1 be a tree at shift_prefix in tree hash2? */
- if (!get_tree_entry(r, hash2, shift_prefix, &sub2, &tmp) &&
+ if (!get_tree_entry_mode(r, hash2, shift_prefix, &sub2, &tmp) &&
S_ISDIR(tmp))
candidate |= 2;
diff --git a/merge-recursive.c b/merge-recursive.c
index 57198b29fe7..c2e9f5d22d0 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -485,7 +485,7 @@ static int get_tree_entry_if_blob(struct repository *r,
{
int ret;
- ret = get_tree_entry(r, tree, path, &dfs->oid, &dfs->mode);
+ ret = get_tree_entry_mode(r, tree, path, &dfs->oid, &dfs->mode);
if (S_ISDIR(dfs->mode)) {
oidcpy(&dfs->oid, &null_oid);
dfs->mode = 0;
@@ -1884,9 +1884,9 @@ static int tree_has_path(struct repository *r, struct tree *tree,
struct object_id hashy;
unsigned short mode_o;
- return !get_tree_entry(r,
- &tree->object.oid, path,
- &hashy, &mode_o);
+ return !get_tree_entry_mode(r,
+ &tree->object.oid, path,
+ &hashy, &mode_o);
}
/*
@@ -2538,11 +2538,11 @@ static void apply_directory_rename_modifications(struct merge_options *opt,
* the various handle_rename_*() functions update the index
* explicitly rather than relying on unpack_trees() to have done it.
*/
- get_tree_entry(opt->repo,
- &tree->object.oid,
- pair->two->path,
- &re->dst_entry->stages[stage].oid,
- &re->dst_entry->stages[stage].mode);
+ get_tree_entry_mode(opt->repo,
+ &tree->object.oid,
+ pair->two->path,
+ &re->dst_entry->stages[stage].oid,
+ &re->dst_entry->stages[stage].mode);
/*
* Record the original change status (or 'type' of change). If it
diff --git a/notes.c b/notes.c
index 00aa7d4115a..e6244624055 100644
--- a/notes.c
+++ b/notes.c
@@ -1021,7 +1021,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
return;
if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid))
die("Cannot use notes ref %s", notes_ref);
- if (get_tree_entry(the_repository, &object_oid, "", &oid, &mode))
+ if (get_tree_entry_mode(the_repository, &object_oid, "", &oid, &mode))
die("Failed to read notes tree referenced by %s (%s)",
notes_ref, oid_to_hex(&object_oid));
diff --git a/object-name.c b/object-name.c
index 64202de60b1..7e3b2d6d739 100644
--- a/object-name.c
+++ b/object-name.c
@@ -1704,7 +1704,7 @@ static void diagnose_invalid_oid_path(struct repository *r,
if (is_missing_file_error(errno)) {
char *fullname = xstrfmt("%s%s", prefix, filename);
- if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) {
+ if (!get_tree_entry_mode(r, tree_oid, fullname, &oid, &mode)) {
die(_("path '%s' exists, but not '%s'\n"
"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"),
fullname,
@@ -1903,8 +1903,8 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
filename, oid, &oc->symlink_path,
&oc->mode);
} else {
- ret = get_tree_entry(repo, &tree_oid, filename, oid,
- &oc->mode);
+ ret = get_tree_entry_mode(repo, &tree_oid, filename, oid,
+ &oc->mode);
if (ret && only_to_die) {
diagnose_invalid_oid_path(repo, prefix,
filename,
diff --git a/tree-walk.c b/tree-walk.c
index fc2ce547c4e..30e3bb64e49 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -589,17 +589,17 @@ static int find_tree_entry(struct repository *r, struct tree_desc *t,
oidcpy(result, &oid);
return 0;
}
- return get_tree_entry(r, &oid, name + entrylen, result,
- mode);
+ return get_tree_entry_mode(r, &oid, name + entrylen, result,
+ mode);
}
return -1;
}
-int get_tree_entry(struct repository *r,
- const struct object_id *tree_oid,
- const char *name,
- struct object_id *oid,
- unsigned short *mode)
+int get_tree_entry_mode(struct repository *r,
+ const struct object_id *tree_oid,
+ const char *name,
+ struct object_id *oid,
+ unsigned short *mode)
{
int retval;
void *tree;
diff --git a/tree-walk.h b/tree-walk.h
index cd8da84f56c..a01f2f226ec 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -172,11 +172,11 @@ struct traverse_info {
* You always need a pointer to an appropriate variable to fill in
* (NULL won't do!). That variable is:
*
- * get_tree_entry(): unsigned short mode
+ * get_tree_entry_mode(): unsigned short mode
*/
-int get_tree_entry(struct repository *, const struct object_id *, const char *,
- struct object_id *,
- unsigned short *);
+int get_tree_entry_mode(struct repository *, const struct object_id *, const char *,
+ struct object_id *,
+ unsigned short *);
/**
* Generate the full pathname of a tree entry based from the root of the
--
2.31.1.474.g72d45d12706
