diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-17 15:03:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-17 15:03:11 -0700 |
| commit | 6feba7cb744d5a19472ea0bf5b337ad8a32acf80 (patch) | |
| tree | 1cbf42ad236222f5df09a01711fcb1cda17ae776 /http-push.c | |
| parent | e190bc55431d906b8c70dc07f8b6d823721f12c9 (diff) | |
| parent | 1b65a5aa449e2ea99a68f5d13c5521d0dc64dfd1 (diff) | |
| download | git-6feba7cb744d5a19472ea0bf5b337ad8a32acf80.tar.xz | |
Merge branch 'jc/boundary'
* jc/boundary:
rev-list --boundary: show boundary commits even when limited otherwise.
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 19a0f772e7..114d01bced 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 |