mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-11-24 06:19:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Update dependencies and bump the version for gix

Browse source
This commit is contained in:
Matt Kulukundis 2024-08-22 18:57:41 -04:00 committed by Matt Fowles Kulukundis
parent ac7fa1abb9
commit e67aac6d5c
4 changed files with 252 additions and 296 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

528
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

4
Cargo.toml
View file

@ -59,12 +59,12 @@ git2 = { version = "0.19.0", features = [
# https://github.com/rust-lang/git2-rs/commit/3cef4119f
"vendored-libgit2"
] }
gix = { version = "0.64.0", default-features = false, features = [
gix = { version = "0.66.0", default-features = false, features = [
"index",
"max-performance-safe",
"blob-diff",
] }
gix-filter = "0.11.3"
gix-filter = "0.13.0"
glob = "0.3.1"
hex = "0.4.3"
ignore = "0.4.20"

14
lib/src/git.rs
View file

@ -162,7 +162,7 @@ fn resolve_git_ref_to_commit_id(
}
// Unknown id. Recurse from the current state. A tag may point to
// non-commit object.
peeling_ref.to_mut().inner.target = gix::refs::Target::Peeled(oid.detach());
peeling_ref.to_mut().inner.target = gix::refs::Target::Object(oid.detach());
}
}
}
@ -680,9 +680,13 @@ pub fn export_some_refs(
let old_target = head_ref.inner.target.clone();
let current_oid = match head_ref.into_fully_peeled_id() {
Ok(id) => Some(id.detach()),
Err(gix::reference::peel::Error::ToId(gix::refs::peel::to_id::Error::Follow(
gix::refs::file::find::existing::Error::NotFound { .. },
))) => None, // Unborn ref should be considered absent
Err(gix::reference::peel::Error::ToId(
gix::refs::peel::to_id::Error::FollowToObject(
gix::refs::peel::to_object::Error::Follow(
gix::refs::file::find::existing::Error::NotFound { .. },
),
),
)) => None, // Unborn ref should be considered absent
Err(err) => return Err(GitExportError::from_git(err)),
};
let new_oid = if let Some((_old_oid, new_oid)) = branches_to_update.get(&parsed_ref) {
@ -937,7 +941,7 @@ fn update_git_head(
) -> Result<(), GitExportError> {
let mut ref_edits = Vec::new();
let new_target = if let Some(oid) = new_oid {
gix::refs::Target::Peeled(oid)
gix::refs::Target::Object(oid)
} else {
// Can't detach HEAD without a commit. Use placeholder ref to nullify
// the HEAD. The placeholder ref isn't a normal branch ref. Git CLI

2
lib/src/git_backend.rs
View file

@ -696,7 +696,7 @@ fn deserialize_extras(commit: &mut Commit, bytes: &[u8]) {
/// Used for preventing GC of commits we create.
fn to_no_gc_ref_update(id: &CommitId) -> gix::refs::transaction::RefEdit {
let name = format!("{NO_GC_REF_NAMESPACE}{}", id.hex());
let new = gix::refs::Target::Peeled(validate_git_object_id(id).unwrap());
let new = gix::refs::Target::Object(validate_git_object_id(id).unwrap());
let expected = gix::refs::transaction::PreviousValue::ExistingMustMatch(new.clone());
gix::refs::transaction::RefEdit {
change: gix::refs::transaction::Change::Update {