Commit 3dd660fe authored by Jonas Bernoulli's avatar Jonas Bernoulli

magit-branch-pull-request: Always set branch.<name>.rebase

Previously this wasn't done for pull-requests from the upstream
repository, even though the documentation said it was always done.
parent 50d0ea2a
......@@ -412,11 +412,11 @@ Please see the manual for more information."
.head.repo.git_url)
(t (error "%s has an unexpected format" upstream-url)))))
(magit-call-git "branch" branch (concat remote "/" pr-branch))
(magit-set "true" "branch" branch "rebase")
(if (or .locked (not (equal branch pr-branch)))
(magit-set upstream "branch" branch "pushRemote")
(magit-set remote "branch" branch "pushRemote"))
(magit-set remote "branch" branch "pullRequestRemote"))
(magit-set "true" "branch" branch "rebase")
(magit-call-git "branch" branch
(concat "--set-upstream-to="
(if magit-branch-prefer-remote-upstream
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment