diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-11-08 16:07:37 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-11-08 16:07:37 -0800 |
commit | 3b8572a4297d8720b359c82e1dd9afeb45cda3cd (patch) | |
tree | 88163ad281fc3b0e69246ccb026cddd4bae0b367 /builtin-tag.c | |
parent | 16088d8870b7da6d4dd280be2d1728dd3be346b5 (diff) | |
parent | 045a476f91a9a308c823a2709977163238baa3fd (diff) | |
download | git-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 'builtin-tag.c')
-rw-r--r-- | builtin-tag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-tag.c b/builtin-tag.c index f2853d08c..5b141c584 100644 --- a/builtin-tag.c +++ b/builtin-tag.c @@ -125,7 +125,7 @@ static int for_each_tag_name(const char **argv, each_tag_name_fn fn) static int delete_tag(const char *name, const char *ref, const unsigned char *sha1) { - if (delete_ref(ref, sha1)) + if (delete_ref(ref, sha1, 0)) return 1; printf("Deleted tag '%s'\n", name); return 0; |