Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade gix from 0.62 to 0.63 #13948

Merged
merged 1 commit into from
May 22, 2024
Merged

upgrade gix from 0.62 to 0.63 #13948

merged 1 commit into from
May 22, 2024

Conversation

Byron
Copy link
Member

@Byron Byron commented May 22, 2024

This is a bugfix release with various improvements, some of which relevant to safety when checking out (possibly freshly cloned) repositories.

See GHSA-7w47-3wg8-547c and GHSA-49jc-r788-3fc9 (might not be published yet as it was waiting for feedback at the time of writing).

This is a bugfix release with various improvements, some of which relevant
to safety when checking out (possibly freshly cloned) repositories.

See GHSA-7w47-3wg8-547c
and GHSA-49jc-r788-3fc9
@rustbot
Copy link
Collaborator

rustbot commented May 22, 2024

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 22, 2024
@epage
Copy link
Contributor

epage commented May 22, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented May 22, 2024

📌 Commit 81a59b0 has been approved by epage

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 22, 2024
@bors
Copy link
Collaborator

bors commented May 22, 2024

⌛ Testing commit 81a59b0 with merge e218cde...

bors added a commit that referenced this pull request May 22, 2024
upgrade gix from 0.62 to 0.63

This is a bugfix release with various improvements, some of which relevant to safety when checking out (possibly freshly cloned) repositories.

See GHSA-7w47-3wg8-547c and GHSA-49jc-r788-3fc9 (might not be published yet as it was waiting for feedback at the time of writing).
@weihanglo
Copy link
Member

Wonder if this is worth a beta backport. The issue #13923 shows that it was too strict on malformed gitconfig

@epage
Copy link
Contributor

epage commented May 22, 2024

I assumed there would be. If the risk from this upgrade is too high, we should probably find a different way to fixing beta.

@weihanglo weihanglo added the beta-nominated Nominated to backport to the beta branch. label May 22, 2024
@Byron
Copy link
Member Author

Byron commented May 22, 2024

I assumed there would be. If the risk from this upgrade is too high, we should probably find a different way to fixing beta.

I don't know if it helps to know that this is a bugfix release with no features added (unfortunately). If the gix version in beta is 0.62, then I would expect no issues with this one.

@bors
Copy link
Collaborator

bors commented May 22, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing e218cde to master...

@bors
Copy link
Collaborator

bors commented May 22, 2024

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request.

@weihanglo
Copy link
Member

https://github.com/rust-lang/cargo/blob/rust-1.79.0/Cargo.lock#L1094

Yeah, looks like in beta we use gix@0.62.0.

@Byron
Copy link
Member Author

Byron commented May 22, 2024

I don't know what to do about the CI failure - when I click it, it all looks green. Maybe it's something unrelated, so I am setting this as ready for review.

@Byron Byron marked this pull request as ready for review May 22, 2024 14:37
@weihanglo
Copy link
Member

@bors retry

@weihanglo
Copy link
Member

@bors r-

@bors bors added S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 22, 2024
@weihanglo
Copy link
Member

@bors r=epage

@bors
Copy link
Collaborator

bors commented May 22, 2024

📌 Commit 81a59b0 has been approved by epage

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. labels May 22, 2024
@bors
Copy link
Collaborator

bors commented May 22, 2024

⌛ Testing commit 81a59b0 with merge 145b225...

@bors
Copy link
Collaborator

bors commented May 22, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing 145b225 to master...

@bors bors merged commit 145b225 into rust-lang:master May 22, 2024
23 checks passed
bors added a commit that referenced this pull request May 22, 2024
[beta-1.79] upgrade gix from 0.62 to 0.63

Beta backports:

- #13948

In order to make CI pass, the following PRs are also cherry-picked:

-
bors added a commit to rust-lang-ci/rust that referenced this pull request May 24, 2024
Update cargo

7 commits in 84dc5dc11a9007a08f27170454da6097265e510e..a8d72c675ee52dd57f0d8f2bae6655913c15b2fb
2024-05-20 18:57:08 +0000 to 2024-05-24 03:34:17 +0000
- Improve error description when deserializing partial field struct (rust-lang/cargo#13956)
- fix: remove symlink dir on Windows (rust-lang/cargo#13910)
- Fix wrong type of rustc-flags in documentation (rust-lang/cargo#13957)
- Add more high level traces (rust-lang/cargo#13951)
- upgrade gix from 0.62 to 0.63 (rust-lang/cargo#13948)
- Use `i32` rather than `usize` as "default integer" in library template (rust-lang/cargo#13939)
- fetch specific commits even if the github fast path fails (rust-lang/cargo#13946)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request May 25, 2024
Update cargo

7 commits in 84dc5dc11a9007a08f27170454da6097265e510e..a8d72c675ee52dd57f0d8f2bae6655913c15b2fb
2024-05-20 18:57:08 +0000 to 2024-05-24 03:34:17 +0000
- Improve error description when deserializing partial field struct (rust-lang/cargo#13956)
- fix: remove symlink dir on Windows (rust-lang/cargo#13910)
- Fix wrong type of rustc-flags in documentation (rust-lang/cargo#13957)
- Add more high level traces (rust-lang/cargo#13951)
- upgrade gix from 0.62 to 0.63 (rust-lang/cargo#13948)
- Use `i32` rather than `usize` as "default integer" in library template (rust-lang/cargo#13939)
- fetch specific commits even if the github fast path fails (rust-lang/cargo#13946)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request May 25, 2024
Update cargo

7 commits in 84dc5dc11a9007a08f27170454da6097265e510e..a8d72c675ee52dd57f0d8f2bae6655913c15b2fb
2024-05-20 18:57:08 +0000 to 2024-05-24 03:34:17 +0000
- Improve error description when deserializing partial field struct (rust-lang/cargo#13956)
- fix: remove symlink dir on Windows (rust-lang/cargo#13910)
- Fix wrong type of rustc-flags in documentation (rust-lang/cargo#13957)
- Add more high level traces (rust-lang/cargo#13951)
- upgrade gix from 0.62 to 0.63 (rust-lang/cargo#13948)
- Use `i32` rather than `usize` as "default integer" in library template (rust-lang/cargo#13939)
- fetch specific commits even if the github fast path fails (rust-lang/cargo#13946)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request May 25, 2024
Update cargo

7 commits in 84dc5dc11a9007a08f27170454da6097265e510e..a8d72c675ee52dd57f0d8f2bae6655913c15b2fb
2024-05-20 18:57:08 +0000 to 2024-05-24 03:34:17 +0000
- Improve error description when deserializing partial field struct (rust-lang/cargo#13956)
- fix: remove symlink dir on Windows (rust-lang/cargo#13910)
- Fix wrong type of rustc-flags in documentation (rust-lang/cargo#13957)
- Add more high level traces (rust-lang/cargo#13951)
- upgrade gix from 0.62 to 0.63 (rust-lang/cargo#13948)
- Use `i32` rather than `usize` as "default integer" in library template (rust-lang/cargo#13939)
- fetch specific commits even if the github fast path fails (rust-lang/cargo#13946)

r? ghost
@rustbot rustbot added this to the 1.80.0 milestone May 25, 2024
RalfJung pushed a commit to RalfJung/miri that referenced this pull request May 27, 2024
Update cargo

7 commits in 84dc5dc11a9007a08f27170454da6097265e510e..a8d72c675ee52dd57f0d8f2bae6655913c15b2fb
2024-05-20 18:57:08 +0000 to 2024-05-24 03:34:17 +0000
- Improve error description when deserializing partial field struct (rust-lang/cargo#13956)
- fix: remove symlink dir on Windows (rust-lang/cargo#13910)
- Fix wrong type of rustc-flags in documentation (rust-lang/cargo#13957)
- Add more high level traces (rust-lang/cargo#13951)
- upgrade gix from 0.62 to 0.63 (rust-lang/cargo#13948)
- Use `i32` rather than `usize` as "default integer" in library template (rust-lang/cargo#13939)
- fetch specific commits even if the github fast path fails (rust-lang/cargo#13946)

r? ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-nominated Nominated to backport to the beta branch. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants