summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen@ergo-project.org>2010-08-12 14:26:50 +0100
committerJesse Keating <jkeating@redhat.com>2010-08-23 22:14:22 -0700
commit3d884578840228323eb7f49827246313953056cf (patch)
tree3218d966097b1b4c26e46d54ec1926c7ae8ae7b4
parentb81bd912b00d2cabfa66390ff86f9e9c551b7302 (diff)
downloadfedora-packager-3d884578840228323eb7f49827246313953056cf.zip
fedora-packager-3d884578840228323eb7f49827246313953056cf.tar.gz
fedora-packager-3d884578840228323eb7f49827246313953056cf.tar.xz
Use the correct remote when listing revs
-rw-r--r--src/pyfedpkg/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py
index 622717b..1e8b798 100644
--- a/src/pyfedpkg/__init__.py
+++ b/src/pyfedpkg/__init__.py
@@ -994,8 +994,11 @@ class PackageModule:
# pushed or not
branch = self.repo.active_branch
remote = self.repo.git.config('--get',
- 'branch.%s.merge' % branch).replace('refs/heads', 'origin')
- if self.repo.git.rev_list('%s...%s' % (branch, remote)):
+ 'branch.%s.remote' % branch)
+
+ merge = self.repo.git.config('--get',
+ 'branch.%s.merge' % branch).replace('refs/heads', remote)
+ if self.repo.git.rev_list('%s...%s' % (branch, merge)):
raise FedpkgError('There are unpushed changes in your repo')
# Get the commit hash to build
commit = self.repo.iter_commits().next().sha