summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-10 15:58:41 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-10 15:58:41 -0700
commit5910e997754e0a03f25457965bd9faf80f2f9854 (patch)
tree6e0a8f0899723f403cc0548b5b2c21bb9d267487 /http-push.c
parent77882f60d9df2fd410ba7d732b01738315643c05 (diff)
parent3381c790e5ca04326d26e1dd9ff482961c6e425b (diff)
downloadgit-5910e997754e0a03f25457965bd9faf80f2f9854.tar.gz
Merge branch 'lt/rev'
* lt/rev: Make "--parents" logs also be incremental
Diffstat (limited to 'http-push.c')
-rw-r--r--http-push.c10
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