Merge early part of 'jc/combine' branch

diff --git a/blame.c b/blame.c
index 270ca52c3abf4b8d51aba4c57693f6c72800bb14..396defccc728db836732aa140e54620775509760 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -748,7 +748,7 @@ 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();