status: fix display of rebase -ir's `label` command

diff --git a/remote.h b/remote.h
index da53ad570b91dbd4a820ffc79541fb0a4915ff6b..6a1795947e6f3ff3265a406b2bc43c87842a0833 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -131,8 +131,10 @@ int ref_compare_name(const void *, const void *);
 int check_ref_type(const struct ref *ref, int flags);
 
 /*
- * Frees the entire list and peers of elements.
+ * Free a single ref and its peer, or an entire list of refs and their peers,
+ * respectively.
  */
+void free_one_ref(struct ref *ref);
 void free_refs(struct ref *ref);
 
 struct oid_array;
@@ -253,7 +255,8 @@ enum ahead_behind_flags {
 
 /* Reporting of tracking info */
 int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs,
-                      const char **upstream_name, enum ahead_behind_flags abf);
+                      const char **upstream_name, int for_push,
+                      enum ahead_behind_flags abf);
 int format_tracking_info(struct branch *branch, struct strbuf *sb,
                         enum ahead_behind_flags abf);