diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-05 22:33:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-05 22:33:19 +0300 |
| commit | efcce2e1f0b37aed045d3e2b747380adf418bdd2 (patch) | |
| tree | 709170cd9b9dbb34b9873bd482bf5f5f03ffd414 /builtin-tag.c | |
| parent | 7bc9ed0d5b3dd2fb61cad033bb19e72358d54227 (diff) | |
| parent | 045a476f91a9a308c823a2709977163238baa3fd (diff) | |
Merge branch 'mv/maint-branch-m-symref'
* 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 b13fa34d8c..1ff7b37162 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; |