aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-08 16:07:37 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-08 16:07:37 -0800
commit3b8572a4297d8720b359c82e1dd9afeb45cda3cd (patch)
tree88163ad281fc3b0e69246ccb026cddd4bae0b367 /cache.h
parent16088d8870b7da6d4dd280be2d1728dd3be346b5 (diff)
parent045a476f91a9a308c823a2709977163238baa3fd (diff)
downloadgit-3b8572a4297d8720b359c82e1dd9afeb45cda3cd.tar.gz
git-3b8572a4297d8720b359c82e1dd9afeb45cda3cd.tar.xz
Merge branch 'mv/maint-branch-m-symref' into maint
* mv/maint-branch-m-symref: update-ref --no-deref -d: handle the case when the pointed ref is packed git branch -m: forbid renaming of a symref Fix git update-ref --no-deref -d. rename_ref(): handle the case when the reflog of a ref does not exist Fix git branch -m for symrefs.
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 74339edaa..39f24ad82 100644
--- a/cache.h
+++ b/cache.h
@@ -424,7 +424,7 @@ extern int commit_locked_index(struct lock_file *);
extern void set_alternate_index_output(const char *);
extern int close_lock_file(struct lock_file *);
extern void rollback_lock_file(struct lock_file *);
-extern int delete_ref(const char *, const unsigned char *sha1);
+extern int delete_ref(const char *, const unsigned char *sha1, int delopt);
/* Environment bits from configuration mechanism */
extern int trust_executable_bit;