diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-23 21:16:49 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-23 21:16:49 -0800 |
commit | d82dd26964b9d7b39fb74367e5fcc3e3f4593324 (patch) | |
tree | 98a0e47689e6494af3befdef3bbdad9dcdddabec /cache.h | |
parent | a29e7118141e9dc60bf81c42fa3485d3d39ef7cc (diff) | |
parent | 256b9d70a497534338f0c22101cb6566ab3f1665 (diff) | |
download | git-d82dd26964b9d7b39fb74367e5fcc3e3f4593324.tar.gz git-d82dd26964b9d7b39fb74367e5fcc3e3f4593324.tar.xz |
Merge branch 'cr/push-force-tag-update'
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"
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1011,7 +1011,6 @@ struct ref { requires_force:1, merge:1, nonfastforward:1, - not_forwardable:1, update:1, deletion:1; enum { |