Merge branch 'js/rebase-am'

diff --git a/packfile.h b/packfile.h
index 6c4037605d0dfee59a084c440506f1af11708d63..d70c6d9afb94c77c285fe8ee3237f7a40867157a 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -146,7 +146,7 @@ extern int packed_object_info(struct repository *r,
                              off_t offset, struct object_info *);
 
 extern void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
-extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1);
+extern const struct packed_git *has_packed_and_bad(struct repository *r, const unsigned char *sha1);
 
 /*
  * Iff a pack file in the given repository contains the object named by sha1,