Skip to content

Commit d3b85cd

Browse files
committed
Provide a package implementation with gix-status.
This should also help fixing these spurious "cannot package because some excluded file is untracked" issues. Remove the respective `git2` implementation at the same time as there seems to be no need for it.
1 parent ac04a82 commit d3b85cd

File tree

6 files changed

+284
-141
lines changed

6 files changed

+284
-141
lines changed

Cargo.lock

Lines changed: 70 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] }
4949
git2 = "0.20.2"
5050
git2-curl = "0.21.0"
5151
# When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail.
52-
gix = { version = "0.73.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
52+
gix = { version = "0.73.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk", "status"] }
5353
glob = "0.3.2"
5454
# Pinned due to https://github.com/sunng87/handlebars-rust/issues/711
5555
handlebars = { version = "=6.3.1", features = ["dir_source"] }

src/cargo/ops/cargo_package/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@ fn prepare_archive(
480480

481481
// Check (git) repository state, getting the current commit hash.
482482
let vcs_info = vcs::check_repo_state(pkg, &src_files, ws, &opts)?;
483-
484483
build_ar_list(ws, pkg, src_files, vcs_info, opts.include_lockfile)
485484
}
486485

0 commit comments

Comments
 (0)