diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:51 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 09:23:50 -0700 |
| commit | 916bc35b29af6e0f4f215dea9c84e4185de0fec4 (patch) | |
| tree | 21f8318b909c7dc21129bad02d6adc7d46fbc705 /sha1_name.c | |
| parent | 575042a04f671fa1a9cf9d5c21b30a2dadbe6c7e (diff) | |
| download | git-916bc35b29af6e0f4f215dea9c84e4185de0fec4.tar.gz | |
tree-walk: convert tree entry functions to object_id
Convert get_tree_entry and find_tree_entry to take pointers to struct
object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sha1_name.c b/sha1_name.c index d129dc4f31..39e911c8ba 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1529,8 +1529,7 @@ static void diagnose_invalid_oid_path(const char *prefix, if (is_missing_file_error(errno)) { char *fullname = xstrfmt("%s%s", prefix, filename); - if (!get_tree_entry(tree_oid->hash, fullname, - oid.hash, &mode)) { + if (!get_tree_entry(tree_oid, fullname, &oid, &mode)) { die("Path '%s' exists, but not '%s'.\n" "Did you mean '%.*s:%s' aka '%.*s:./%s'?", fullname, @@ -1722,8 +1721,8 @@ static int get_oid_with_context_1(const char *name, filename, oid->hash, &oc->symlink_path, &oc->mode); } else { - ret = get_tree_entry(tree_oid.hash, filename, - oid->hash, &oc->mode); + ret = get_tree_entry(&tree_oid, filename, oid, + &oc->mode); if (ret && only_to_die) { diagnose_invalid_oid_path(prefix, filename, |