Merge branch 'pe/cleanup' into next

diff --git a/blame.c b/blame.c
index 396defccc728db836732aa140e54620775509760..98f99922a78578a84468f1296d6e56b999829659 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -229,7 +229,7 @@ static void get_blob(struct commit *commit)
 
        info->buf = read_sha1_file(info->sha1, type, &info->size);
 
-       assert(!strcmp(type, "blob"));
+       assert(!strcmp(type, blob_type));
 }
 
 /* For debugging only */