Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 36f7b78

Browse files
ByronByron
committed
Merge branch 'submodule-in-gix'
2 parents 8fd7949 + 6bc69e3 commit 36f7b78

49 files changed

Lines changed: 1437 additions & 243 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/msrv.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
steps:
2222
- uses: actions/checkout@v3
23-
- uses: dtolnay/[email protected] # dictated by `windows` crates effectively, IMPORTANT: adjust etc/msrv-badge.svg as well
23+
- uses: dtolnay/[email protected] # dictated by `firefox` to support the `helix` editor, IMPORTANT: adjust etc/msrv-badge.svg as well
2424
- uses: extractions/setup-just@v1
2525
- run: just ci-check-msrv

‎Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crate-status.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -726,16 +726,16 @@ See its [README.md](https://github.com/Byron/gitoxide/blob/main/gix-lock/README.
726726
* [ ] a way to make changes to individual configuration files
727727
* [x] mailmap
728728
* [x] object replacements (`git replace`)
729-
* [ ] configuration
729+
* [x] read git configuration
730730
* [ ] merging
731731
* [ ] stashing
732732
* [ ] Use _Commit Graph_ to speed up certain queries
733733
* [ ] subtree
734734
* [ ] interactive rebase status/manipulation
735735
* **submodules**
736-
* [ ] handle 'old' form for reading
737-
* [ ] list
738-
* [ ] traverse recursively
736+
* [x] handle 'old' form for reading and detect old form
737+
* [x] list
738+
* [ ] edit
739739
* [ ] API documentation
740740
* [ ] Some examples
741741

‎etc/msrv-badge.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎gitoxide-core/src/query/engine/command.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ impl query::Engine {
2626
Some(spec.to_bstring()),
2727
false,
2828
&gix::index::State::new(self.repo.object_hash()),
29+
gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
30+
.adjust_for_bare(self.repo.is_bare()),
2931
)?
3032
.search()
3133
.patterns()

‎gitoxide-core/src/repository/attributes/query.rs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@ pub(crate) mod function {
4646
}
4747
}
4848
PathsOrPatterns::Patterns(patterns) => {
49-
let mut pathspec = repo.pathspec(patterns, true, &index)?;
49+
let mut pathspec = repo.pathspec(
50+
patterns,
51+
true,
52+
&index,
53+
gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
54+
.adjust_for_bare(repo.is_bare()),
55+
)?;
5056
for (path, _entry) in pathspec
5157
.index_entries_with_paths(&index)
5258
.ok_or_else(|| anyhow!("Pathspec didn't match a single path in the index"))?

‎gitoxide-core/src/repository/exclude.rs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,13 @@ pub fn query(
5656
}
5757
PathsOrPatterns::Patterns(patterns) => {
5858
for (path, _entry) in repo
59-
.pathspec(patterns.into_iter(), repo.work_dir().is_some(), &index)?
59+
.pathspec(
60+
patterns.into_iter(),
61+
repo.work_dir().is_some(),
62+
&index,
63+
gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
64+
.adjust_for_bare(repo.is_bare()),
65+
)?
6066
.index_entries_with_paths(&index)
6167
.ok_or_else(|| anyhow!("Pathspec didn't yield any entry"))?
6268
{

0 commit comments

Comments
 (0)