Merge ~racb/git-ubuntu:atomic-push into git-ubuntu:master

Proposed by Robie Basak
Status: Merged
Merge reported by: Nish Aravamudan
Merged at revision: 98b149c871d1e1cecfe5c5c8e21a20b8f9279ddb
Proposed branch: ~racb/git-ubuntu:atomic-push
Merge into: git-ubuntu:master
Diff against target: 20 lines (+5/-4)
1 file modified
gitubuntu/importer.py (+5/-4)
Reviewer Review Type Date Requested Status
Nish Aravamudan Approve
Review via email: mp+327374@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Nish Aravamudan (nacc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/gitubuntu/importer.py b/gitubuntu/importer.py
2index b1d92cd..d2e2421 100644
3--- a/gitubuntu/importer.py
4+++ b/gitubuntu/importer.py
5@@ -1267,10 +1267,11 @@ class GitUbuntuImport:
6 if no_push:
7 logging.info('Not pushing to remote as specified')
8 else:
9- self.local_repo.git_run(['push', 'pkg',
10- 'refs/heads/%s/*:refs/heads/*' % self.namespace])
11- self.local_repo.git_run(['push', 'pkg',
12- 'refs/tags/%s/*:refs/tags/*' % self.namespace])
13+ self.local_repo.git_run([
14+ 'push', '--atomic', 'pkg',
15+ 'refs/heads/%s/*:refs/heads/*' % self.namespace,
16+ 'refs/tags/%s/*:refs/tags/*' % self.namespace,
17+ ])
18 lp = launchpad_login_auth()
19 lp_git_repo = lp.git_repositories.getByPath(
20 path='~%s/ubuntu/+source/%s/+git/%s' %

Subscribers

People subscribed via source and target branches