Merge branch 'mv/maint-branch-m-symref'

* mv/maint-branch-m-symref:
  update-ref --no-deref -d: handle the case when the pointed ref is packed
  git branch -m: forbid renaming of a symref
  Fix git update-ref --no-deref -d.
  rename_ref(): handle the case when the reflog of a ref does not exist
  Fix git branch -m for symrefs.

diff --cc builtin-branch.c
Simple merge

diff --cc builtin-receive-pack.c
Simple merge

diff --cc builtin-remote.c
Simple merge

diff --cc builtin-send-pack.c
Simple merge

diff --cc builtin-tag.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc refs.c
Simple merge