Merge branch 'sg/complete-decorate-full-not-long'

diff --git a/commit.h b/commit.h
index 9f189cb054266cd8f8c084853afbb678ca56c9e9..ed3a1d59a553b498b20d28f4999effde78e51c3c 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -226,9 +226,9 @@ enum rev_sort_order {
 void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
 
 struct commit_graft {
-       unsigned char sha1[20];
+       struct object_id oid;
        int nr_parent; /* < 0 if shallow commit */
-       unsigned char parent[FLEX_ARRAY][20]; /* more */
+       struct object_id parent[FLEX_ARRAY]; /* more */
 };
 typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);