diff options
| author | Colin Walters <walters@verbum.org> | 2010-03-09 11:18:07 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-03-09 11:18:07 -0500 |
| commit | f3d68d400f5cab374d7ab20a9d527f46ff744556 (patch) | |
| tree | c4b3fc901bb3ebd60844f33d5fef6939aff33a23 | |
| parent | 60564d2a62a446e6878d23870a4a48ec4e7b4291 (diff) | |
| download | fedpkg-make-pull-f3d68d400f5cab374d7ab20a9d527f46ff744556.tar.gz fedpkg-make-pull-f3d68d400f5cab374d7ab20a9d527f46ff744556.tar.xz fedpkg-make-pull-f3d68d400f5cab374d7ab20a9d527f46ff744556.zip | |
[fedpkg-vcs] Use correct branch when switching to default revision
| -rw-r--r--[-rwxr-xr-x] | fedpkg-vcs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fedpkg-vcs b/fedpkg-vcs index 7093241..b5b1a1f 100755..100644 --- a/fedpkg-vcs +++ b/fedpkg-vcs @@ -118,9 +118,9 @@ class GitVcs(Vcs): def switch_to_revision(self, directory, newid): if newid is None: - newid = 'master' + newid = self._branch or 'master' self._vcs_exec(['git', 'checkout', newid], cwd=directory) - + def get_commit_summary_as_filename(self, directory, commitid): output = subprocess.Popen(['git', 'show', '--format=%f', commitid], stdout=subprocess.PIPE, cwd=directory).communicate()[0] return output.split('\n')[0] @@ -479,7 +479,7 @@ def main(): if len(args) < 1: usage(1) - + cmd = args[0] if cmd == 'pull-update': cmd = 'pull-retarget' |