summaryrefslogtreecommitdiff
path: root/object.h
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2018-05-15 23:42:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-16 02:42:03 (GMT)
commit6a1a79fd146510a7f1a6e6303d5adb1f8f298989 (patch)
tree053ad42391dbd5a57faf3902c0c3d9930a3fd0bf /object.h
parentcbd53a2193d11e83b5bad2c3514bd1603074bc36 (diff)
downloadgit-6a1a79fd146510a7f1a6e6303d5adb1f8f298989.zip
git-6a1a79fd146510a7f1a6e6303d5adb1f8f298989.tar.gz
git-6a1a79fd146510a7f1a6e6303d5adb1f8f298989.tar.bz2
object: move grafts to object parser
Grafts are only meaningful in the context of a single repository. Therefore they cannot be global. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object.h')
-rw-r--r--object.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/object.h b/object.h
index 7916edb..ec908f9 100644
--- a/object.h
+++ b/object.h
@@ -12,6 +12,10 @@ struct parsed_object_pool {
struct alloc_state *tag_state;
struct alloc_state *object_state;
unsigned commit_count;
+
+ /* parent substitutions from .git/info/grafts and .git/shallow */
+ struct commit_graft **grafts;
+ int grafts_alloc, grafts_nr;
};
struct parsed_object_pool *parsed_object_pool_new(void);