forgejo/modules/git
a1012112796 a5279b74b6
Make manual merge autodetection optional and add manual merge as merge method (#12543)
* Make auto check manual merge as a chooseable mod and add manual merge way on ui

as title, Before this pr, we use same way with GH to check manually merge.
It good, but in some special cases, misjudgments can occur. and it's hard
to fix this bug. So I add option to allow repo manager block "auto check manual merge"
function, Then it will have same style like gitlab(allow empty pr). and to compensate for
not being able to detect THE PR merge automatically, I added a manual approach.

Signed-off-by: a1012112796 <1012112796@qq.com>

* make swager

* api support

* ping ci

* fix TestPullCreate_EmptyChangesWithCommits

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* Apply review suggestions and add test

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* fix build

* test error message

* make fmt

* Fix indentation issues identified by @silverwind

Co-authored-by: silverwind <me@silverwind.io>

* Fix tests and make manually merged disabled error on API the same

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

* a small nit

* fix wrong commit id error

* fix bug

* simple test

* fix test

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2021-03-03 22:41:23 -05:00
..
pipeline Move Bleve and Elastic code indexers to use a common cat-file --batch (#14781) 2021-03-03 21:57:01 -05:00
tests/repos
batch_reader.go Move Bleve and Elastic code indexers to use a common cat-file --batch (#14781) 2021-03-03 21:57:01 -05:00
blame.go
blame_test.go
blob.go
blob_gogit.go
blob_nogogit.go Remove spurious DataAsync Error logging (#14599) 2021-02-07 21:04:58 +00:00
blob_test.go
command.go
command_test.go
commit.go HasPreviousCommit causes recursive load of commits unnecessarily (#14598) 2021-02-10 07:00:57 +00:00
commit_archive.go
commit_convert_gogit.go
commit_info.go
commit_info_gogit.go
commit_info_nogogit.go Move Bleve and Elastic code indexers to use a common cat-file --batch (#14781) 2021-03-03 21:57:01 -05:00
commit_info_test.go
commit_reader.go
commit_test.go HasPreviousCommit causes recursive load of commits unnecessarily (#14598) 2021-02-10 07:00:57 +00:00
diff.go Fix a couple of CommentAsPatch issues. (#14804) 2021-02-27 19:46:14 +01:00
diff_test.go Fix a couple of CommentAsPatch issues. (#14804) 2021-02-27 19:46:14 +01:00
error.go
git.go
git_test.go
hook.go
last_commit_cache.go Ensure memcache TTL cannot be over 30 days (#14592) 2021-02-09 22:29:03 +00:00
last_commit_cache_gogit.go Ensure memcache TTL cannot be over 30 days (#14592) 2021-02-09 22:29:03 +00:00
last_commit_cache_nogogit.go Ensure memcache TTL cannot be over 30 days (#14592) 2021-02-09 22:29:03 +00:00
notes.go
notes_gogit.go
notes_nogogit.go
notes_test.go
parse_gogit.go Reduce calls to git cat-file -s (#14682) 2021-02-17 22:32:25 +01:00
parse_gogit_test.go Reduce calls to git cat-file -s (#14682) 2021-02-17 22:32:25 +01:00
parse_nogogit.go Reduce calls to git cat-file -s (#14682) 2021-02-17 22:32:25 +01:00
parse_nogogit_test.go Reduce calls to git cat-file -s (#14682) 2021-02-17 22:32:25 +01:00
README.md
ref.go
repo.go migrate from com.* to alternatives (#14103) 2020-12-25 11:59:32 +02:00
repo_attribute.go
repo_base_gogit.go
repo_base_nogogit.go
repo_blame.go
repo_blob.go
repo_blob_gogit.go
repo_blob_nogogit.go
repo_blob_test.go
repo_branch.go [API] Add pagination to ListBranches (#14524) 2021-02-03 20:06:13 +01:00
repo_branch_gogit.go [API] Add pagination to ListBranches (#14524) 2021-02-03 20:06:13 +01:00
repo_branch_nogogit.go [API] Add pagination to ListBranches (#14524) 2021-02-03 20:06:13 +01:00
repo_branch_test.go [API] Add pagination to ListBranches (#14524) 2021-02-03 20:06:13 +01:00
repo_commit.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
repo_commit_gogit.go
repo_commit_nogogit.go Fix when a commit not found returned 500 (#14732) 2021-02-18 19:40:17 -05:00
repo_commit_test.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 2021-03-03 22:41:23 -05:00
repo_commitgraph_gogit.go
repo_compare.go Restore detection of branches are equal on compare page (#14586) 2021-02-16 16:39:45 +01:00
repo_compare_test.go
repo_gpg.go
repo_hook.go
repo_index.go
repo_language_stats.go
repo_language_stats_gogit.go
repo_language_stats_nogogit.go Move Bleve and Elastic code indexers to use a common cat-file --batch (#14781) 2021-03-03 21:57:01 -05:00
repo_object.go
repo_ref.go
repo_ref_gogit.go
repo_ref_nogogit.go
repo_ref_test.go
repo_stats.go
repo_stats_test.go
repo_tag.go Refactor get tag to remove unnecessary steps (#14058) 2020-12-20 00:30:39 +02:00
repo_tag_gogit.go
repo_tag_nogogit.go [API] Add pagination to ListBranches (#14524) 2021-02-03 20:06:13 +01:00
repo_tag_test.go Create tag on ui (#13467) 2021-02-28 19:57:45 +00:00
repo_test.go
repo_tree.go
repo_tree_gogit.go
repo_tree_nogogit.go Fix git.parseTagData (#14105) 2020-12-22 21:44:25 +01:00
sha1.go
sha1_gogit.go
sha1_nogogit.go
signature.go
signature_gogit.go
signature_nogogit.go
submodule.go
submodule_test.go
tag.go Fix git.parseTagData (#14105) 2020-12-22 21:44:25 +01:00
tag_test.go Fix git.parseTagData (#14105) 2020-12-22 21:44:25 +01:00
tree.go
tree_blob.go
tree_blob_gogit.go
tree_blob_nogogit.go
tree_entry.go
tree_entry_gogit.go
tree_entry_mode.go
tree_entry_nogogit.go Reduce calls to git cat-file -s (#14682) 2021-02-17 22:32:25 +01:00
tree_entry_test.go
tree_gogit.go
tree_nogogit.go Reduce calls to git cat-file -s (#14682) 2021-02-17 22:32:25 +01:00
utils.go
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.