@@ -1,6 +1,8 @@
#ifndef STRBUF_H
#define STRBUF_H
+struct object_id;
+struct repository;
struct string_list;
/**
@@ -72,12 +74,6 @@ struct strbuf {
extern char strbuf_slopbuf[];
#define STRBUF_INIT { .buf = strbuf_slopbuf }
-/*
- * Predeclare this here, since cache.h includes this file before it defines the
- * struct.
- */
-struct object_id;
-
/**
* Life Cycle Functions
* --------------------
@@ -634,7 +630,6 @@ void strbuf_list_free(struct strbuf **list);
* Add the abbreviation, as generated by repo_find_unique_abbrev(), of `sha1` to
* the strbuf `sb`.
*/
-struct repository;
void strbuf_repo_add_unique_abbrev(struct strbuf *sb, struct repository *repo,
const struct object_id *oid, int abbrev_len);
void strbuf_add_unique_abbrev(struct strbuf *sb, const struct object_id *oid,