summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorDavid Turner <dturner@twopensource.com>2016-04-07 19:03:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-10 18:35:46 (GMT)
commit41d796ed5cd78d159f8a8bfa3b54bdbe5d9383a3 (patch)
treeb1159d73e0dd45d1cc0f076a07ae49b488d834da /builtin/merge.c
parent2d0663b21661f2677bce5742204ccdd73745a062 (diff)
downloadgit-41d796ed5cd78d159f8a8bfa3b54bdbe5d9383a3.zip
git-41d796ed5cd78d159f8a8bfa3b54bdbe5d9383a3.tar.gz
git-41d796ed5cd78d159f8a8bfa3b54bdbe5d9383a3.tar.bz2
refs: on symref reflog expire, lock symref not referrent
When locking a symbolic ref to expire a reflog, lock the symbolic ref (using REF_NODEREF) instead of its referent. Add a test for this. Signed-off-by: David Turner <dturner@twopensource.com> Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions