Merge branch 'nd/remove-ignore-env-field'

diff --git a/builtin/prune.c b/builtin/prune.c
index 4cfec82f4076e357048bcb5816ceeb0f4b020192..38ced18dadff03836c6bed3fcbdefe8bd528a7c0 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -50,9 +50,9 @@ static int prune_object(const struct object_id *oid, const char *fullpath,
        if (st.st_mtime > expire)
                return 0;
        if (show_only || verbose) {
-               enum object_type type = sha1_object_info(oid->hash, NULL);
+               enum object_type type = oid_object_info(oid, NULL);
                printf("%s %s\n", oid_to_hex(oid),
-                      (type > 0) ? typename(type) : "unknown");
+                      (type > 0) ? type_name(type) : "unknown");
        }
        if (!show_only)
                unlink_or_warn(fullpath);