X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=remote.h;h=878b4ecc32a2a4b5be4e0444ae4510e1a7ab01cb;hb=5410a02ab9e6a1987147724f8ea65e6a077b3832;hp=c62636d78ef996b97aef73cf37cfb5de3f279145;hpb=d90a7fda355c251b8ffdd79617fb083c18245ec2;p=git.git

diff --git a/remote.h b/remote.h
index c62636d78..878b4ecc3 100644
--- a/remote.h
+++ b/remote.h
@@ -67,9 +67,12 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
  * *tail is the pointer to the tail pointer of the list of results
  * beforehand, and will be set to the tail pointer of the list of
  * results afterward.
+ *
+ * missing_ok is usually false, but when we are adding branch.$name.merge
+ * it is Ok if the branch is not at the remote anymore.
  */
 int get_fetch_map(struct ref *remote_refs, const struct refspec *refspec,
-		  struct ref ***tail);
+		  struct ref ***tail, int missing_ok);
 
 struct ref *get_remote_ref(struct ref *remote_refs, const char *name);