From 1a07f1cd355eb2a7d0f398e984771b22b56df6fc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 30 Jan 2011 16:13:35 -0700 Subject: Catch the case where there is no branch merge point (#622592) --- src/pyfedpkg/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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): -- cgit