summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/pyfedpkg/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py
index aae3105..9c1adf3 100644
--- a/src/pyfedpkg/__init__.py
+++ b/src/pyfedpkg/__init__.py
@@ -1023,7 +1023,10 @@ class PackageModule:
localbranch = self.repo.active_branch.name
except TypeError, e:
raise FedpkgError('Repo in inconsistent state: %s' % e)
- merge = self.repo.git.config('--get', 'branch.%s.merge' % localbranch)
+ try:
+ merge = self.repo.git.config('--get', 'branch.%s.merge' % localbranch)
+ except git.errors.GitCommandError, e:
+ raise FedpkgError('Unable to find remote branch. Use --dist')
return(merge.split('/')[2])
def _findmasterbranch(self):