diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-10 16:44:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-10 16:44:59 -0700 |
| commit | 6d46a23bf6e009487166f044b8c759aa734b8f90 (patch) | |
| tree | b6b3d18ff7a60585921674bc043fe6dd514a3f8c /http-push.c | |
| parent | 52b70d56bd23811003a72866cc23a0a44b9da1b7 (diff) | |
| parent | 5910e997754e0a03f25457965bd9faf80f2f9854 (diff) | |
| download | git-6d46a23bf6e009487166f044b8c759aa734b8f90.tar.gz | |
Merge branch 'master' into jc/diff
* master:
Make "--parents" logs also be incremental
Retire diffcore-pathspec.
Improve the git-diff-tree -c/-cc documentation
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 b60fa8d241..57cefdea53 100644 --- a/http-push.c +++ b/http-push.c @@ -59,12 +59,12 @@ enum XML_Status { #define LOCK_TIME 600 #define LOCK_REFRESH 30 -/* bits #0-4 in revision.h */ +/* bits #0-6 in revision.h */ -#define LOCAL (1u << 5) -#define REMOTE (1u << 6) -#define FETCHING (1u << 7) -#define PUSHING (1u << 8) +#define LOCAL (1u << 7) +#define REMOTE (1u << 8) +#define FETCHING (1u << 9) +#define PUSHING (1u << 10) /* We allow "recursive" symbolic refs. Only within reason, though */ #define MAXDEPTH 5 |