mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

git: remove git note pointing to conflicts

Browse source 
We store conflicts as blobs with JSON data and with a git note
pointing to them to prevent GC. These are stored in the git tree as
regular files. The only thing that distinguishes them is that their
filename ends with `.jjconflict`. Since they are referenced from the
tree, there's no need for the git note to prevent GC (which doesn't
work anyway, as I just learned), and we don't store any additional
data in the note either, so let's just remove it.
This commit is contained in:
Martin von Zweigbergk 2021-02-07 23:45:14 -08:00
parent fa30cf768f
commit dd98f0564e
1 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/src/git_store.rs
View file

@ -31,7 +31,6 @@ use backoff::{ExponentialBackoff, Operation};
use std::ops::Deref;
const COMMITS_NOTES_REF: &str = "refs/notes/jj/commits";
const CONFLICTS_NOTES_REF: &str = "refs/notes/jj/conflicts";
const CONFLICT_SUFFIX: &str = ".jjconflict";
impl From<git2::Error> for StoreError {
@ -388,22 +387,6 @@ impl Store for GitStore {
let bytes = json_string.as_bytes();
let locked_repo = self.repo.lock().unwrap();
let oid = locked_repo.blob(bytes).unwrap();
let signature = git2::Signature::now("Jujube", "jj@example.com").unwrap();
let note_result = write_note(
locked_repo.deref(),
&signature,
CONFLICTS_NOTES_REF,
oid,
"Conflict object used by Jujube",
);
match note_result {
// It's fine if the conflict already existed (no need to update the note), but
// any other error is unexpected.
Err(err) if err.code() != git2::ErrorCode::Exists => {
return Err(StoreError::from(err));
}
_ => {}
}
Ok(ConflictId(oid.as_bytes().to_vec()))
}
}