foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-27 13:39:19 -05:00
Code Issues Wiki Activity
forgejo/modules/git
History
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 Fix reading git notes from nested trees (#8026) 2019-09-12 09:14:41 +08:00
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 Prevent panic on git blame by limiting lines to 4096 bytes at most (#13470) 2020-11-09 21:14:02 -05:00
blame_test.go Ensure BlameReaders close at end of request (#12102) 2020-07-01 14:01:17 +01:00
blob.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
blob_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
blob_nogogit.go Remove spurious DataAsync Error logging (#14599) 2021-02-07 21:04:58 +00:00
blob_test.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
command.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
command_test.go Fix nondeterministic behavior (#9341) 2019-12-13 17:03:38 +08:00
commit.go HasPreviousCommit causes recursive load of commits unnecessarily (#14598) 2021-02-10 07:00:57 +00:00
commit_archive.go Set context for running CreateArchive in to that of the request (#12555) 2020-08-28 09:55:12 +03:00
commit_convert_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
commit_info.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
commit_info_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
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 Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
commit_reader.go Fix bug in commit verification introduced in #13673 (#14040) 2020-12-17 21:42:33 +01:00
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 Handle push rejection in branch and upload (#10854) 2020-03-28 01:13:18 -03:00
git.go Migrations: Use Process Manager to create own Context (#13792) 2020-12-02 18:36:06 +00:00
git_test.go Graceful: Xorm, RepoIndexer, Cron and Others (#9282) 2019-12-15 09:51:28 +00:00
hook.go Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186) 2020-11-27 21:42:08 -05:00
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 Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
notes_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
notes_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
notes_test.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
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 move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364) 2019-03-27 17:33:00 +08:00
ref.go Multiple GitGraph improvements: Exclude PR heads, Add branch/PR links, Show only certain branches, (#12766) 2020-11-08 12:21:54 -05:00
repo.go migrate from com.* to alternatives (#14103) 2020-12-25 11:59:32 +02:00
repo_attribute.go go-version constraints ignore pre-releases (#13234) 2020-10-21 11:42:08 -04:00
repo_base_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_base_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_blame.go Removed unnecessary conversions (#7557) 2019-07-23 19:50:39 +01:00
repo_blob.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_blob_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_blob_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_blob_test.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
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 Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
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 Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
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 Re-attempt to delete temporary upload if the file is locked by another process (#12447) 2020-08-11 21:05:34 +01:00
repo_gpg.go Sign merges, CRUD, Wiki and Repository initialisation with gpg key (#7631) 2019-10-16 14:42:42 +01:00
repo_hook.go move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364) 2019-03-27 17:33:00 +08:00
repo_index.go Be more strict with git arguments (#7715) 2019-08-05 21:39:39 +01:00
repo_language_stats.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_language_stats_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
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 Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_ref.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_ref_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_ref_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_ref_test.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
repo_stats.go refactor repo_stats to use os.pipe (#11726) 2020-09-05 16:12:14 -04:00
repo_stats_test.go Add top author stats to activity page (#9615) 2020-01-20 12:07:30 +02:00
repo_tag.go Refactor get tag to remove unnecessary steps (#14058) 2020-12-20 00:30:39 +02:00
repo_tag_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
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 Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
repo_tree.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_tree_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
repo_tree_nogogit.go Fix git.parseTagData (#14105) 2020-12-22 21:44:25 +01:00
sha1.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
sha1_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
sha1_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
signature.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
signature_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
signature_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
submodule.go Compare SSH_DOMAIN when parsing submodule URLs (#12753) 2020-09-07 20:08:10 -04:00
submodule_test.go Compare SSH_DOMAIN when parsing submodule URLs (#12753) 2020-09-07 20:08:10 -04:00
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 Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
tree_blob.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
tree_blob_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
tree_blob_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
tree_entry.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
tree_entry_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
tree_entry_mode.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
tree_entry_nogogit.go Reduce calls to git cat-file -s (#14682) 2021-02-17 22:32:25 +01:00
tree_entry_test.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
tree_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
tree_nogogit.go Reduce calls to git cat-file -s (#14682) 2021-02-17 22:32:25 +01:00
utils.go Use native git variants by default with go-git variants as build tag (#13673) 2020-12-17 22:00:47 +08:00
utils_test.go Fix ref links in issue overviews for tags (#8742) 2020-05-14 18:55:43 -04:00

README.md

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.