mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-28 23:55:54 +00:00
9138de6ff2
Before this commit, running Git's GC in a Git repo backing a Jujube repo would risk deleting the conflict data we store as blobs in the Git repo. This commit fixes that by adding a Git note pointing to the conflict blob. I wasn't able to add a test case for this because libgit2 doesn't support gc [1]. Just testing that the ref is there doesn't seem very useful. [1] https://github.com/libgit2/libgit2/issues/3247 |
||
---|---|---|
.. | ||
protos | ||
src | ||
tests | ||
build.rs | ||
Cargo.toml |