mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Git
History
Joey Hess fc3fd0cfe0
do union merge on bytestrings 
My concern with using bytestring for this is the file needs to be split
into lines, and the encoding is not known. It's safe to split a utf-8
encoded file on the \n byte; only newlines get encoded to that byte in utf-8.
And this code already assumes utf-8 or ascii encoding, because it used
the filesystem encoding.
2019-01-05 08:06:47 -04:00
..
Command
Remote
AutoCorrect.hs Avoid backtraces on expected failures when built with ghc 8; only use backtraces for unexpected errors. 2016-11-15 21:29:54 -04:00
Branch.hs Pass -S to git commit-tree when commit.gpgsign is set and when making a non-automatic commit, in order to preserve current behavior when used with git 1.9, which has stopped doing this itself. 2016-06-02 15:07:20 -04:00
BuildVersion.hs fold Build/SysConfig.hs into BuildInfo via include 2017-12-14 12:46:57 -04:00
CatFile.hs import Utility.FileSystemEncoding in Common 2019-01-03 11:37:02 -04:00
CheckAttr.hs restart coprocess in raw mode 2016-11-01 14:03:59 -04:00
CheckIgnore.hs restart coprocess in raw mode 2016-11-01 14:03:59 -04:00
Command.hs Support newlines in filenames. 2018-09-20 13:45:44 -04:00
Config.hs Improve startup time for commands that do not operate on remotes 2018-01-09 16:22:07 -04:00
ConfigTypes.hs post-recive hook to make updateInstead work in direct mode and adjusted branches 2017-02-17 14:04:43 -04:00
Construct.hs Support working trees set up by git-worktree. 2018-07-18 14:27:26 -04:00
CurrentRepo.hs fix reversions due to undocumented and buggy git behavior 2018-09-11 15:54:21 -04:00
DiffTree.hs unused: Improved memory use significantly when there are a lot of differences between branches. 2017-01-31 19:42:00 -04:00
DiffTreeItem.hs
Env.hs removed the old Android app 2018-10-13 01:41:11 -04:00
FileMode.hs
Filename.hs fix failing quickcheck properties 2017-06-17 16:48:00 -04:00
FilePath.hs --branch, stage 2 2016-07-20 15:23:43 -04:00
Fsck.hs removed the old Android app 2018-10-13 01:41:11 -04:00
GCrypt.hs Avoid backtraces on expected failures when built with ghc 8; only use backtraces for unexpected errors. 2016-11-15 21:29:54 -04:00
HashObject.hs convert Git.HashObject to use ByteStrings 2019-01-03 13:21:01 -04:00
Hook.hs improve back-compat of post-receive hook 2018-09-25 15:02:12 -04:00
Index.hs avoid update-index race 2018-08-17 16:03:40 -04:00
LockFile.hs finally really add back custom-setup stanza 2017-12-31 16:36:39 -04:00
LsFiles.hs sync --content now supports --hide-missing adjusted branches 2018-10-19 17:51:25 -04:00
LsTree.hs adjust: Fix behavior when used in a repository that contains submodules. 2017-02-20 13:44:55 -04:00
Merge.hs --allow-unrelated-histories will be in git 2.9.0, not 2.8.2 2016-04-27 13:54:46 -04:00
Objects.hs
Queue.hs queueing of internal IO actions on files 2018-08-17 13:28:21 -04:00
Ref.hs typo fix 2017-10-30 12:28:44 -04:00
RefLog.hs
Remote.hs add dropFromEnd 2018-11-23 11:24:05 -04:00
Repair.hs rename BlobType and add submodule to it 2018-05-14 14:45:41 -04:00
Sha.hs
Ssh.hs avoid the dashed ssh hostname class of security holes 2017-08-17 22:11:31 -04:00
Status.hs Don't allow entering a view with staged or unstaged changes. 2018-05-14 16:51:06 -04:00
Tree.hs graft exported tree into git-annex branch 2017-08-31 18:06:49 -04:00
Types.hs rename BlobType and add submodule to it 2018-05-14 14:45:41 -04:00
UnionMerge.hs do union merge on bytestrings 2019-01-05 08:06:47 -04:00
UpdateIndex.hs avoid update-index race 2018-08-17 16:03:40 -04:00
Url.hs
Version.hs