CI to automate build of cargo lockfiles on different Alpine releases for git-annex aports
https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/git-annex
c835166a7c
This is a new git subcommand, that does a generic union merge operation between two refs, storing the result in a branch. It operates efficiently without touching the working tree. It does need to write out a temporary index file, and may need to write out some other temp files as well. This could be useful for anything that stores data in a branch, and needs to merge changes into that branch without actually checking the branch out. Since conflict handling can't be done without a working copy, the merge type is always a union merge, which is fine for data stored in log format (as git-annex does), or in non-conflicting files (as pristine-tar does). This probably belongs in git proper, but it will live in git-annex for now. --- Plan is to move .git-annex/ to a git-annex branch, and use git-union-merge to handle merging changes when pulling from remotes. Some preliminary benchmarking using real .git-annex/ data indicates that it's quite fast, except for the "git add" call, which is as slow as "git add" tends to be with a big index. |
||
|---|---|---|
| Backend | ||
| Command | ||
| debian | ||
| doc | ||
| Remote | ||
| testdata | ||
| Types | ||
| Upgrade | ||
| .gitattributes | ||
| .gitignore | ||
| Annex.hs | ||
| AnnexQueue.hs | ||
| Backend.hs | ||
| BackendList.hs | ||
| Base64.hs | ||
| CHANGELOG | ||
| CmdLine.hs | ||
| Command.hs | ||
| Config.hs | ||
| configure.hs | ||
| Content.hs | ||
| CopyFile.hs | ||
| Crypto.hs | ||
| DataUnits.hs | ||
| Dot.hs | ||
| git-annex-shell.hs | ||
| git-annex.hs | ||
| git-union-merge.hs | ||
| GitAnnex.hs | ||
| GitQueue.hs | ||
| GitRepo.hs | ||
| GPL | ||
| INSTALL | ||
| LocationLog.hs | ||
| Locations.hs | ||
| Makefile | ||
| mdwn2man | ||
| Messages.hs | ||
| Options.hs | ||
| README | ||
| Remote.hs | ||
| RsyncFile.hs | ||
| Ssh.hs | ||
| StatFS.hsc | ||
| test.hs | ||
| TestConfig.hs | ||
| Touch.hsc | ||
| Trust.hs | ||
| TrustLevel.hs | ||
| Types.hs | ||
| Upgrade.hs | ||
| Utility.hs | ||
| UUID.hs | ||
| Version.hs | ||
git-annex allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle, whether due to limitations in memory, checksumming time, or disk space. For documentation, see doc/ or <http://git-annex.branchable.com/>