X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=http-push.c;h=f492a5d36678a996ff2c665cacc8cfc69eb10f6f;hb=3a7c352bd0ecac4b4c96c0995d61de9ef8d814f9;hp=4a9dcf2bf64887735573d7c02b6b9f21ad4644f6;hpb=b2934926dd7455de61577c1dfdf4c12d224e7ae0;p=git.git

diff --git a/http-push.c b/http-push.c
index 4a9dcf2b..f492a5d3 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
@@ -1733,9 +1733,9 @@ static struct object_list **process_tree(struct tree *tree,
 	while (entry) {
 		struct tree_entry_list *next = entry->next;
 		if (entry->directory)
-			p = process_tree(entry->item.tree, p, &me, entry->name);
+			p = process_tree(lookup_tree(entry->sha1), p, &me, entry->name);
 		else
-			p = process_blob(entry->item.blob, p, &me, entry->name);
+			p = process_blob(lookup_blob(entry->sha1), p, &me, entry->name);
 		free(entry);
 		entry = next;
 	}