summaryrefslogtreecommitdiff
path: root/transport.h
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2012-11-29 19:41:34 -0600
committerJunio C Hamano <gitster@pobox.com>2012-12-02 01:39:50 -0800
commitb24e6047a8da3cddfd686e6a9157ed4bac28ed4f (patch)
tree6cb17f7ea002a44c823a5c034f5cb856249afe81 /transport.h
parent10643d4ec3b9c5898d93d1c20e98b2ff1906bf79 (diff)
downloadgit-b24e6047a8da3cddfd686e6a9157ed4bac28ed4f.tar.gz
push: add advice for rejected tag reference
Advising the user to fetch and merge only makes sense if the rejected reference is a branch. If none of the rejections are for branches, just tell the user the reference already exists. Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport.h')
-rw-r--r--transport.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/transport.h b/transport.h
index 404b113014..bfd2df5823 100644
--- a/transport.h
+++ b/transport.h
@@ -142,6 +142,7 @@ 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
int transport_push(struct transport *connection,
int refspec_nr, const char **refspec, int flags,