Merge branch 'maint'

* maint:
  Use const qualifier for 'sha1' parameter in delete_ref function

diff --cc cache.h
index b1bd9e46c2bd64e00b671ff5ed512d9c12b53309,7cedda684f81e5b7bc111c2322ef1f4b2fc97d90..53c23413e4ba0b6c43632be821c69c8eb80db857
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -211,13 -212,8 +211,13 @@@ struct lock_file 
  };
  extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
  extern int commit_lock_file(struct lock_file *);
 +
 +extern int hold_locked_index(struct lock_file *, int);
 +extern int commit_locked_index(struct lock_file *);
 +extern void set_alternate_index_output(const char *);
 +
  extern void rollback_lock_file(struct lock_file *);
- extern int delete_ref(const char *, unsigned char *sha1);
+ extern int delete_ref(const char *, const unsigned char *sha1);
  
  /* Environment bits from configuration mechanism */
  extern int use_legacy_headers;