Skip to content

Commit

Permalink
Merge branch 'main' into filter-refs-by-spec
Browse files Browse the repository at this point in the history
Conflicts:
	cargo-smart-release/Cargo.toml
	experiments/diffing/Cargo.toml
	experiments/object-access/Cargo.toml
	experiments/traversal/Cargo.toml
	git-repository/Cargo.toml
	gitoxide-core/Cargo.toml
  • Loading branch information
Byron committed Sep 1, 2022
2 parents 9059de8 + 2571831 commit 51dc828
Show file tree
Hide file tree
Showing 23 changed files with 342 additions and 171 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ anyhow = "1.0.42"

gitoxide-core = { version = "^0.18.0", path = "gitoxide-core" }
git-features = { version = "^0.22.3", path = "git-features" }
git-repository = { version = "^0.23.0", path = "git-repository", default-features = false }
git-repository = { version = "^0.23.1", path = "git-repository", default-features = false }

git-transport-for-configuration-only = { package = "git-transport", optional = true, version = "^0.19.3", path = "git-transport" }

Expand Down
2 changes: 1 addition & 1 deletion cargo-smart-release/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ test = false
cache-efficiency-debug = ["git-repository/cache-efficiency-debug"]

[dependencies]
git-repository = { version = "^0.23.0", path = "../git-repository", default-features = false, features = ["max-performance-safe"] }
git-repository = { version = "^0.23.1", path = "../git-repository", default-features = false, features = ["max-performance-safe"] }
anyhow = "1.0.42"
clap = { version = "3.2.5", features = ["derive", "cargo"] }
env_logger = { version = "0.9.0", default-features = false, features = ["humantime", "termcolor", "atty"] }
Expand Down
2 changes: 1 addition & 1 deletion experiments/diffing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ publish = false

[dependencies]
anyhow = "1"
git-repository = { version = "^0.23.0", path = "../../git-repository" }
git-repository = { version = "^0.23.1", path = "../../git-repository" }
git-features-for-config = { package = "git-features", version = "^0.22.3", path = "../../git-features", features = ["cache-efficiency-debug"] }
git2 = "0.14"
rayon = "1.5.0"
2 changes: 1 addition & 1 deletion experiments/object-access/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ publish = false

[dependencies]
anyhow = "1"
git-repository = { path = "../../git-repository", version = "^0.23.0" }
git-repository = { path = "../../git-repository", version = "^0.23.1" }
git2 = "0.14"
rayon = "1.5.0"
parking_lot = { version = "0.12.0", default-features = false }
2 changes: 1 addition & 1 deletion experiments/traversal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ publish = false

[dependencies]
anyhow = "1"
git-repository = { version = "^0.23.0", path = "../../git-repository" }
git-repository = { version = "^0.23.1", path = "../../git-repository" }
git2 = "0.14"
rayon = "1.5.0"
dashmap = "5.1.0"
79 changes: 52 additions & 27 deletions git-diff/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,30 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.18.1 (2022-09-01)

Maintenance release without user-facing changes.

### Commit Statistics

<csr-read-only-do-not-edit/>

- 2 commits contributed to the release.
- 3 days passed between releases.
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details

<csr-read-only-do-not-edit/>

<details><summary>view details</summary>

* **Uncategorized**
- prepare changelog prior to release ([`fc6b958`](https://github.com/Byron/gitoxide/commit/fc6b9583d0534f70e0c8afdcad46e09a5001d62b))
- fix docs ([`34e899a`](https://github.com/Byron/gitoxide/commit/34e899ae0e4a23bba6dc36dfd7429c0d572736bd))
</details>

## 0.18.0 (2022-08-28)

### Bug Fixes (BREAKING)
Expand All @@ -15,9 +39,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<csr-read-only-do-not-edit/>

- 4 commits contributed to the release.
- 5 commits contributed to the release.
- 4 days passed between releases.
- 1 commit where understood as [conventional](https://www.conventionalcommits.org).
- 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- 1 unique issue was worked on: [#XXX](https://github.com/Byron/gitoxide/issues/XXX)

### Commit Details
Expand All @@ -29,6 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* **[#XXX](https://github.com/Byron/gitoxide/issues/XXX)**
- prepare changelogs prior to release ([`8c0bca3`](https://github.com/Byron/gitoxide/commit/8c0bca37ff9fbaadbe55561fb2b0d649980c95b1))
* **Uncategorized**
- Release git-object v0.20.3, git-ref v0.15.4, git-config v0.7.1, git-diff v0.18.0, git-traverse v0.16.3, git-pack v0.22.0, git-odb v0.32.0, git-url v0.7.3, git-transport v0.19.3, git-protocol v0.19.1, git-refspec v0.1.1, git-repository v0.23.0, safety bump 6 crates ([`85a3bed`](https://github.com/Byron/gitoxide/commit/85a3bedd68d2e5f36592a2f691c977dc55298279))
- Don't degenerate errors when accessing objects ([`6d9533d`](https://github.com/Byron/gitoxide/commit/6d9533dd987241fe0ddf0e401512ca6bdf0d3ff0))
- Use thiserror instead of quickerror ([`0661d48`](https://github.com/Byron/gitoxide/commit/0661d4877978ce17117233f6116be1f7b512f449))
- fix docs ([`bfdcb13`](https://github.com/Byron/gitoxide/commit/bfdcb13b11faae161c3e3f5d20c83d41a91b9de9))
Expand All @@ -50,7 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- 4 commits contributed to the release over the course of 3 calendar days.
- 6 days passed between releases.
- 2 commits where understood as [conventional](https://www.conventionalcommits.org).
- 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -76,7 +101,7 @@ A maintenance release without user facing changes.

- 5 commits contributed to the release over the course of 26 calendar days.
- 26 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -103,7 +128,7 @@ This is a maintenance release with no functional changes.

- 6 commits contributed to the release over the course of 30 calendar days.
- 64 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand Down Expand Up @@ -131,7 +156,7 @@ A maintenance release without user-facing changes.

- 6 commits contributed to the release over the course of 34 calendar days.
- 43 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 2 unique issues were worked on: [#301](https://github.com/Byron/gitoxide/issues/301), [#384](https://github.com/Byron/gitoxide/issues/384)

### Commit Details
Expand Down Expand Up @@ -165,7 +190,7 @@ A maintenance release without user-facing changes.

- 5 commits contributed to the release over the course of 1 calendar day.
- 2 days passed between releases.
- 1 commit where understood as [conventional](https://www.conventionalcommits.org).
- 1 commit was understood as [conventional](https://www.conventionalcommits.org).
- 1 unique issue was worked on: [#298](https://github.com/Byron/gitoxide/issues/298)

### Commit Details
Expand Down Expand Up @@ -193,7 +218,7 @@ A maintenance release primarily to adapt to dependent crates.

- 7 commits contributed to the release over the course of 68 calendar days.
- 69 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 1 unique issue was worked on: [#364](https://github.com/Byron/gitoxide/issues/364)

### Commit Details
Expand Down Expand Up @@ -233,7 +258,7 @@ A maintenance release primarily to adapt to dependent crates.

- 11 commits contributed to the release over the course of 51 calendar days.
- 55 days passed between releases.
- 2 commits where understood as [conventional](https://www.conventionalcommits.org).
- 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- 2 unique issues were worked on: [#266](https://github.com/Byron/gitoxide/issues/266), [#279](https://github.com/Byron/gitoxide/issues/279)

### Thanks Clippy
Expand Down Expand Up @@ -274,7 +299,7 @@ A maintenance release, triggered by putting too many adjustments into a single c

- 4 commits contributed to the release over the course of 11 calendar days.
- 12 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -300,7 +325,7 @@ A maintenance release triggered by changes to git-pack and changelog rewrites.

- 4 commits contributed to the release.
- 27 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 1 unique issue was worked on: [#254](https://github.com/Byron/gitoxide/issues/254)

### Commit Details
Expand All @@ -327,7 +352,7 @@ A maintenance release due to properly dealing with previously breaking changes i

- 4 commits contributed to the release.
- 3 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 1 unique issue was worked on: [#222](https://github.com/Byron/gitoxide/issues/222)

### Commit Details
Expand Down Expand Up @@ -356,7 +381,7 @@ version number generation.

- 19 commits contributed to the release over the course of 31 calendar days.
- 36 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 1 unique issue was worked on: [#198](https://github.com/Byron/gitoxide/issues/198)

### Commit Details
Expand Down Expand Up @@ -396,7 +421,7 @@ version number generation.

- 2 commits contributed to the release.
- 1 day passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -418,7 +443,7 @@ version number generation.

- 3 commits contributed to the release over the course of 1 calendar day.
- 10 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -441,7 +466,7 @@ version number generation.

- 6 commits contributed to the release over the course of 1 calendar day.
- 10 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -467,7 +492,7 @@ version number generation.

- 2 commits contributed to the release over the course of 1 calendar day.
- 3 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -488,7 +513,7 @@ version number generation.
<csr-read-only-do-not-edit/>

- 2 commits contributed to the release.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -510,7 +535,7 @@ version number generation.

- 4 commits contributed to the release over the course of 1 calendar day.
- 1 day passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -533,7 +558,7 @@ version number generation.
<csr-read-only-do-not-edit/>

- 3 commits contributed to the release.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -555,7 +580,7 @@ version number generation.
<csr-read-only-do-not-edit/>

- 4 commits contributed to the release.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -578,7 +603,7 @@ version number generation.
<csr-read-only-do-not-edit/>

- 2 commits contributed to the release.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -600,7 +625,7 @@ version number generation.

- 18 commits contributed to the release over the course of 83 calendar days.
- 93 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand Down Expand Up @@ -638,7 +663,7 @@ version number generation.

- 7 commits contributed to the release over the course of 6 calendar days.
- 6 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand All @@ -665,7 +690,7 @@ version number generation.

- 12 commits contributed to the release over the course of 2 calendar days.
- 2 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand Down Expand Up @@ -697,7 +722,7 @@ version number generation.

- 65 commits contributed to the release over the course of 4 calendar days.
- 4 days passed between releases.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand Down Expand Up @@ -787,7 +812,7 @@ version number generation.
<csr-read-only-do-not-edit/>

- 1 commit contributed to the release.
- 0 commits where understood as [conventional](https://www.conventionalcommits.org).
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
- 0 issues like '(#ID)' where seen in commit messages

### Commit Details
Expand Down
2 changes: 1 addition & 1 deletion git-diff/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "git-diff"
version = "0.18.0"
version = "0.18.1"
repository = "https://github.com/Byron/gitoxide"
license = "MIT/Apache-2.0"
description = "Calculate differences between various git objects"
Expand Down

0 comments on commit 51dc828

Please sign in to comment.