summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-25 19:54:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-25 19:54:26 (GMT)
commit05e816e37f4eb023a3606b2942192390566c6107 (patch)
tree2f266768dd254fcc510f6a3966bb895e6ca6e798 /cache.h
parenta801bb8c297737d99a0b20d61a3a956f0c92a3b9 (diff)
parentea56c4e02fc1d5ce6a6b5083c284e32ffc6367e6 (diff)
downloadgit-05e816e37f4eb023a3606b2942192390566c6107.zip
git-05e816e37f4eb023a3606b2942192390566c6107.tar.gz
git-05e816e37f4eb023a3606b2942192390566c6107.tar.bz2
Merge branch 'jk/prune-with-corrupt-refs'
"git prune" used to largely ignore broken refs when deciding which objects are still being used, which could spread an existing small damage and make it a larger one. * jk/prune-with-corrupt-refs: refs.c: drop curate_packed_refs repack: turn on "ref paranoia" when doing a destructive repack prune: turn on ref_paranoia flag refs: introduce a "ref paranoia" flag t5312: test object deletion code paths in a corrupted repository
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 761c570..162ea6f 100644
--- a/cache.h
+++ b/cache.h
@@ -614,6 +614,14 @@ 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.
*/