summaryrefslogtreecommitdiffstats
path: root/vendor/gix-worktree/src/status
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 03:57:31 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-30 03:57:31 +0000
commitdc0db358abe19481e475e10c32149b53370f1a1c (patch)
treeab8ce99c4b255ce46f99ef402c27916055b899ee /vendor/gix-worktree/src/status
parentReleasing progress-linux version 1.71.1+dfsg1-2~progress7.99u1. (diff)
downloadrustc-dc0db358abe19481e475e10c32149b53370f1a1c.tar.xz
rustc-dc0db358abe19481e475e10c32149b53370f1a1c.zip
Merging upstream version 1.72.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-worktree/src/status')
-rw-r--r--vendor/gix-worktree/src/status/content.rs8
1 files changed, 1 insertions, 7 deletions
diff --git a/vendor/gix-worktree/src/status/content.rs b/vendor/gix-worktree/src/status/content.rs
index d47749ef8..aa775821a 100644
--- a/vendor/gix-worktree/src/status/content.rs
+++ b/vendor/gix-worktree/src/status/content.rs
@@ -1,7 +1,5 @@
-use gix_features::hash;
use gix_hash::ObjectId;
use gix_index as index;
-use gix_object::encode::loose_header;
use index::Entry;
/// Compares the content of two blobs in some way.
@@ -76,11 +74,7 @@ impl CompareBlobs for HashEq {
_entry_blob: impl ReadDataOnce<'a, E>,
) -> Result<Option<Self::Output>, E> {
let blob = worktree_blob.read_data()?;
- let header = loose_header(gix_object::Kind::Blob, blob.len());
- let mut hasher = hash::hasher(entry.id.kind());
- hasher.update(&header);
- hasher.update(blob);
- let file_hash: ObjectId = hasher.digest().into();
+ let file_hash = gix_object::compute_hash(entry.id.kind(), gix_object::Kind::Blob, blob);
Ok((entry.id != file_hash).then_some(file_hash))
}
}