git-annex/Database
Joey Hess 0101363eb8
correctly update keys db in merge conflict
This is quite a subtle edge case, see the bug report for full details.

The second git diff is needed only when there's a merge conflict.
It would be possible to speed it up marginally by using
--diff-filter=Unmerged, but probably not enough to bother with.

Sponsored-by: Graham Spencer on Patreon
2021-06-07 12:52:36 -04:00
..
Keys speed up keys database writes 2021-05-31 15:01:00 -04:00
Benchmark.hs more RawFilePath conversion 2020-11-05 18:45:37 -04:00
ContentIdentifier.hs remove ContentIndentifiersCidRemoteIndex uniqueness constraint 2020-12-23 14:03:33 -04:00
Export.hs use GIT keys for export of non-annexed files 2021-03-05 14:12:11 -04:00
Fsck.hs speed up keys database writes 2021-05-31 15:01:00 -04:00
Handle.hs Fix build with persistent-2.12.0.1 2021-04-01 12:21:02 -04:00
Init.hs more RawFilePath conversion 2020-11-05 18:45:37 -04:00
Keys.hs correctly update keys db in merge conflict 2021-06-07 12:52:36 -04:00
Queue.hs more RawFilePath conversion 2020-11-05 18:45:37 -04:00
Types.hs started converting Ref from String to ByteString 2020-04-06 17:14:49 -04:00