Merge branch 'pe/cleanup' into next

diff --git a/blame.c b/blame.c
index 9c97aeca451f641ff319fc4bee70a97488e619cd..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 */
@@ -748,10 +748,11 @@ int main(int argc, const char **argv)
        struct commit_info ci;
        const char *buf;
        int max_digits;
-       size_t longest_file, longest_author;
+       int longest_file, longest_author;
        int found_rename;
 
        const char* prefix = setup_git_directory();
+       git_config(git_default_config);
 
        for(i = 1; i < argc; i++) {
                if(options) {