diff options
author | Miklos Vajna <vmiklos@frugalware.org> | 2008-10-26 03:33:56 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-10-26 14:42:57 -0700 |
commit | eca35a25a92a1ad725af2a549fc9158488c4cc43 (patch) | |
tree | d598c2304f5c3f6d4bee5aa2cb4ce15fab117bf2 /cache.h | |
parent | 031e6c898f61db1ae0c0be641eac6532c1000d56 (diff) | |
download | git-eca35a25a92a1ad725af2a549fc9158488c4cc43.tar.gz |
Fix git branch -m for symrefs.
This had two problems with symrefs. First, it copied the actual sha1
instead of the "pointer", second it failed to remove the old ref after a
successful rename.
Given that till now delete_ref() always dereferenced symrefs, a new
parameters has been introduced to delete_ref() to allow deleting refs
without a dereference.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -420,7 +420,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; |