Merge branch 'sb/branch-avoid-repeated-strbuf-release'

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 1ea25331d38f4395f1c5079a1ca39263c69701b2..f5fa4fd75af26a66cd1b2c0d493116704bc16dd5 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -113,6 +113,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
 
                if (textconv_object(path, obj_context.mode, &oid, 1, &buf, &size))
                        break;
+               /* else fallthrough */
 
        case 'p':
                type = sha1_object_info(oid.hash, NULL);