From: Junio C Hamano <junkio@cox.net>
Date: Wed, 18 Apr 2007 05:17:29 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc0~35
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=17bee1947ac407c0a27f3ef7da573eacb848520e;p=git.git

Merge branch 'maint'

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

17bee1947ac407c0a27f3ef7da573eacb848520e
diff --cc cache.h
index b1bd9e46c,7cedda684..53c23413e
--- a/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;