Merge branch 'pw/git-p4-on-cygwin'

diff --git a/transport.h b/transport.h
index ac5a9f57d1051ba74fbf641f11d8c965faf8f078..a3450e97c0d0d94778a4b635efdd53b724eb70c2 100644 (file)
--- 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,