Skip to content

Commit 64cf06c

Browse files
committed
Changed name of the local branch to use a folder-like structure for requests
1 parent 0ae1f6d commit 64cf06c

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

git_repo/services/ext/github.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def request_fetch(self, user, repo, request, pull=False):
9393
for remote in self.repository.remotes:
9494
log.info('request_fetch, remote_name {}'.format(remote.name))
9595
if remote.name == self.name:
96-
local_branch_name = 'request-{}'.format(request)
96+
local_branch_name = 'request/{}'.format(request)
9797
self.fetch(
9898
remote,
9999
'pull/{}/head'.format(request),

tests/helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ def action_request_fetch(self, cassette_name, namespace, repository, request, pu
452452
self.service.connect()
453453
self.service.clone(namespace, repository, rw=False)
454454
self.service.request_fetch(repository, namespace, request)
455-
assert self.repository.branches[-1].name == 'request-{}'.format(request)
455+
assert self.repository.branches[-1].name == 'request/{}'.format(request)
456456

457457
def action_open(self, cassette_name, namespace, repository):
458458
self.set_mock_popen_commands([

tests/integration/test_main.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,6 @@ def test_request_fetch__bad_request(self, capsys, caplog):
181181
out, err = capsys.readouterr()
182182
assert ('guyzmo', 'git-repo', 'bad') == seen_args
183183
assert {} == extra_args
184-
print('out:', out)
185-
print('err:', caplog.text)
186184
assert out == ''
187185
assert 'Fatal error: bad request for merge!' in caplog.text
188186

0 commit comments

Comments
 (0)