Your message dated Tue, 17 Feb 2026 14:49:13 +0000
with message-id <[email protected]>
and subject line Bug#1128287: fixed in hx
25.07.1+20251230+~0.1.1+~0.3.0+20251022-2
has caused the Debian Bug report #1128287,
regarding hx - rust-gix update
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1128287: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1128287
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: hx
Version: 25.07.1+20251230+~0.1.1+~0.3.0+20251022-1
Severity: serious
Tags: patch
As discussed at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1116062
rust-gix has been updated to 0.73, the hx package needs adjusting
to build with the new version.
diff -Nru hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/changelog
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/changelog
--- hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/changelog 2025-12-31
08:46:11.000000000 +0000
+++ hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/changelog 2026-02-17
12:40:47.000000000 +0000
@@ -1,3 +1,11 @@
+hx (25.07.1+20251230+~0.1.1+~0.3.0+20251022-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Adjust 2002_gix.patch for gix 0.73.
+ * Bump build-dependencies for gix crate to 0.73.
+
+ -- Peter Michael Green <[email protected]> Tue, 17 Feb 2026 12:40:47 +0000
+
hx (25.07.1+20251230+~0.1.1+~0.3.0+20251022-1) unstable; urgency=medium
[ upstream ]
diff -Nru hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/control
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/control
--- hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/control 2025-12-31
08:46:11.000000000 +0000
+++ hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/control 2026-02-17
12:40:47.000000000 +0000
@@ -26,8 +26,8 @@
librust-futures-util-0.3+async-await-dev,
librust-futures-util-0.3+std-dev,
librust-fuzzy-matcher-0.3+default-dev,
- librust-gix-0.69+attributes-dev,
- librust-gix-0.69+status-dev,
+ librust-gix-0.73+attributes-dev,
+ librust-gix-0.73+status-dev,
librust-globset-0.4+default-dev,
librust-grep-regex-0.1+default-dev,
librust-grep-searcher-0.1+default-dev,
diff -Nru
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_gix.patch
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_gix.patch
--- hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_gix.patch
2025-12-31 08:46:11.000000000 +0000
+++ hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_gix.patch
2026-02-17 12:40:47.000000000 +0000
@@ -1,6 +1,5 @@
Description: use older minor versions of crate gix
- This essentially reverts upstream git commits
- e8cad18, 5a671e6 and 09b2f6a.
+ This essentially reverts upstream git commit e8cad18.
Author: Jonas Smedegaard <[email protected]>
Bug-Debian: https://bugs.debian.org/1116062
Forwarded: not-needed
@@ -14,39 +13,12 @@
arc-swap = { version = "1.7.1" }
-gix = { version = "0.76.0", features = ["attributes", "status"],
default-features = false, optional = true }
-+gix = { version = "0.69.1", features = ["attributes", "status"],
default-features = false, optional = true }
++gix = { version = "0.73.0", features = ["attributes", "status"],
default-features = false, optional = true }
imara-diff = "0.2.0"
anyhow = "1"
--- a/helix-vcs/src/git.rs
+++ b/helix-vcs/src/git.rs
-@@ -11,7 +11,7 @@
- use gix::objs::tree::EntryKind;
- use gix::sec::trust::DefaultForLevel;
- use gix::status::{
-- index_worktree::Item,
-+ index_worktree::iter::Item,
- plumbing::index_as_worktree::{Change, EntryStatus},
- UntrackedFiles,
- };
-@@ -45,7 +45,7 @@
- let data = file_object.detach().data;
- // Get the actual data that git would make out of the git object.
- // This will apply the user's git config or attributes like crlf
conversions.
-- if let Some(work_dir) = repo.workdir() {
-+ if let Some(work_dir) = repo.work_dir() {
- let rela_path = file.strip_prefix(work_dir)?;
- let rela_path = gix::path::try_into_bstr(rela_path)?;
- let (mut pipeline, _) = repo.filter_pipeline(None)?;
-@@ -128,7 +128,7 @@
- /// Emulates the result of running `git status` from the command line.
- fn status(repo: &Repository, f: impl Fn(Result<FileChange>) -> bool) ->
Result<()> {
- let work_dir = repo
-- .workdir()
-+ .work_dir()
- .ok_or_else(|| anyhow::anyhow!("working tree not found"))?
- .to_path_buf();
-
@@ -162,7 +162,7 @@
} => {
let path = work_dir.join(rela_path.to_path()?);
@@ -56,12 +28,3 @@
EntryStatus::Change(Change::Removed) =>
FileChange::Deleted { path },
EntryStatus::Change(Change::Modification { .. }) => {
FileChange::Modified { path }
-@@ -195,7 +195,7 @@
-
- /// Finds the object that contains the contents of a file at a specific
commit.
- fn find_file_in_commit(repo: &Repository, commit: &Commit, file: &Path) ->
Result<ObjectId> {
-- let repo_dir = repo.workdir().context("repo has no worktree")?;
-+ let repo_dir = repo.work_dir().context("repo has no worktree")?;
- let rel_path = file.strip_prefix(repo_dir)?;
- let tree = commit.tree()?;
- let tree_entry = tree
diff -Nru
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_imara-diff.patch
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_imara-diff.patch
---
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_imara-diff.patch
2025-12-31 08:46:11.000000000 +0000
+++
hx-25.07.1+20251230+~0.1.1+~0.3.0+20251022/debian/patches/2002_imara-diff.patch
2026-02-17 12:40:47.000000000 +0000
@@ -22,7 +22,7 @@
@@ -18,7 +18,7 @@
arc-swap = { version = "1.7.1" }
- gix = { version = "0.69.1", features = ["attributes", "status"],
default-features = false, optional = true }
+ gix = { version = "0.73.0", features = ["attributes", "status"],
default-features = false, optional = true }
-imara-diff = "0.2.0"
+imara-diff = "0.1.8"
anyhow = "1"
--- End Message ---
--- Begin Message ---
Source: hx
Source-Version: 25.07.1+20251230+~0.1.1+~0.3.0+20251022-2
Done: Jonas Smedegaard <[email protected]>
We believe that the bug you reported is fixed in the latest version of
hx, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jonas Smedegaard <[email protected]> (supplier of updated hx package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 17 Feb 2026 14:56:41 +0100
Source: hx
Architecture: source
Version: 25.07.1+20251230+~0.1.1+~0.3.0+20251022-2
Distribution: unstable
Urgency: medium
Maintainer: Jonas Smedegaard <[email protected]>
Changed-By: Jonas Smedegaard <[email protected]>
Closes: 1128287
Changes:
hx (25.07.1+20251230+~0.1.1+~0.3.0+20251022-2) unstable; urgency=medium
.
* drop patches 2002_arc-swap 2002_bitflags 2002_slotmap 2002_tempfile,
obsoleted by Debian packaging changes
* relax build-dependencies for all crates
* update copyright info:
+ license patches same as main upstream license
+ update coverage
* reduce patch 2002_gix;
closes: bug#1128287, thanks to Peter Michael Green
Checksums-Sha1:
c471218b34a8e60a4bd715ec49405b3d6b47ab3c 4418
hx_25.07.1+20251230+~0.1.1+~0.3.0+20251022-2.dsc
2ced912a991b4ba986eb5180c93dcd110215c44d 28492
hx_25.07.1+20251230+~0.1.1+~0.3.0+20251022-2.debian.tar.xz
2ce2fe3a88113fb8f903ece1ea6f1400fde3934d 37788
hx_25.07.1+20251230+~0.1.1+~0.3.0+20251022-2_amd64.buildinfo
Checksums-Sha256:
742841dc00a624dc6cd50960ca4a76d536480c41d7d339a89e4e63f2e741a6d7 4418
hx_25.07.1+20251230+~0.1.1+~0.3.0+20251022-2.dsc
0336800fd9f4d9fc086a1ab7c4ea63d28e8364650b6d29fa9dfd9cc6543c176a 28492
hx_25.07.1+20251230+~0.1.1+~0.3.0+20251022-2.debian.tar.xz
c2dfe1bcf31688cbe1c3d7a3f44feaaaac56a2d82f7b19ee457608bf710aaefb 37788
hx_25.07.1+20251230+~0.1.1+~0.3.0+20251022-2_amd64.buildinfo
Files:
a0a2ffd7f8c414cc0409702f3325d7c3 4418 editors optional
hx_25.07.1+20251230+~0.1.1+~0.3.0+20251022-2.dsc
6d6a8cd2f3be0ad2c36fc1f616e00a7a 28492 editors optional
hx_25.07.1+20251230+~0.1.1+~0.3.0+20251022-2.debian.tar.xz
17a347563bb8f6cc321ea901a9eca851 37788 editors optional
hx_25.07.1+20251230+~0.1.1+~0.3.0+20251022-2_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJABAEBCgAqFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAmmUe4YMHGRyQGpvbmVz
LmRrAAoJECx8MUbBoAEh9EMQAJQ6Du1AY5i0Xg6kRwktsR0QSlZyZPASUBpxQuuG
qzgfqeqtgiuRyXvYxxZS7LKaDDOjh9tpj9+MqPOhRt6ztrqH5N97O0UfPywqML9Q
kmphi9PkVEs91CPaUQGLcyHDIHldtQ4GDn541VPsVmVseIJ2zpRxtCcYcUwKThjX
h0gMpR9pPfWA1cqIIA+8w0CkJP9J308bCZokxXbF0/HLKOP9HgbOoanfyZvcgpq4
jM+reyMyL+jHEBtpXf3c+KVOT77L9tOb0JegYorXQZg/zlj/xD1f57LymHLobchg
2OgoKDKbi7b6i1RKNL7C71ySyCr5zBH7hloBL96moTz1cJV9NjZZKE6/5XgDLBjz
K6L6qRD/koZh141hbl3VAaHtm3Bps/DX5t2zATnPaufKueznpPb0kC/RMTC1Hn1f
/ISSluETZUHSyNZgE+1zWW3VDXBRdGcPzpaOGffEwmhMvAtJHjAPy3NOCsj5AhxT
fGBL/AJImrf2V9L2yrQ71Z2L/v4Jn++CjLUvOhMEO5hdeLqzcyUds8iI0NZxcFMh
1WZ0DuEDPRovmBHibqmGhbRYwHK0dcf5XX0c7N2/Vap4+iDvnZrGRXHGjuo9qZ6s
L09uN3MGmPUkl31RJHXPqqLJwNLZsoA5kOkjDWfjR98o9sjhsP9MYibxZ9pNOxyC
ZdW/
=CUV5
-----END PGP SIGNATURE-----
pgp8iggwl7DPW.pgp
Description: PGP signature
--- End Message ---
