path: root/http-push.c
diff options
authorLinus Torvalds <>2006-04-09 00:05:58 (GMT)
committerJunio C Hamano <>2006-04-09 06:37:21 (GMT)
commit3381c790e5ca04326d26e1dd9ff482961c6e425b (patch)
tree818873fa577518a411361646f45aafdd5753715c /http-push.c
parent0ed49a3ed9ab9747f7916c928d50aa0bf4d2c81d (diff)
Make "--parents" logs also be incremental
The parent rewriting feature caused us to create the whole history in one go, and then simplify it later, because of how rewrite_parents() had been written. However, with a little tweaking, it's perfectly possible to do even that one incrementally. Right now, this doesn't really much matter, because every user of "--parents" will probably generally _also_ use "--topo-order", which will cause the old non-incremental behaviour anyway. However, I'm hopeful that we could make even the topological sort incremental, or at least _partially_ so (for example, make it incremental up to the first merge). In the meantime, this at least moves things in the right direction, and removes a strange special case. Signed-off-by: Linus Torvalds <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'http-push.c')
1 files changed, 5 insertions, 5 deletions
diff --git a/http-push.c b/http-push.c
index b60fa8d..57cefde 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