0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-29 19:54:27 +01:00
gitea/modules/git
Lunny Xiao 4344a64107
Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177)
* Allow custom default merge message with .gitea/MERGE_MESSAGE_<merge_style>_TEMPLATE.md

* Some improvements

* Follow some advices

* Fix bug

* Fix bug

* Fix lint

* Fix close comment

* Fix test

* Fix and docs

* Improve codes

* Update docs and remove unnecessary variables

* return error for GetDefaultMergeMessage

* Fix test

* improve code

* ignore unknow unit type

* return error for GetDefaultMergeMessage

* Update services/pull/merge.go

* Some improvements

* Follow some advices

* Fix bug

* Fix lint

* Improve codes

* Update docs and remove unnecessary variables

* return error for GetDefaultMergeMessage

* improve code

* Handle deleted HeadRepo in GetDefaultMergeMessage

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Fix test

* Fix test

Co-authored-by: zeripath <art27@cantab.net>
2022-05-08 20:32:45 +08:00
..
foreachref Improve sync performance for pull-mirrors (#19125) 2022-03-31 14:30:40 +02:00
pipeline Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
tests/repos Auto merge pull requests when all checks succeeded via API (#9307) 2022-05-08 01:05:52 +08:00
batch_reader.go Prevent dangling cat-file calls (goroutine alternative) (#19454) 2022-04-22 17:20:04 +02:00
blame.go Propagate context and ensure git commands run in request context (#17868) 2022-01-19 23:26:57 +00:00
blame_test.go
blob.go Read expected buffer size (#17409) 2021-10-24 22:12:43 +01:00
blob_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
blob_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
blob_test.go Make git.OpenRepository accept Context (#19260) 2022-03-30 03:13:41 +08:00
command.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
command_race_test.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
command_test.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
commit.go Allow custom default merge message with .gitea/default_merge_message/<merge_style>_TEMPLATE.md (#18177) 2022-05-08 20:32:45 +08:00
commit_convert_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
commit_info.go
commit_info_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
commit_info_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
commit_info_test.go Make git.OpenRepository accept Context (#19260) 2022-03-30 03:13:41 +08:00
commit_reader.go
commit_test.go Use for a repo action one database transaction (#19576) 2022-05-03 21:46:28 +02:00
diff.go Pass gitRepo down to GetRawDiff, since its used for main repo and wiki (#19461) 2022-04-25 20:45:18 +02:00
diff_test.go Prevent off-by-one error on comments on newly appended lines (#18029) 2021-12-20 02:15:49 +00:00
error.go
git.go Upgrade required git version to 2.0 (#19577) 2022-05-02 20:30:24 +08:00
git_test.go
hook.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
last_commit_cache.go
last_commit_cache_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
last_commit_cache_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
lfs.go Unexport git.GlobalCommandArgs (#18376) 2022-01-25 18:15:58 +00:00
log_name_status.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
notes.go
notes_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
notes_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
notes_test.go Make git.OpenRepository accept Context (#19260) 2022-03-30 03:13:41 +08:00
parse_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
parse_gogit_test.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
parse_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
parse_nogogit_test.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
README.md
ref.go Refactor various strings (#17784) 2021-12-02 15:28:08 +08:00
remote.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_archive.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_attribute.go Prevent intermittent race in attribute reader close (#19537) 2022-04-28 11:19:33 +08:00
repo_attribute_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
repo_base.go Make git.OpenRepository accept Context (#19260) 2022-03-30 03:13:41 +08:00
repo_base_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_base_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_blame.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_blob.go
repo_blob_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_blob_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_blob_test.go Make git.OpenRepository accept Context (#19260) 2022-03-30 03:13:41 +08:00
repo_branch.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_branch_gogit.go Auto merge pull requests when all checks succeeded via API (#9307) 2022-05-08 01:05:52 +08:00
repo_branch_nogogit.go Auto merge pull requests when all checks succeeded via API (#9307) 2022-05-08 01:05:52 +08:00
repo_branch_test.go Auto merge pull requests when all checks succeeded via API (#9307) 2022-05-08 01:05:52 +08:00
repo_commit.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_commit_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_commit_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_commit_test.go Make git.OpenRepository accept Context (#19260) 2022-03-30 03:13:41 +08:00
repo_commitgraph.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_commitgraph_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_compare.go Allow to mark files in a PR as viewed (#19007) 2022-05-07 20:28:10 +02:00
repo_compare_test.go Make git.OpenRepository accept Context (#19260) 2022-03-30 03:13:41 +08:00
repo_gpg.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_hook.go
repo_index.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_language_stats.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
repo_language_stats_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_language_stats_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_language_stats_test.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_object.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_ref.go
repo_ref_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_ref_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_ref_test.go Make git.OpenRepository accept Context (#19260) 2022-03-30 03:13:41 +08:00
repo_stats.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_stats_test.go Make git.OpenRepository accept Context (#19260) 2022-03-30 03:13:41 +08:00
repo_tag.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_tag_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_tag_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_tag_test.go Improve sync performance for pull-mirrors (#19125) 2022-03-31 14:30:40 +02:00
repo_test.go Make git.OpenRepository accept Context (#19260) 2022-03-30 03:13:41 +08:00
repo_tree.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
repo_tree_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
repo_tree_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
sha1.go
sha1_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
sha1_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
signature.go
signature_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
signature_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
submodule.go Fix some lints (#17337) 2021-10-17 20:47:12 +01:00
submodule_test.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
tag.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
tag_test.go Fix NPE on try to get tag reference via API (#18245) 2022-01-12 20:37:46 +00:00
tree.go Remove git.Command.Run and git.Command.RunInDir* (#19280) 2022-04-01 10:55:30 +08:00
tree_blob.go
tree_blob_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
tree_blob_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
tree_entry.go
tree_entry_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
tree_entry_mode.go format with gofumpt (#18184) 2022-01-20 18:46:10 +01:00
tree_entry_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
tree_entry_test.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
tree_gogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
tree_nogogit.go Remove legacy +build: constraint (#19582) 2022-05-02 23:22:45 +08:00
utils.go Simplify parameter types (#18006) 2021-12-20 04:41:31 +00:00
utils_test.go

Git Module

This module is merged from https://github.com/go-gitea/git which is a Go module to access Git through shell commands. Now it's a part of gitea's main repository for easier pull request.