summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-25 18:44:17 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-25 18:44:17 -0800
commitcf22e272e48a1b00ea0288400e1363ac41c5eb99 (patch)
tree6e947c4e5220c13df5ebb3ed98d517d5af2b106b /refs.c
parent76c39289bac153ddb661062dcc25881c690c20e5 (diff)
parentb274a7146c44624bc30bbd54124312d4d3e6a28d (diff)
downloadgit-cf22e272e48a1b00ea0288400e1363ac41c5eb99.tar.gz
Merge branch 'jh/update-ref-d-through-symref'
"update-ref -d --deref SYM" to delete a ref through a symbolic ref that points to it did not remove it correctly. * jh/update-ref-d-through-symref: Fix failure to delete a packed ref through a symref t1400-update-ref: Add test verifying bug with symrefs in delete_ref()
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/refs.c b/refs.c
index 726c53c540..6cec1c8bdf 100644
--- a/refs.c
+++ b/refs.c
@@ -1779,7 +1779,7 @@ int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
* packed one. Also, if it was not loose we need to repack
* without it.
*/
- ret |= repack_without_ref(refname);
+ ret |= repack_without_ref(lock->ref_name);
unlink_or_warn(git_path("logs/%s", lock->ref_name));
invalidate_ref_cache(NULL);