push: test to verify that push errors are colored

diff --git a/strbuf.h b/strbuf.h
index 652f17392c15993272db5891227ec25b3c78d8bd..4efa80c1de60b5886ea47655fc6570ef6c5f049b 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -1,8 +1,6 @@
 #ifndef STRBUF_H
 #define STRBUF_H
 
-struct string_list;
-
 /**
  * strbuf's are meant to be used with all the usual C string and memory
  * APIs. Given that the length of the buffer is known, it's often better to
@@ -72,6 +70,12 @@ struct strbuf {
 extern char strbuf_slopbuf[];
 #define STRBUF_INIT  { .alloc = 0, .len = 0, .buf = strbuf_slopbuf }
 
+/*
+ * Predeclare this here, since cache.h includes this file before it defines the
+ * struct.
+ */
+struct object_id;
+
 /**
  * Life Cycle Functions
  * --------------------
@@ -533,20 +537,6 @@ static inline struct strbuf **strbuf_split(const struct strbuf *sb,
        return strbuf_split_max(sb, terminator, 0);
 }
 
-/*
- * Adds all strings of a string list to the strbuf, separated by the given
- * separator.  For example, if sep is
- *   ', '
- * and slist contains
- *   ['element1', 'element2', ..., 'elementN'],
- * then write:
- *   'element1, element2, ..., elementN'
- * to str.  If only one element, just write "element1" to str.
- */
-extern void strbuf_add_separated_string_list(struct strbuf *str,
-                                            const char *sep,
-                                            struct string_list *slist);
-
 /**
  * Free a NULL-terminated list of strbufs (for example, the return
  * values of the strbuf_split*() functions).
@@ -558,7 +548,7 @@ extern void strbuf_list_free(struct strbuf **);
  * the strbuf `sb`.
  */
 extern void strbuf_add_unique_abbrev(struct strbuf *sb,
-                                    const unsigned char *sha1,
+                                    const struct object_id *oid,
                                     int abbrev_len);
 
 /**