Merge branch 'cb/fetch-set-upstream'

diff --git a/blame.h b/blame.h
index 5dd877bb78fc068510753f7e967dea4be049f66d..4a9e1270b036465c23fab5a0e536b9638ca3ce1b 100644 (file)
--- a/blame.h
+++ b/blame.h
@@ -54,7 +54,7 @@ struct blame_origin {
        int num_lines;
        void *fingerprints;
        struct object_id blob_oid;
-       unsigned mode;
+       unsigned short mode;
        /* guilty gets set when shipping any suspects to the final
         * blame list instead of other commits
         */
@@ -183,6 +183,6 @@ struct blame_entry *blame_entry_prepend(struct blame_entry *head,
                                        long start, long end,
                                        struct blame_origin *o);
 
-extern struct blame_origin *get_blame_suspects(struct commit *commit);
+struct blame_origin *get_blame_suspects(struct commit *commit);
 
 #endif /* BLAME_H */