pack: move has_sha1_pack()

jonathantanmy · gitster · commit 150e3001d0c5 · 2017-08-23T15:12:07.000-07:00
Signed-off-by: Jonathan Tan &lt;jonathantanmy@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
@@ -2,6 +2,7 @@
 #include "cache.h"
 #include "progress.h"
 #include "parse-options.h"
+#include "packfile.h"
 
 static const char * const prune_packed_usage[] = {
 	N_("git prune-packed [-n | --dry-run] [-q | --quiet]"),
diff --git a/cache.h b/cache.h
@@ -1191,8 +1191,6 @@ extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned l
 
 extern int finalize_object_file(const char *tmpfile, const char *filename);
 
-extern int has_sha1_pack(const unsigned char *sha1);
-
 /*
  * Open the loose object at path, check its sha1, and return the contents,
  * type, and size. If the object is a blob, then "contents" may return NULL,
diff --git a/diff.c b/diff.c
@@ -20,6 +20,7 @@
 #include "string-list.h"
 #include "argv-array.h"
 #include "graph.h"
+#include "packfile.h"
 
 #ifdef NO_FAST_WORKING_DIRECTORY
 #define FAST_WORKING_DIRECTORY 0
diff --git a/packfile.c b/packfile.c
@@ -1840,3 +1840,9 @@ int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
 	}
 	return 0;
 }
+
+int has_sha1_pack(const unsigned char *sha1)
+{
+	struct pack_entry e;
+	return find_pack_entry(sha1, &e);
+}
diff --git a/packfile.h b/packfile.h
@@ -120,4 +120,6 @@ 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);
 
+extern int has_sha1_pack(const unsigned char *sha1);
+
 #endif
diff --git a/revision.c b/revision.c
@@ -19,6 +19,7 @@
 #include "dir.h"
 #include "cache-tree.h"
 #include "bisect.h"
+#include "packfile.h"
 
 volatile show_early_output_fn_t show_early_output;
 
diff --git a/sha1_file.c b/sha1_file.c
@@ -1631,12 +1631,6 @@ int has_pack_index(const unsigned char *sha1)
 	return 1;
 }
 
-int has_sha1_pack(const unsigned char *sha1)
-{
-	struct pack_entry e;
-	return find_pack_entry(sha1, &e);
-}
-
 int has_sha1_file_with_flags(const unsigned char *sha1, int flags)
 {
 	if (!startup_info->have_repository)

Original file line number	Diff line number	Diff line change
`@@ -1840,3 +1840,9 @@ int find_pack_entry(const unsigned char sha1, struct pack_entry e)`
`1840`	`1840`	`}`
`1841`	`1841`	`return 0;`
`1842`	`1842`	`}`
	`1843`	`+`
	`1844`	`+int has_sha1_pack(const unsigned char *sha1)`
	`1845`	`+{`
	`1846`	`+ struct pack_entry e;`
	`1847`	`+ return find_pack_entry(sha1, &e);`
	`1848`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1631,12 +1631,6 @@ int has_pack_index(const unsigned char *sha1)`
`1631`	`1631`	`return 1;`
`1632`	`1632`	`}`
`1633`	`1633`
`1634`		`-int has_sha1_pack(const unsigned char *sha1)`
`1635`		`-{`
`1636`		`- struct pack_entry e;`
`1637`		`- return find_pack_entry(sha1, &e);`
`1638`		`-}`
`1639`		`-`
`1640`	`1634`	`int has_sha1_file_with_flags(const unsigned char *sha1, int flags)`
`1641`	`1635`	`{`
`1642`	`1636`	`if (!startup_info->have_repository)`