X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=http-push.c;h=114d01bced1cb3f9a906c7c0df85bf5cd2b811e0;hb=8f2b72a93666afe63ab39b279bbd4088bd5463ca;hp=994ee90035c4ae5e055df79cea8621d294190a3f;hpb=b5b1442ac35706ce1e3daed407dd935f0e9dd796;p=git.git diff --git a/http-push.c b/http-push.c index 994ee900..114d01bc 100644 --- a/http-push.c +++ b/http-push.c @@ -6,6 +6,7 @@ #include "blob.h" #include "http.h" #include "refs.h" +#include "diff.h" #include "revision.h" #include "exec_cmd.h" @@ -59,12 +60,12 @@ enum XML_Status { #define LOCK_TIME 600 #define LOCK_REFRESH 30 -/* bits #0-6 in revision.h */ +/* bits #0-15 in revision.h */ -#define LOCAL (1u << 7) -#define REMOTE (1u << 8) -#define FETCHING (1u << 9) -#define PUSHING (1u << 10) +#define LOCAL (1u<<16) +#define REMOTE (1u<<17) +#define FETCHING (1u<<18) +#define PUSHING (1u<<19) /* We allow "recursive" symbolic refs. Only within reason, though */ #define MAXDEPTH 5