about summary refs log tree commit
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-03-23 18:45:25 +0100
committerJunio C Hamano <gitster@pobox.com>2018-03-26 10:07:43 -0700
commit613b42f283140308435939377994c4d57d0dda23 (patch)
treef0088bd534cbd2fdef645ddb046814ff9aae5c7d
parent4c2a13b4e29f826dcbe0797beb64071fa61e531f (diff)
downloadgit-613b42f283140308435939377994c4d57d0dda23.tar.gz
While at it move the documentation to the header and mention which pack
files are searched.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--packfile.c8
-rw-r--r--packfile.h7
-rw-r--r--sha1_file.c6
3 files changed, 11 insertions, 10 deletions
diff --git a/packfile.c b/packfile.c
index 21d256f85a..9df123f0f1 100644
--- a/packfile.c
+++ b/packfile.c
@@ -1845,11 +1845,7 @@ static int fill_pack_entry(const unsigned char *sha1,
         return 1;
 }
 
-/*
- * Iff a pack file contains the object named by sha1, return true and
- * store its location to e.
- */
-int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
+int find_pack_entry_the_repository(const unsigned char *sha1, struct pack_entry *e)
 {
         struct list_head *pos;
 
@@ -1871,7 +1867,7 @@ int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
 int has_sha1_pack(const unsigned char *sha1)
 {
         struct pack_entry e;
-        return find_pack_entry(sha1, &e);
+        return find_pack_entry(the_repository, sha1, &e);
 }
 
 int has_pack_index(const unsigned char *sha1)
diff --git a/packfile.h b/packfile.h
index ee6da3a9ae..e68f790ea7 100644
--- a/packfile.h
+++ b/packfile.h
@@ -123,7 +123,12 @@ extern int packed_object_info(struct packed_git *pack, off_t offset, struct obje
 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 int find_pack_entry(const unsigned char *sha1, struct pack_entry *e);
+/*
+ * Iff a pack file in the given repository contains the object named by sha1,
+ * return true and store its location to e.
+ */
+#define find_pack_entry(r, s, e) find_pack_entry_##r(s, e)
+extern int find_pack_entry_the_repository(const unsigned char *sha1, struct pack_entry *e);
 
 extern int has_sha1_pack(const unsigned char *sha1);
 
diff --git a/sha1_file.c b/sha1_file.c
index 9c024cd957..314ff55b47 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1266,7 +1266,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
         }
 
         while (1) {
-                if (find_pack_entry(real, &e))
+                if (find_pack_entry(the_repository, real, &e))
                         break;
 
                 /* Most likely it's a loose object. */
@@ -1275,7 +1275,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
 
                 /* Not a loose object; someone else may have just packed it. */
                 reprepare_packed_git(the_repository);
-                if (find_pack_entry(real, &e))
+                if (find_pack_entry(the_repository, real, &e))
                         break;
 
                 /* Check if it is a missing object */
@@ -1655,7 +1655,7 @@ static int freshen_loose_object(const unsigned char *sha1)
 static int freshen_packed_object(const unsigned char *sha1)
 {
         struct pack_entry e;
-        if (!find_pack_entry(sha1, &e))
+        if (!find_pack_entry(the_repository, sha1, &e))
                 return 0;
         if (e.p->freshened)
                 return 1;