Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep path when creating a new branch #21153

Merged
merged 4 commits into from
Sep 15, 2022
Merged

Keep path when creating a new branch #21153

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed7d986
Keep path when creating a new branch
JakobDev Sep 13, 2022
aff21fc
Move PathEscapeSegments
JakobDev Sep 15, 2022
adc8210
fix lint
wxiaoguang Sep 15, 2022
941f17a
Merge branch 'main' into newbranchpath
wxiaoguang Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion routers/web/repo/branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,5 +427,5 @@ func CreateBranch(ctx *context.Context) {
}

ctx.Flash.Success(ctx.Tr("repo.branch.create_success", form.NewBranchName))
ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(form.NewBranchName))
ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(form.NewBranchName) + "/" + form.CurrentPath)
JakobDev marked this conversation as resolved.
Show resolved Hide resolved
}
1 change: 1 addition & 0 deletions services/forms/repo_branch_form.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
// NewBranchForm form for creating a new branch
type NewBranchForm struct {
NewBranchName string `binding:"Required;MaxSize(100);GitRefName"`
CurrentPath string
CreateTag bool
}

Expand Down
3 changes: 3 additions & 0 deletions templates/repo/branch_dropdown.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@
{{.root.CsrfTokenHtml}}
<input type="hidden" name="new_branch_name" v-model="searchTerm">
<input type="hidden" name="create_tag" v-model="createTag">
{{if $.root.TreePath}}
<input type="hidden" name="current_path" value="{{PathEscapeSegments .root.TreePath}}">
wxiaoguang marked this conversation as resolved.
Show resolved Hide resolved
{{end}}
</form>
</div>
</div>
Expand Down