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 /builtin | |
| parent | streaming: convert istream internals to struct object_id (diff) | |
| download | tgif-916bc35b29af6e0f4f215dea9c84e4185de0fec4.tar.xz | |
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 'builtin')
| -rw-r--r-- | builtin/rm.c | 2 | ||||
| -rw-r--r-- | builtin/update-index.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index 4a2fcca27b..974a7ef5bf 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -178,7 +178,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(head->hash, name, oid.hash, &mode) + || get_tree_entry(head, name, &oid, &mode) || ce->ce_mode != create_ce_mode(mode) || oidcmp(&ce->oid, &oid)) staged_changes = 1; diff --git a/builtin/update-index.c b/builtin/update-index.c index 58d1c2d282..9625d1e10a 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -592,7 +592,7 @@ static struct cache_entry *read_one_ent(const char *which, int size; struct cache_entry *ce; - if (get_tree_entry(ent->hash, path, oid.hash, &mode)) { + if (get_tree_entry(ent, path, &oid, &mode)) { if (which) error("%s: not in %s branch.", path, which); return NULL; |