rerere: recalculate conflict ID when unresolved conflict is committed

diff --git a/packfile.h b/packfile.h
index bfd0b5399de090c2e404a4e210eeaa59586ca7cc..e0a38aba9321deae1d64aea7cd87067fde240b10 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -137,9 +137,9 @@ extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1);
  * Iff a pack file in the given repository contains the object named by sha1,
  * return true and store its location to e.
  */
-extern int find_pack_entry(struct repository *r, const unsigned char *sha1, struct pack_entry *e);
+extern int find_pack_entry(struct repository *r, const struct object_id *oid, struct pack_entry *e);
 
-extern int has_sha1_pack(const unsigned char *sha1);
+extern int has_object_pack(const struct object_id *oid);
 
 extern int has_pack_index(const unsigned char *sha1);