diff --git a/pagure/api/fork.py b/pagure/api/fork.py index e8caa41..61aae66 100644 --- a/pagure/api/fork.py +++ b/pagure/api/fork.py @@ -294,7 +294,7 @@ def api_pull_request_merge(repo, requestid, username=None): try: message = pagure.lib.git.merge_pull_request( - SESSION, repo, request, flask.g.fas_user.username, + SESSION, request, flask.g.fas_user.username, APP.config['REQUESTS_FOLDER']) output['message'] = message except pagure.exceptions.PagureException as err: diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 2aca20f..9d57c7e 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -825,7 +825,7 @@ def get_branch_ref(repo, branchname): return branch_ref -def merge_pull_request(session, repo, request, username, request_folder): +def merge_pull_request(session, request, username, request_folder): ''' Merge the specified pull-request. ''' # Get the fork @@ -867,7 +867,7 @@ def merge_pull_request(session, repo, request, username, request_folder): ori_remote = new_repo.remotes[0] # Add the fork as remote repo - reponame = '%s_%s' % (request.user.user, repo.name) + reponame = '%s_%s' % (request.user.user, request.project_from.name) remote = new_repo.create_remote(reponame, repopath) # Fetch the commits diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 952b7f4..3f25ac1 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -434,7 +434,7 @@ def merge_request_pull(repo, requestid, username=None): try: message = pagure.lib.git.merge_pull_request( - SESSION, repo, request, flask.g.fas_user.username, + SESSION, request, flask.g.fas_user.username, APP.config['REQUESTS_FOLDER']) flask.flash(message) except pagure.exceptions.PagureException as err: