33 lines
1.6 KiB
Diff
33 lines
1.6 KiB
Diff
diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
|
|
index 718454e063..8fa299710c 100644
|
|
--- a/routers/web/repo/commit.go
|
|
+++ b/routers/web/repo/commit.go
|
|
@@ -408,12 +408,6 @@ func Diff(ctx *context.Context) {
|
|
}
|
|
}
|
|
|
|
- ctx.Data["BranchName"], err = commit.GetBranchName()
|
|
- if err != nil {
|
|
- ctx.ServerError("commit.GetBranchName", err)
|
|
- return
|
|
- }
|
|
-
|
|
ctx.HTML(http.StatusOK, tplCommitPage)
|
|
}
|
|
|
|
diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
|
|
index c37fb46975..18c9cf18f8 100644
|
|
--- a/templates/repo/commit_page.tmpl
|
|
+++ b/templates/repo/commit_page.tmpl
|
|
@@ -71,8 +71,8 @@
|
|
"branchForm" "branch-dropdown-form"
|
|
"branchURLPrefix" (printf "%s/_cherrypick/%s/" $.RepoLink .CommitID) "branchURLSuffix" ""
|
|
"setAction" true "submitForm" true}}
|
|
- <form method="get" action="{{$.RepoLink}}/_cherrypick/{{.CommitID}}/{{if $.BranchName}}{{PathEscapeSegments $.BranchName}}{{else}}{{PathEscapeSegments $.Repository.DefaultBranch}}{{end}}" id="branch-dropdown-form">
|
|
- <input type="hidden" name="ref" value="{{if $.BranchName}}{{$.BranchName}}{{else}}{{$.Repository.DefaultBranch}}{{end}}">
|
|
+ <form method="get" action="{{$.RepoLink}}/_cherrypick/{{.CommitID}}/{{PathEscapeSegments $.Repository.DefaultBranch}}" id="branch-dropdown-form">
|
|
+ <input type="hidden" name="ref" value="{{$.Repository.DefaultBranch}}">
|
|
<input type="hidden" name="refType" value="branch">
|
|
<input type="hidden" id="cherry-pick-type" name="cherry-pick-type"><br>
|
|
<button type="submit" id="cherry-pick-submit" class="ui primary button"></button>
|