Skip to content

Commit fd14489

Browse files
committed
Merge branch 'filter-refs'
2 parents 87f6db7 + 9dc7a3f commit fd14489

File tree

60 files changed

+1593
-117
lines changed

Some content is hidden

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

60 files changed

+1593
-117
lines changed

.github/workflows/msrv.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
steps:
2222
- uses: actions/checkout@v3
23-
- uses: dtolnay/rust-toolchain@1.59.0 # dictated by `windows` crates effectively, IMPORTANT: adjust etc/msrv-badge.svg as well
23+
- uses: dtolnay/rust-toolchain@1.60.0 # dictated by `windows` crates effectively, IMPORTANT: adjust etc/msrv-badge.svg as well
2424
- run: make check-msrv-on-ci
2525
continue-on-error: true # TODO: turn this off once the toolchain gets updated. There is a strange error preventing cargo to select the correct libgit2 version
2626
# like it doesn't exist.

Cargo.lock

+43-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ members = [
146146
"git-packetline",
147147
"git-mailmap",
148148
"git-note",
149+
"git-fetchhead",
149150
"git-prompt",
150151
"git-filter",
151152
"git-sec",

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ is usable to some extend.
149149
* [git-date](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-date)
150150
* **idea** _(just a name placeholder)_
151151
* [git-note](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-note)
152+
* [git-fetchhead](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-fetchhead)
152153
* [git-filter](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-filter)
153154
* [git-lfs](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-lfs)
154155
* [git-rebase](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-rebase)

crate-status.md

+4
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,10 @@ Check out the [performance discussion][git-traverse-performance] as well.
259259
A mechanism to associate metadata with any object, and keep revisions of it using git itself.
260260

261261
* [ ] CRUD for git notes
262+
263+
### git-fetchhead
264+
* [ ] parse `FETCH_HEAD` information back entirely
265+
* [ ] write typical fetch-head lines
262266

263267
### git-discover
264268

etc/check-package-size.sh

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ echo "in root: gitoxide CLI"
4646
(enter git-filter && indent cargo diet -n --package-size-limit 5KB)
4747
(enter git-lfs && indent cargo diet -n --package-size-limit 5KB)
4848
(enter git-note && indent cargo diet -n --package-size-limit 5KB)
49+
(enter git-fetchhead && indent cargo diet -n --package-size-limit 5KB)
4950
(enter git-sec && indent cargo diet -n --package-size-limit 15KB)
5051
(enter git-tix && indent cargo diet -n --package-size-limit 5KB)
5152
(enter git-credentials && indent cargo diet -n --package-size-limit 20KB)

etc/msrv-badge.svg

+1-1
Loading

git-actor/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ doctest = false
1313

1414
[features]
1515
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
16-
serde1 = ["serde", "bstr/serde1", "git-date/serde1"]
16+
serde1 = ["serde", "bstr/serde", "git-date/serde1"]
1717

1818
[dependencies]
1919
git-features = { version = "^0.22.4", path = "../git-features", optional = true }
2020
git-date = { version = "^0.1.0", path = "../git-date" }
2121

2222
quick-error = "2.0.0"
2323
btoi = "0.4.2"
24-
bstr = { version = "0.2.13", default-features = false, features = ["std", "unicode"]}
24+
bstr = { version = "1.0.1", default-features = false, features = ["std", "unicode"]}
2525
nom = { version = "7", default-features = false, features = ["std"]}
2626
itoa = "1.0.1"
2727
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}

git-attributes/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ doctest = false
1313

1414
[features]
1515
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
16-
serde1 = ["serde", "bstr/serde1", "git-glob/serde1", "compact_str/serde"]
16+
serde1 = ["serde", "bstr/serde", "git-glob/serde1", "compact_str/serde"]
1717

1818
[dependencies]
1919
git-features = { version = "^0.22.4", path = "../git-features" }
2020
git-path = { version = "^0.4.2", path = "../git-path" }
2121
git-quote = { version = "^0.2.1", path = "../git-quote" }
2222
git-glob = { version = "^0.3.2", path = "../git-glob" }
2323

24-
bstr = { version = "0.2.13", default-features = false, features = ["std"]}
24+
bstr = { version = "1.0.1", default-features = false, features = ["std", "unicode"]}
2525
unicode-bom = "1.1.4"
2626
thiserror = "1.0.26"
2727
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}

git-commitgraph/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ doctest = false
1414

1515
[features]
1616
## Data structures implement `serde::Serialize` and `serde::Deserialize`
17-
serde1 = ["serde", "git-hash/serde1", "bstr/serde1"]
17+
serde1 = ["serde", "git-hash/serde1", "bstr/serde"]
1818

1919
[dependencies]
2020
git-features = { version = "^0.22.4", path = "../git-features", features = ["rustsha1"] }
2121
git-hash = { version = "^0.9.9", path = "../git-hash" }
2222
git-chunk = { version = "^0.3.1", path = "../git-chunk" }
2323

24-
bstr = { version = "0.2.13", default-features = false, features = ["std"] }
24+
bstr = { version = "1.0.1", default-features = false, features = ["std"] }
2525
memmap2 = "0.5.0"
2626
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
2727
thiserror = "1.0.26"

git-config-value/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ doctest = false
1212

1313
[features]
1414
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
15-
serde1 = ["serde", "bstr/serde1"]
15+
serde1 = ["serde", "bstr/serde"]
1616

1717
[dependencies]
1818
git-path = { version = "^0.4.2", path = "../git-path" }
1919

2020
thiserror = "1.0.32"
21-
bstr = "0.2.17"
21+
bstr = "1.0.1"
2222
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
2323
bitflags = "1.3.2"
2424

0 commit comments

Comments
 (0)