Merge branch 'maint'

* maint:
  Use const qualifier for 'sha1' parameter in delete_ref function
This commit is contained in:
Junio C Hamano 2007-04-17 22:17:29 -07:00
commit 17bee1947a
2 changed files with 2 additions and 2 deletions

View File

@ -217,7 +217,7 @@ 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;

2
refs.c
View File

@ -705,7 +705,7 @@ static int repack_without_ref(const char *refname)
return commit_lock_file(&packlock);
}
int delete_ref(const char *refname, unsigned char *sha1)
int delete_ref(const char *refname, const unsigned char *sha1)
{
struct ref_lock *lock;
int err, i, ret = 0, flag = 0;