branch -d: avoid repeated symref resolution
commit62a2d52514aed2b684409cb48e40e0cd14335d1b
authorJonathan Nieder <jrnieder@gmail.com>
Thu, 11 Sep 2014 01:22:48 +0000 (10 18:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Oct 2014 17:47:25 +0000 (15 10:47 -0700)
tree609d4997c69205497bbd6103c0d76f49e22b91e8
parent014e7db3f5563a61cefbe1f6f5747931c799a37e
branch -d: avoid repeated symref resolution

If a repository gets in a broken state with too much symref nesting,
it cannot be repaired with "git branch -d":

 $ git symbolic-ref refs/heads/nonsense refs/heads/nonsense
 $ git branch -d nonsense
 error: branch 'nonsense' not found.

Worse, "git update-ref --no-deref -d" doesn't work for such repairs
either:

 $ git update-ref -d refs/heads/nonsense
 error: unable to resolve reference refs/heads/nonsense: Too many levels of symbolic links

Fix both by teaching resolve_ref_unsafe a new RESOLVE_REF_NO_RECURSE
flag and passing it when appropriate.

Callers can still read the value of a symref (for example to print a
message about it) with that flag set --- resolve_ref_unsafe will
resolve one level of symrefs and stop there.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Reviewed-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/branch.c
cache.h
refs.c
refs.h
t/t1400-update-ref.sh
t/t3200-branch.sh