Skip to content

Commit 4a27e3a

Browse files
authored
Merge branch 'Byron:main' into main
2 parents 035ca54 + 048e43e commit 4a27e3a

File tree

189 files changed

+5991
-1180
lines changed

Some content is hidden

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

189 files changed

+5991
-1180
lines changed

.gitattributes

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
**/generated-archives/*.tar.xz filter=lfs-disabled diff=lfs merge=lfs -text
22

3-
# assure line feeds don't interfere with our working copy hash
3+
# assure line feeds don't interfere with our working copy hash
44
**/tests/fixtures/**/*.sh text crlf=input eol=lf
55
/justfile text crlf=input eol=lf
6+
7+
# have GitHub treat the gix-packetline-blocking src copy as auto-generated
8+
gix-packetline-blocking/src/ linguist-generated=true

.github/workflows/ci.yml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
# Let's not fail CI for this, it will fail locally often enough, and a crate a little bigger
177177
# than allows is no problem either if it comes to that.
178178
just check-size || true
179-
179+
180180
cargo-deny:
181181
runs-on: ubuntu-latest
182182
strategy:
@@ -193,6 +193,7 @@ jobs:
193193
- uses: EmbarkStudios/cargo-deny-action@v1
194194
with:
195195
command: check ${{ matrix.checks }}
196+
196197
wasm:
197198
name: WebAssembly
198199
runs-on: ubuntu-latest
@@ -213,3 +214,32 @@ jobs:
213214
name: crates with 'wasm' feature
214215
- run: cd gix-pack && cargo build --all-features --target ${{ matrix.target }}
215216
name: gix-pack with all features (including wasm)
217+
218+
check-packetline:
219+
strategy:
220+
fail-fast: false
221+
matrix:
222+
os:
223+
- ubuntu-latest
224+
# We consider this script read-only and its effect is the same everywhere.
225+
# However, when changes are made to `etc/copy-packetline.sh`, re-enable the other platforms for testing.
226+
# - macos-latest
227+
# - windows-latest
228+
runs-on: ${{ matrix.os }}
229+
defaults:
230+
run:
231+
shell: bash
232+
steps:
233+
- uses: actions/checkout@v4
234+
- name: Check that working tree is initially clean
235+
run: |
236+
set -x
237+
git status
238+
git diff --exit-code
239+
- name: Regenerate gix-packetline-blocking/src
240+
run: etc/copy-packetline.sh
241+
- name: Check that gix-packetline-blocking/src was already up to date
242+
run: |
243+
set -x
244+
git status
245+
git diff --exit-code

.gov/info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ maintainers:
88
- push directly to 'main' branch
99
- reviews or suggestions by other maintainers if PRs are used
1010
- co-ownership of contributed crates
11-
- reveive sponsorship via GitHub from project page
11+
- receive sponsorship via GitHub from project page
1212

1313

CHANGELOG.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,62 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## 0.35.0 (2024-04-13)
9+
10+
### New Features
11+
12+
- <csr-id-84c74ffa698d35f8395c63db6acd3d0e6700d07f/> add `gix status --ignored` support
13+
- <csr-id-66e87cd31c060c3f97ac685ee0541c408f600362/> add `gix status --index-worktree-renames`
14+
This enables rename-tracking between worktree and index, something
15+
that Git also doesn't do or doesn't do by default.
16+
It is, however, available in `git2`.
17+
- <csr-id-61c002bc4ca5b5345c411e561fdcb492e7ae1d97/> `gix status` with submodule and rewrite support.
18+
Submodule changes are now picked up as long as the submodule is
19+
in the index.
20+
Further, it's possible to enable rename-tracking between
21+
index and worktree separately.
22+
- <csr-id-98b368095ec99d1bc287da7f9294a9fce424deed/> add `gix is-clean|is-changed`
23+
It's a good way to compare the time it takes to run a full status
24+
compared to a quick is-dirty check.
25+
- <csr-id-afd20caadb40b6b793f2099b7232669f9a8f9086/> `gix submodules list --dirty-suffix` for dirty-information
26+
This is a submodule-centric and greatly simplified way of obtaining
27+
describe information with dirty-suffix.
28+
29+
Note that `status` information is also possible, but it seems
30+
hard to display nicely, which this command isn't great at
31+
in the first place.
32+
- <csr-id-58231b418fa39ea122ef41bb7691289f5b0be855/> add `gix commit describe --dirty-suffix`
33+
That way a suffix will be added depending on the dirty-state of the repository.
34+
35+
### Commit Statistics
36+
37+
<csr-read-only-do-not-edit/>
38+
39+
- 11 commits contributed to the release over the course of 34 calendar days.
40+
- 47 days passed between releases.
41+
- 6 commits were understood as [conventional](https://www.conventionalcommits.org).
42+
- 0 issues like '(#ID)' were seen in commit messages
43+
44+
### Commit Details
45+
46+
<csr-read-only-do-not-edit/>
47+
48+
<details><summary>view details</summary>
49+
50+
* **Uncategorized**
51+
- Merge pull request #1341 from szepeviktor/typos ([`55f379b`](https://github.com/Byron/gitoxide/commit/55f379bc47065822d078393d83d30c0835a89782))
52+
- Fix typos ([`f72ecce`](https://github.com/Byron/gitoxide/commit/f72ecce45babcad2a0c9b73c79d01ff502907a57))
53+
- Merge branch 'status' ([`3e5c974`](https://github.com/Byron/gitoxide/commit/3e5c974dd62ac134711c6c2f5a5490187a6ea55e))
54+
- Add `gix status --format` to communicate the current format is very simple. ([`23bea36`](https://github.com/Byron/gitoxide/commit/23bea36f046a6f652cd1e06885ae132c85bb4f05))
55+
- Add `gix status --ignored` support ([`84c74ff`](https://github.com/Byron/gitoxide/commit/84c74ffa698d35f8395c63db6acd3d0e6700d07f))
56+
- Add `gix status --index-worktree-renames` ([`66e87cd`](https://github.com/Byron/gitoxide/commit/66e87cd31c060c3f97ac685ee0541c408f600362))
57+
- Fix lints for nightly, and clippy ([`f8ce3d0`](https://github.com/Byron/gitoxide/commit/f8ce3d0721b6a53713a9392f2451874f520bc44c))
58+
- `gix status` with submodule and rewrite support. ([`61c002b`](https://github.com/Byron/gitoxide/commit/61c002bc4ca5b5345c411e561fdcb492e7ae1d97))
59+
- Add `gix is-clean|is-changed` ([`98b3680`](https://github.com/Byron/gitoxide/commit/98b368095ec99d1bc287da7f9294a9fce424deed))
60+
- `gix submodules list --dirty-suffix` for dirty-information ([`afd20ca`](https://github.com/Byron/gitoxide/commit/afd20caadb40b6b793f2099b7232669f9a8f9086))
61+
- Add `gix commit describe --dirty-suffix` ([`58231b4`](https://github.com/Byron/gitoxide/commit/58231b418fa39ea122ef41bb7691289f5b0be855))
62+
</details>
63+
864
## 0.34.0 (2024-02-25)
965

1066
### New Features

0 commit comments

Comments
 (0)