projects / git-annex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: da24034) | patch
correctly update keys db in merge conflict
authorJoey Hess <joeyh@joeyh.name>
Mon, 7 Jun 2021 16:52:36 +0000 (12:52 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 7 Jun 2021 16:52:36 +0000 (12:52 -0400)
commit0101363eb8f49f34223edf221c24bd373ea011c6
tree1dbcad71b478c58e4a1e453c59f99d427938237dtree | snapshot
parentda240343317e8eabc0d8534c109aa88b10aa6fa4commit | diff
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
Database/Keys.hs diff | blob | history
doc/bugs/case_where_keys_db_lags_reality.mdwn diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.