meissa
/
forgejo
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
forgejo-federated-star
forgejo
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a44b2d01d2'
${ noResults }
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>
 		3 years ago
..
pipeline Move Bleve and Elastic code indexers to use a common cat-file --batch (#14781) 3 years ago
tests/repos Fix reading git notes from nested trees (#8026) 5 years ago
README.md move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364) 5 years ago
batch_reader.go Move Bleve and Elastic code indexers to use a common cat-file --batch (#14781) 3 years ago
blame.go Prevent panic on git blame by limiting lines to 4096 bytes at most (#13470) 4 years ago
blame_test.go Ensure BlameReaders close at end of request (#12102) 4 years ago
blob.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
blob_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
blob_nogogit.go Remove spurious DataAsync Error logging (#14599) 3 years ago
blob_test.go Add Close() method to gogitRepository (#8901) 5 years ago
command.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
command_test.go Fix nondeterministic behavior (#9341) 5 years ago
commit.go HasPreviousCommit causes recursive load of commits unnecessarily (#14598) 3 years ago
commit_archive.go Set context for running CreateArchive in to that of the request (#12555) 4 years ago
commit_convert_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
commit_info.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
commit_info_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
commit_info_nogogit.go Move Bleve and Elastic code indexers to use a common cat-file --batch (#14781) 3 years ago
commit_info_test.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
commit_reader.go Fix bug in commit verification introduced in #13673 (#14040) 4 years ago
commit_test.go HasPreviousCommit causes recursive load of commits unnecessarily (#14598) 3 years ago
diff.go Fix a couple of CommentAsPatch issues. (#14804) 3 years ago
diff_test.go Fix a couple of CommentAsPatch issues. (#14804) 3 years ago
error.go Handle push rejection in branch and upload (#10854) 4 years ago
git.go Migrations: Use Process Manager to create own Context (#13792) 4 years ago
git_test.go Graceful: Xorm, RepoIndexer, Cron and Others (#9282) 5 years ago
hook.go Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186) 4 years ago
last_commit_cache.go Ensure memcache TTL cannot be over 30 days (#14592) 3 years ago
last_commit_cache_gogit.go Ensure memcache TTL cannot be over 30 days (#14592) 3 years ago
last_commit_cache_nogogit.go Ensure memcache TTL cannot be over 30 days (#14592) 3 years ago
notes.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
notes_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
notes_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
notes_test.go Add Close() method to gogitRepository (#8901) 5 years ago
parse_gogit.go Reduce calls to git cat-file -s (#14682) 3 years ago
parse_gogit_test.go Reduce calls to git cat-file -s (#14682) 3 years ago
parse_nogogit.go Reduce calls to git cat-file -s (#14682) 3 years ago
parse_nogogit_test.go Reduce calls to git cat-file -s (#14682) 3 years ago
ref.go Multiple GitGraph improvements: Exclude PR heads, Add branch/PR links, Show only certain branches, (#12766) 4 years ago
repo.go migrate from com.* to alternatives (#14103) 4 years ago
repo_attribute.go go-version constraints ignore pre-releases (#13234) 4 years ago
repo_base_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_base_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_blame.go Removed unnecessary conversions (#7557) 5 years ago
repo_blob.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_blob_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_blob_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_blob_test.go Add Close() method to gogitRepository (#8901) 5 years ago
repo_branch.go [API] Add pagination to ListBranches (#14524) 3 years ago
repo_branch_gogit.go [API] Add pagination to ListBranches (#14524) 3 years ago
repo_branch_nogogit.go [API] Add pagination to ListBranches (#14524) 3 years ago
repo_branch_test.go [API] Add pagination to ListBranches (#14524) 3 years ago
repo_commit.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 3 years ago
repo_commit_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_commit_nogogit.go Fix when a commit not found returned 500 (#14732) 3 years ago
repo_commit_test.go Make manual merge autodetection optional and add manual merge as merge method (#12543) 3 years ago
repo_commitgraph_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_compare.go Restore detection of branches are equal on compare page (#14586) 3 years ago
repo_compare_test.go Re-attempt to delete temporary upload if the file is locked by another process (#12447) 4 years ago
repo_gpg.go Sign merges, CRUD, Wiki and Repository initialisation with gpg key (#7631) 5 years ago
repo_hook.go move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364) 5 years ago
repo_index.go Be more strict with git arguments (#7715) 5 years ago
repo_language_stats.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_language_stats_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_language_stats_nogogit.go Move Bleve and Elastic code indexers to use a common cat-file --batch (#14781) 3 years ago
repo_object.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_ref.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_ref_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_ref_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_ref_test.go Add Close() method to gogitRepository (#8901) 5 years ago
repo_stats.go refactor repo_stats to use os.pipe (#11726) 4 years ago
repo_stats_test.go Add top author stats to activity page (#9615) 5 years ago
repo_tag.go Refactor get tag to remove unnecessary steps (#14058) 4 years ago
repo_tag_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_tag_nogogit.go [API] Add pagination to ListBranches (#14524) 3 years ago
repo_tag_test.go Create tag on ui (#13467) 3 years ago
repo_test.go Add Close() method to gogitRepository (#8901) 5 years ago
repo_tree.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_tree_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
repo_tree_nogogit.go Fix git.parseTagData (#14105) 4 years ago
sha1.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
sha1_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
sha1_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
signature.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
signature_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
signature_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
submodule.go Compare SSH_DOMAIN when parsing submodule URLs (#12753) 4 years ago
submodule_test.go Compare SSH_DOMAIN when parsing submodule URLs (#12753) 4 years ago
tag.go Fix git.parseTagData (#14105) 4 years ago
tag_test.go Fix git.parseTagData (#14105) 4 years ago
tree.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
tree_blob.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
tree_blob_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
tree_blob_nogogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
tree_entry.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
tree_entry_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
tree_entry_mode.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
tree_entry_nogogit.go Reduce calls to git cat-file -s (#14682) 3 years ago
tree_entry_test.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
tree_gogit.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
tree_nogogit.go Reduce calls to git cat-file -s (#14682) 3 years ago
utils.go Use native git variants by default with go-git variants as build tag (#13673) 4 years ago
utils_test.go Fix ref links in issue overviews for tags (#8742) 4 years ago

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.