command_wrappers.py: add a GitMerge wrapper class.

1 files changed, 8 insertions, 0 deletions

diff --git a/gbp/command_wrappers.py b/gbp/command_wrappers.py
index 1e4c9448..0fa33745 100644
--- a/gbp/command_wrappers.py
+++ b/gbp/command_wrappers.py
@@ -204,6 +204,14 @@ class GitPull(GitCommand):
         self.run_error = 'Couldn\'t pull "%s" to "%s"' % (branch, repo)
 
 
+class GitMerge(GitCommand):
+    """Wrap git merge"""
+    def __init__(self, branch, verbose=False):
+        verbose = [ ['--no-summary'], [] ][verbose]
+        GitCommand.__init__(self, 'merge', [branch] + verbose)
+        self.run_error = 'Couldn\'t merge from "%s"' % (branch,)
+
+
 class GitTag(GitCommand):
     """Wrap git tag"""
     def __init__(self, sign_tag=False, keyid=None):