diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-04 19:25:04 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-04 19:25:04 +0100 |
| commit | 370855e967e21d9c5b70df7b5cd3756c7bed5c7c (patch) | |
| tree | 80d1f70f82ec587ca4919d2289d6087d4979009c /transport.h | |
| parent | Merge branch 'jk/config-parsing-cleanup' (diff) | |
| parent | push: finishing touches to explain REJECT_ALREADY_EXISTS better (diff) | |
| download | git-370855e967e21d9c5b70df7b5cd3756c7bed5c7c.tar.xz git-370855e967e21d9c5b70df7b5cd3756c7bed5c7c.zip | |
Merge branch 'jc/push-reject-reasons'
Improve error and advice messages given locally when "git push"
refuses when it cannot compute fast-forwardness by separating these
cases from the normal "not a fast-forward; merge first and push
again" case.
* jc/push-reject-reasons:
push: finishing touches to explain REJECT_ALREADY_EXISTS better
push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE
push: further simplify the logic to assign rejection reason
push: further clean up fields of "struct ref"
Diffstat (limited to 'transport.h')
| -rw-r--r-- | transport.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/transport.h b/transport.h index ac5a9f57d1..a3450e97c0 100644 --- a/transport.h +++ b/transport.h @@ -144,6 +144,8 @@ void transport_set_verbosity(struct transport *transport, int verbosity, #define REJECT_NON_FF_HEAD 0x01 #define REJECT_NON_FF_OTHER 0x02 #define REJECT_ALREADY_EXISTS 0x04 +#define REJECT_FETCH_FIRST 0x08 +#define REJECT_NEEDS_FORCE 0x10 int transport_push(struct transport *connection, int refspec_nr, const char **refspec, int flags, |