GitRepository.set_upstream_branch: Catch errors to set upstream branch

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index e172aad68af80ff7c260a822309ee1e829370a73..03963670b8ed40a105396658237ffa3034f5910c 100644 (file)
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -538,8 +538,15 @@ class GitRepository(object):
             if not self.has_branch(branch, remote=remote):
                 raise GitRepositoryError("Branch %s doesn't exist!" % branch)
 
-        self._git_inout('branch', ["--set-upstream", local_branch, upstream],
-                        capture_stderr=True)
+        dummy, err, ret = self._git_inout('branch',
+                                          ['--set-upstream',
+                                           local_branch,
+                                           upstream],
+                                          capture_stderr=True)
+        if ret:
+            raise GitRepositoryError(
+                "Failed to set upstream branch '%s' for '%s': %s" %
+                (upstream, local_branch, err.strip()))
 
     def get_upstream_branch(self, local_branch):
         """