X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=gitMergeCommon.py;h=fdbf9e4778fd7d44667e475ba659d64986b2e097;hb=ae448e3854d8b6e7e37aa88fa3917f5dd97f3210;hp=ff6f58a07c8f46563d34876a70449d79d527300c;hpb=5e80092f7e6db09a40a62e837ca3f74f0bc5ad73;p=git.git diff --git a/gitMergeCommon.py b/gitMergeCommon.py index ff6f58a0..fdbf9e47 100644 --- a/gitMergeCommon.py +++ b/gitMergeCommon.py @@ -107,7 +107,10 @@ def isSha(obj): return (type(obj) is str and bool(shaRE.match(obj))) or \ (type(obj) is int and obj >= 1) -class Commit: +class Commit(object): + __slots__ = ['parents', 'firstLineMsg', 'children', '_tree', 'sha', + 'virtual'] + def __init__(self, sha, parents, tree=None): self.parents = parents self.firstLineMsg = None