branch -d: base the "already-merged" safety on the branch it merges with

diff --git a/refs.h b/refs.h
index c11f6a6d588d1bd737fa60241b9c67308f4c14cc..e141991851be60334ea23cc6055b329c36cd272f 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -24,11 +24,12 @@ extern int for_each_ref_in(const char *, each_ref_fn, void *);
 extern int for_each_tag_ref(each_ref_fn, void *);
 extern int for_each_branch_ref(each_ref_fn, void *);
 extern int for_each_remote_ref(each_ref_fn, void *);
+extern int for_each_replace_ref(each_ref_fn, void *);
 
 /* can be used to learn about broken ref and symref */
 extern int for_each_rawref(each_ref_fn, void *);
 
-extern void warn_dangling_symref(const char *msg_fmt, const char *refname);
+extern void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname);
 
 /*
  * Extra refs will be listed by for_each_ref() before any actual refs