diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:46 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 09:23:49 -0700 |
commit | abef9020e3df87c441c9a3a95f592fce5fa49bb9 (patch) | |
tree | b04714a271049de3d7402e20e868beb5cee30995 /builtin/mktree.c | |
parent | Convert remaining callers of sha1_object_info_extended to object_id (diff) | |
download | tgif-abef9020e3df87c441c9a3a95f592fce5fa49bb9.tar.xz |
sha1_file: convert sha1_object_info* to object_id
Convert sha1_object_info and sha1_object_info_extended to take pointers
to struct object_id and rename them to use "oid" instead of "sha1" in
their names. Update the declaration and definition and apply the
following semantic patch, plus the standard object_id transforms:
@@
expression E1, E2;
@@
- sha1_object_info(E1.hash, E2)
+ oid_object_info(&E1, E2)
@@
expression E1, E2;
@@
- sha1_object_info(E1->hash, E2)
+ oid_object_info(E1, E2)
@@
expression E1, E2, E3;
@@
- sha1_object_info_extended(E1.hash, E2, E3)
+ oid_object_info_extended(&E1, E2, E3)
@@
expression E1, E2, E3;
@@
- sha1_object_info_extended(E1->hash, E2, E3)
+ oid_object_info_extended(E1, E2, E3)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/mktree.c')
-rw-r--r-- | builtin/mktree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/mktree.c b/builtin/mktree.c index e39fe5d423..263c530315 100644 --- a/builtin/mktree.c +++ b/builtin/mktree.c @@ -116,7 +116,7 @@ static void mktree_line(char *buf, size_t len, int nul_term_line, int allow_miss } /* Check the type of object identified by sha1 */ - obj_type = sha1_object_info(oid.hash, NULL); + obj_type = oid_object_info(&oid, NULL); if (obj_type < 0) { if (allow_missing) { ; /* no problem - missing objects are presumed to be of the right type */ |