diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2014-09-10 18:22:48 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-10-15 10:47:25 -0700 |
| commit | 62a2d52514aed2b684409cb48e40e0cd14335d1b (patch) | |
| tree | 609d4997c69205497bbd6103c0d76f49e22b91e8 /builtin/branch.c | |
| parent | reflog test: test interaction with detached HEAD (diff) | |
| download | tgif-62a2d52514aed2b684409cb48e40e0cd14335d1b.tar.xz | |
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>
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 6491bacd69..2ad2d0b44a 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -236,7 +236,8 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, free(name); name = mkpathdup(fmt, bname.buf); - target = resolve_ref_unsafe(name, 0, sha1, &flags); + target = resolve_ref_unsafe(name, RESOLVE_REF_NO_RECURSE, + sha1, &flags); if (!target || (!(flags & REF_ISSYMREF) && is_null_sha1(sha1))) { error(remote_branch |