summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-17 22:17:29 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-17 22:17:29 -0700
commit17bee1947ac407c0a27f3ef7da573eacb848520e (patch)
treeb30b3390d9ddd04560f921b961678391f65af6f5
parent2c7801bdd194f33879d32bd109031ee3bf7eb632 (diff)
parent1401f46bb42d1eb6225a5e08543c06a5b18fd3b7 (diff)
downloadgit-17bee1947ac407c0a27f3ef7da573eacb848520e.tar.gz
Merge branch 'maint'
* maint: Use const qualifier for 'sha1' parameter in delete_ref function
-rw-r--r--cache.h2
-rw-r--r--refs.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index b1bd9e46c2..53c23413e4 100644
--- a/cache.h
+++ b/cache.h
@@ -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;
diff --git a/refs.c b/refs.c
index d2b7b7fb56..d7be2841c5 100644
--- a/refs.c
+++ b/refs.c
@@ -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;