core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
gitea/modules/git
History
zeripath f1e85622da
Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004) 
The current TestPatch conflict code uses a plain git apply which does not properly
account for 3-way merging. However, we can improve things using `git read-tree -m` to
do a three-way merge then follow the algorithm used in merge-one-file. We can also use 
`--patience` and/or `--histogram` to generate a nicer diff for applying patches too.

Fix #13679
Fix #6417

Signed-off-by: Andrew Thornton <art27@cantab.net>
 		2021-12-19 05:19:25 +01:00
..
pipeline Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
tests/repos Ignore Sync errors on pipes when doing `CheckAttributeReader.CheckPath`, fix the hang of `git cat-file` (#17096) 2021-09-20 20:46:51 +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
batch_reader.go Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991) 2021-12-16 19:01:14 +00:00
blame.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
blame_test.go refactor: move from io/ioutil to io and os package (#17109) 2021-09-22 13:38:34 +08:00
blob.go Read expected buffer size (#17409) 2021-10-24 22:12:43 +01:00
blob_gogit.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
blob_nogogit.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
blob_test.go refactor: move from io/ioutil to io and os package (#17109) 2021-09-22 13:38:34 +08:00
command.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
command_test.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
commit.go Refactor various strings (#17784) 2021-12-02 15:28:08 +08:00
commit_convert_gogit.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05: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 Defer Last Commit Info (#16467) 2021-10-08 15:08:22 +02:00
commit_info_nogogit.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
commit_info_test.go A better go code formatter, and now `make fmt` can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
commit_reader.go Tagger can be empty, as can Commit and Author - tolerate this (#15835) 2021-05-12 01:11:42 -04:00
commit_test.go Fix modified files list in webhooks when there is a space (#16288) 2021-07-02 21:23:37 +02:00
diff.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
diff_test.go Fix a couple of CommentAsPatch issues. (#14804) 2021-02-27 19:46:14 +01:00
error.go Fix 500 Error with branch and tag sharing the same name #15592 (#16040) 2021-06-23 17:08:26 -04:00
git.go Disable core.protectNTFS (#17300) 2021-10-13 14:20:11 -04:00
git_test.go Use gitea logging module for git module (#16243) 2021-06-25 17:54:08 +01:00
hook.go refactor: move from io/ioutil to io and os package (#17109) 2021-09-22 13:38:34 +08:00
last_commit_cache.go Defer Last Commit Info (#16467) 2021-10-08 15:08:22 +02:00
last_commit_cache_gogit.go Defer Last Commit Info (#16467) 2021-10-08 15:08:22 +02:00
last_commit_cache_nogogit.go Defer Last Commit Info (#16467) 2021-10-08 15:08:22 +02:00
lfs.go Let package git depend on setting but not opposite (#15241) 2021-06-26 13:28:55 +02:00
log_name_status.go Check for context exceeded in WalkGitLog (#17319) 2021-10-15 19:41:34 +01: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 Defer Last Commit Info (#16467) 2021-10-08 15:08:22 +02:00
notes_nogogit.go Defer Last Commit Info (#16467) 2021-10-08 15:08:22 +02:00
notes_test.go Change the implementation of the go-git version of GetNote to mirror the non go-git version when passed a non-existent commit (#16658) 2021-08-09 16:24:34 +01:00
parse_gogit.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
parse_gogit_test.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
parse_nogogit.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
parse_nogogit_test.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
ref.go Refactor various strings (#17784) 2021-12-02 15:28:08 +08:00
remote.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
repo.go Refactor various strings (#17784) 2021-12-02 15:28:08 +08:00
repo_archive.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
repo_attribute.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
repo_attribute_test.go Use git attributes to determine generated and vendored status for language stats and diffs (#16773) 2021-09-09 21:13:36 +01:00
repo_base_gogit.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
repo_base_nogogit.go Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991) 2021-12-16 19:01:14 +00:00
repo_blame.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00: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 Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
repo_blob_nogogit.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
repo_blob_test.go refactor: move from io/ioutil to io and os package (#17109) 2021-09-22 13:38:34 +08:00
repo_branch.go Improve checkBranchName (#17901) 2021-12-08 19:08:16 +00:00
repo_branch_gogit.go Improve checkBranchName (#17901) 2021-12-08 19:08:16 +00:00
repo_branch_nogogit.go Improve checkBranchName (#17901) 2021-12-08 19:08:16 +00:00
repo_branch_test.go Improve checkBranchName (#17901) 2021-12-08 19:08:16 +00:00
repo_commit.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
repo_commit_gogit.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
repo_commit_nogogit.go Prevent hang in git cat-file if repository is not a valid repository and other fixes (#17991) 2021-12-16 19:01:14 +00:00
repo_commit_test.go Replace `list.List` with slices (#16311) 2021-08-09 14:08:51 -04:00
repo_commitgraph_gogit.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
repo_compare.go Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004) 2021-12-19 05:19:25 +01:00
repo_compare_test.go A better go code formatter, and now `make fmt` can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
repo_gpg.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00: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 Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00: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 Add .gitattribute assisted language detection to blame, diff and render (#17590) 2021-11-17 20:37:00 +00:00
repo_language_stats_nogogit.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
repo_language_stats_test.go Ignore Sync errors on pipes when doing `CheckAttributeReader.CheckPath`, fix the hang of `git cat-file` (#17096) 2021-09-20 20:46:51 +01:00
repo_object.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00: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 Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
repo_ref_nogogit.go Refactor various strings (#17784) 2021-12-02 15:28:08 +08:00
repo_ref_test.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
repo_stats.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
repo_stats_test.go Add top author stats to activity page (#9615) 2020-01-20 12:07:30 +02:00
repo_tag.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
repo_tag_gogit.go Add skip and limit to git.GetTags (#16897) 2021-09-10 19:30:37 +02:00
repo_tag_nogogit.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
repo_tag_test.go A better go code formatter, and now `make fmt` can run in Windows (#17684) 2021-11-17 20:34:35 +08:00
repo_test.go Tests should use test files (#15801) 2021-05-09 17:20:33 +02:00
repo_tree.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
repo_tree_gogit.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
repo_tree_nogogit.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00: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 Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
sha1_nogogit.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05: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 Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
signature_nogogit.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
submodule.go Fix some lints (#17337) 2021-10-17 20:47:12 +01:00
submodule_test.go Compare SSH_DOMAIN when parsing submodule URLs (#12753) 2020-09-07 20:08:10 -04:00
tag.go Tagger can be empty, as can Commit and Author - tolerate this (#15835) 2021-05-12 01:11:42 -04:00
tag_test.go Fix git.parseTagData (#14105) 2020-12-22 21:44:25 +01:00
tree.go Add TestPrepareWikiFileName (#16487) 2021-07-20 15:16:20 +02: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 Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
tree_blob_nogogit.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
tree_entry.go On open repository open common cat file batch and batch-check (#15667) 2021-05-10 03:27:03 +02:00
tree_entry_gogit.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05: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 Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
tree_entry_test.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
tree_gogit.go Add bundle download for repository (#14538) 2021-08-24 11:47:09 -05:00
tree_nogogit.go Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
utils.go Multiple Escaping Improvements (#17551) 2021-11-16 18:18:25 +00: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.