Merge branch 'jk/prune-with-corrupt-refs'

diff --git a/cache.h b/cache.h
index 761c5704b2e21f5dcd68fdcc9c3b1247ab0cfd18..162ea6f24a192a021f4da339349e6d550b54a5dd 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -613,6 +613,14 @@ extern int precomposed_unicode;
 extern int protect_hfs;
 extern int protect_ntfs;
 
+/*
+ * Include broken refs in all ref iterations, which will
+ * generally choke dangerous operations rather than letting
+ * them silently proceed without taking the broken ref into
+ * account.
+ */
+extern int ref_paranoia;
+
 /*
  * The character that begins a commented line in user-editable file
  * that is subject to stripspace.