Merge branch 'ib/scripted-parse-opt-better-hint-string' into maint

diff --git a/commit.h b/commit.h
index 4789839bd02dd638ef03e7b42c4a1b3f9824455f..9a1fa961d2ba0e3ec3eae9096ef49bc7155cdd92 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -230,9 +230,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 *);