Merge fixes up to GIT 1.0.4

diff --git a/tree.h b/tree.h
index 768e5e9eb894d37c0dca452bc7d96a1271035b55..57a5bf71f2f5f6eb8f4f75709670d36ee6976683 100644 (file)
--- a/tree.h
+++ b/tree.h
@@ -18,7 +18,6 @@ struct tree_entry_list {
                struct tree *tree;
                struct blob *blob;
        } item;
-       struct tree_entry_list *parent;
 };
 
 struct tree {