release-engineering/tito
1
0
Fork 0
mirror of https://github.com/rpm-software-management/tito.git synced 2025-02-23 20:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert 45d431ad14

Browse source 
- The original change made the assumption that the git_branches[0]
  is the actual branch name that we are on, but that was incorrect.
This commit is contained in:
Nikos Moumoulidis 2022-08-23 14:31:07 +02:00 • committed by Jakub Kadlčík
parent 4c4b1268b3
commit 813713b290
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/tito/release/distgit.py
View file

@ -552,7 +552,7 @@ class DistGitMeadReleaser(DistGitReleaser):
self.push_url = self.push_url.replace(MEAD_SCM_USERNAME, user) self.push_url = self.push_url.replace(MEAD_SCM_USERNAME, user)
def _sync_mead_scm(self): def _sync_mead_scm(self):
cmd = "git push --follow-tags %s %s" % (self.push_url, self.git_branches[0]) cmd = "git push %s %s" % (self.push_url, self.builder.build_tag)
if self.dry_run: if self.dry_run:
self.print_dry_run_warning(cmd) self.print_dry_run_warning(cmd)
@ -565,9 +565,9 @@ class DistGitMeadReleaser(DistGitReleaser):
except RunCommandException as e: except RunCommandException as e:
if "rejected" in e.output: if "rejected" in e.output:
if self._ask_yes_no("The remote rejected a push. Force push? [y/n] ", False): if self._ask_yes_no("The remote rejected a push. Force push? [y/n] ", False):
run_command("git push --force --follow-tags %s %s" % (self.push_url, self.git_branches[0])) run_command("git push --force %s %s" % (self.mead_scm, self.builder.build_tag))
else: else:
error_out("Could not sync with %s" % self.push_url) error_out("Could not sync with %s" % self.mead_scm)
raise raise
def _git_release(self): def _git_release(self):