Merge "Keep modifications to GitPython objects in single module"

git_upstream/lib/note.py

@@ -15,7 +15,6 @@
 # limitations under the License.
 #
 
-from git import base
 from git import GitCommandError
 
 from git_upstream.errors import GitUpstreamError
@@ -68,7 +67,3 @@ def note_message(self, note_ref='refs/notes/commits'):
             return None
         else:
             raise e
-
-base.Object.add_note = add_note
-base.Object.append_note = append_note
-base.Object.note = note_message

git_upstream/lib/pygitcompat.py

@@ -16,6 +16,9 @@
 #
 
 import git
+from git import base
+
+from git_upstream.lib import note
 
 try:
     from git.objects.commit import Commit
@@ -119,3 +122,8 @@ if not hasattr(Commit, 'iter_items'):
     git.commit.Commit = GitUpstreamCompatCommit
 else:
     Commit.short = GitUpstreamCompatCommit.short
+
+
+base.Object.add_note = note.add_note
+base.Object.append_note = note.append_note
+base.Object.note = note.note_message