unpack-trees: do not fail reset because of unmerged skipped entry

diff --git a/commit.h b/commit.h
index 10e34e1a18b726b0168a9fe2e4937a23d6cefd11..c3af512f8b1b90b3963d0921f7ec0d0a43a2fcbe 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -19,7 +19,6 @@ struct commit_list {
 struct commit {
        struct object object;
        void *util;
-       unsigned int index;
        timestamp_t date;
        struct commit_list *parents;
 
@@ -30,6 +29,7 @@ struct commit {
         */
        struct tree *maybe_tree;
        uint32_t graph_pos;
+       unsigned int index;
 };
 
 extern int save_commit_buffer;