diff options
author | Chris Rorvick <chris@rorvick.com> | 2012-11-29 19:41:39 -0600 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-12-02 01:45:13 -0800 |
commit | 80054cf9d53aad76631797d76ce33a56c855c61a (patch) | |
tree | e09b18a69c081bba660785c9f9ec19c5e6ec62fe /compat/terminal.c | |
parent | push: require force for annotated tags (diff) | |
download | tgif-80054cf9d53aad76631797d76ce33a56c855c61a.tar.xz |
push: clarify rejection of update to non-commit-ish
Pushes must already (by default) update to a commit-ish due to the fast-
forward check in set_ref_status_for_push(). But rejecting for not being
a fast-forward suggests the situation can be resolved with a merge.
Flag these updates (i.e., to a blob or a tree) as not forwardable so the
user is presented with more appropriate advice.
While updating *from* a tag object is potentially destructive, updating
*to* a tag is not. Additionally, a push to the refs/tags/ hierarchy is
already excluded from fast-forwarding, and refs/heads/ is protected from
anything but commit objects by a check in write_ref_sha1(). Thus
someone fast-forwarding to a tag is probably not doing so by accident.
Since updating to a tag is benign and unlikely to cause confusion, allow
it in case someone finds the behavior useful.
Signed-off-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/terminal.c')
0 files changed, 0 insertions, 0 deletions