diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-16 22:07:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-16 22:07:28 -0700 |
| commit | 9893e3eb92561fbfa397d30d571ac471fda146ee (patch) | |
| tree | 507413793d05666387e0146a2370f7547af0716c /http-push.c | |
| parent | Merge branch 'master' into next (diff) | |
| parent | rev-list --boundary: show boundary commits even when limited otherwise. (diff) | |
| download | tgif-9893e3eb92561fbfa397d30d571ac471fda146ee.tar.xz | |
Merge branch 'jc/boundary' into next
* jc/boundary:
rev-list --boundary: show boundary commits even when limited otherwise.
Makefile fixups.
gitk: Fix bug caused by missing commitlisted elements
Diffstat (limited to 'http-push.c')
| -rw-r--r-- | http-push.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/http-push.c b/http-push.c index 4a9dcf2bf6..b4327d9243 100644 --- a/http-push.c +++ b/http-push.c @@ -60,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 |