diff options
| author |  René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2012-10-16 12:22:15 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-10-16 10:08:23 -0700 |
| commit | 547d058fb6fefad147675a6d3fdb9439c57916a1 (patch) | |
| tree | 65dc80d8a08aacc7e6e61ac394894bac02fcbdb7 /t/t6034-merge-rename-nocruft.sh | |
| parent | Git 1.7.11 (diff) | |
| download | tgif-547d058fb6fefad147675a6d3fdb9439c57916a1.tar.xz | |
refs: lock symref that is to be deleted, not its target
When delete_ref is called on a symref then it locks its target and then
either deletes the target or the symref, depending on whether the flag
REF_NODEREF was set in the parameter delopt.
Instead, simply pass the flag to lock_ref_sha1_basic, which will then
either lock the target or the symref, and delete the locked ref.
This reimplements part of eca35a25 (Fix git branch -m for symrefs.).
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6034-merge-rename-nocruft.sh')
0 files changed, 0 insertions, 0 deletions