Merge branch 'jc/lockfile' into next

diff --git a/builtin-diff.c b/builtin-diff.c
index de81b05e32f884053060448bc59c83ff70961c24..27451d56134e08364c33c26d5074693dd4437d31 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -233,7 +233,7 @@ static int builtin_diff_combined(struct rev_info *revs,
        return 0;
 }
 
-static void add_head(struct rev_info *revs)
+void add_head(struct rev_info *revs)
 {
        unsigned char sha1[20];
        struct object *obj;