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

diff --git a/cache.h b/cache.h
index 23806394eb5089f480d5300ac23e616eccd604db..162ea6f24a192a021f4da339349e6d550b54a5dd 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -568,7 +568,7 @@ extern void update_index_if_able(struct index_state *, struct lock_file *);
 extern int hold_locked_index(struct lock_file *, int);
 extern void set_alternate_index_output(const char *);
 
-extern int delete_ref(const char *, const unsigned char *sha1, int delopt);
+extern int delete_ref(const char *, const unsigned char *sha1, unsigned int flags);
 
 /* Environment bits from configuration mechanism */
 extern int trust_executable_bit;