Merge branch 'cr/push-force-tag-update'
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Jan 2013 05:16:49 +0000 (23 21:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Jan 2013 05:16:49 +0000 (23 21:16 -0800)
Regression fix to stop "git push" complaining "target ref already
exists", when it is not the real reason the command rejected the
request (e.g. non-fast-forward).

* cr/push-force-tag-update:
  push: fix "refs/tags/ hierarchy cannot be updated without --force"

1  2 
cache.h
remote.c

diff --cc cache.h
Simple merge
diff --cc remote.c
Simple merge