Richard Oliver <roliver@xxxxxxxx> writes:
> + /* Check the type of object identified by oid without fetching objects */
> + struct object_info oi = OBJECT_INFO_INIT;
This is -Wdecl-after-statement.
> + oi.typep = &obj_type;
> + if (oid_object_info_extended(the_repository, &oid, &oi,
> + OBJECT_INFO_LOOKUP_REPLACE |
> + OBJECT_INFO_QUICK |
> + OBJECT_INFO_SKIP_FETCH_OBJECT) < 0)
> + obj_type = -1;
> +
> if (obj_type < 0) {
> if (allow_missing) {
> ; /* no problem - missing objects are presumed to be of the right type */
I've done an obvious and trivial fix-up locally while queueing.
Thanks.
diff --git a/builtin/mktree.c b/builtin/mktree.c
index cfadb52670..06d81400f5 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -74,6 +74,7 @@ static void mktree_line(char *buf, int nul_term_line, int allow_missing)
unsigned mode;
enum object_type mode_type; /* object type derived from mode */
enum object_type obj_type; /* object type derived from sha */
+ struct object_info oi = OBJECT_INFO_INIT;
char *path, *to_free = NULL;
struct object_id oid;
@@ -117,7 +118,6 @@ static void mktree_line(char *buf, int nul_term_line, int allow_missing)
}
/* Check the type of object identified by oid without fetching objects */
- struct object_info oi = OBJECT_INFO_INIT;
oi.typep = &obj_type;
if (oid_object_info_extended(the_repository, &oid, &oi,
OBJECT_INFO_LOOKUP_REPLACE |
