diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-06 14:45:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-06 14:45:44 -0700 |
| commit | 8429f2b42d04a0598079c847c39d45d777613939 (patch) | |
| tree | 5c4c3954173955e4cbaf1551b6757512caf324fa /http-push.c | |
| parent | 89d3eafe9019b407d6b2cf8913c6845bde50b178 (diff) | |
| parent | b6aec868afb17acdbd486c09602a658e14c98602 (diff) | |
| download | git-8429f2b42d04a0598079c847c39d45d777613939.tar.gz | |
Merge branch 'bc/object-id'
Move from unsigned char[20] to struct object_id continues.
* bc/object-id:
match-trees: convert several leaf functions to use struct object_id
tree-walk: convert tree_entry_extract() to use struct object_id
struct name_entry: use struct object_id instead of unsigned char sha1[20]
match-trees: convert shift_tree() and shift_tree_by() to use object_id
test-match-trees: convert to use struct object_id
sha1-name: introduce a get_oid() function
Diffstat (limited to 'http-push.c')
| -rw-r--r-- | http-push.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/http-push.c b/http-push.c index ae2b7f19d2..a092f0288b 100644 --- a/http-push.c +++ b/http-push.c @@ -1312,10 +1312,10 @@ static struct object_list **process_tree(struct tree *tree, while (tree_entry(&desc, &entry)) switch (object_type(entry.mode)) { case OBJ_TREE: - p = process_tree(lookup_tree(entry.sha1), p); + p = process_tree(lookup_tree(entry.oid->hash), p); break; case OBJ_BLOB: - p = process_blob(lookup_blob(entry.sha1), p); + p = process_blob(lookup_blob(entry.oid->hash), p); break; default: /* Subproject commit - not in this repository */ |