diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-07 01:10:14 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 09:12:57 +0300 |
commit | 3aca1fc6c9c69fbfce0e6312fc8e3087cb6334a4 (patch) | |
tree | 659abe824d500138947540b5217d142cac1a75f0 /builtin/merge-tree.c | |
parent | 3e9309815da9aab4e13195b7c6a52c1f7161562a (diff) |
Convert lookup_blob to struct object_id
Convert lookup_blob to take a pointer to struct object_id.
The commit was created with manual changes to blob.c and blob.h, plus
the following semantic patch:
@@
expression E1;
@@
- lookup_blob(E1.hash)
+ lookup_blob(&E1)
@@
expression E1;
@@
- lookup_blob(E1->hash)
+ lookup_blob(E1)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
-rw-r--r-- | builtin/merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index cdeb6562da4..bad6735c76f 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -168,7 +168,7 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru res->stage = stage; res->path = path; res->mode = mode; - res->blob = lookup_blob(oid->hash); + res->blob = lookup_blob(oid); return res; } |