X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=gitMergeCommon.py;h=fdbf9e4778fd7d44667e475ba659d64986b2e097;hp=ff6f58a07c8f46563d34876a70449d79d527300c;hb=HEAD;hpb=069b20a198f171512a1d2d2163b40f70c94f5257 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