Merge branch 'pt/enter-repo-comment-fix'

diff --git a/cache.h b/cache.h
index 28d769fcaa3088d761c31550234057ef2333ec0e..3d3244ba647db66c4d3ed7071bcca3de77c97cf8 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;