Merge branch 'maint'

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

diff --combined cache.h
index b1bd9e46c2bd64e00b671ff5ed512d9c12b53309,7cedda684f81e5b7bc111c2322ef1f4b2fc97d90..53c23413e4ba0b6c43632be821c69c8eb80db857
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -128,6 -128,7 +128,6 @@@ static inline unsigned int ce_mode_from
  extern struct cache_entry **active_cache;
  extern unsigned int active_nr, active_alloc, active_cache_changed;
  extern struct cache_tree *active_cache_tree;
 -extern int cache_errno;
  
  enum object_type {
        OBJ_BAD = -1,
@@@ -187,7 -188,7 +187,7 @@@ extern int add_cache_entry(struct cache
  extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);
  extern int remove_cache_entry_at(int pos);
  extern int remove_file_from_cache(const char *path);
 -extern int add_file_to_index(const char *path, int verbose);
 +extern int add_file_to_cache(const char *path, int verbose);
  extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
  extern int ce_match_stat(struct cache_entry *ce, struct stat *st, int);
  extern int ce_modified(struct cache_entry *ce, struct stat *st, int);
@@@ -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;
@@@ -432,7 -428,7 +432,7 @@@ extern unsigned char* use_pack(struct p
  extern void unuse_pack(struct pack_window **);
  extern struct packed_git *add_packed_git(const char *, int, int);
  extern uint32_t num_packed_objects(const struct packed_git *p);
 -extern int nth_packed_object_sha1(const struct packed_git *, uint32_t, unsigned char*);
 +extern const unsigned char *nth_packed_object_sha1(const struct packed_git *, uint32_t);
  extern off_t find_pack_entry_one(const unsigned char *, struct packed_git *);
  extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *);
  extern unsigned long unpack_object_header_gently(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
@@@ -496,7 -492,4 +496,7 @@@ extern void trace_argv_printf(const cha
  extern int convert_to_git(const char *path, char **bufp, unsigned long *sizep);
  extern int convert_to_working_tree(const char *path, char **bufp, unsigned long *sizep);
  
 +/* match-trees.c */
 +void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);
 +
  #endif /* CACHE_H */