Update git index before running diff-index#148500

Kobzol · 2025-11-04T21:12:39Z

Discussed in https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/tidy.3A.20strange.20number.20of.20modified.20files/with/553714742.

This is apparently the cause of x test tidy printing weird number of formatted files, and also of sometimes quirky behavior of finding the files modified from a base commit.

rustbot · 2025-11-04T21:12:44Z

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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

jyn514 · 2025-11-04T21:15:45Z

src/build_helper/src/git.rs

note that this discards stderr as well as stdout — you probably only want to discard stdout.

I wanted to discard all crap from git 😆 But you're right that stderr might be useful.

I would say keep the stderr, otherwise if the user has any git shenanigans it will be extremely confusing

jieyouxu · 2025-11-06T05:14:53Z

@rustbot author

Kobzol · 2025-11-11T10:20:01Z

Changed to only ignore stdout.

jieyouxu

Thanks

View changes since this review

jieyouxu · 2025-11-11T15:45:13Z

@bors r+ rollup

bors · 2025-11-11T15:45:16Z

📌 Commit 69da9af has been approved by jieyouxu

It is now in the queue for this repository.

Update git index before running diff-index Discussed in https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/tidy.3A.20strange.20number.20of.20modified.20files/with/553714742. This is apparently the cause of `x test tidy` printing weird number of formatted files, and also of sometimes quirky behavior of finding the files modified from a base commit.

Rollup of 6 pull requests Successful merges: - #147753 (Suggest add bounding value for RangeTo) - #148080 ([rustdoc] Fix invalid jump to def macro link generation) - #148465 (Adjust spans into the `for` loops context before creating the new desugaring spans.) - #148500 (Update git index before running diff-index) - #148536 (cmse: add test for `async` and `const` functions) - #148819 (Remove specialized warning for removed target) r? `@ghost` `@rustbot` modify labels: rollup

Update git index before running diff-index Discussed in https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/tidy.3A.20strange.20number.20of.20modified.20files/with/553714742. This is apparently the cause of `x test tidy` printing weird number of formatted files, and also of sometimes quirky behavior of finding the files modified from a base commit.

Rollup of 12 pull requests Successful merges: - #146627 (Simplify `jemalloc` setup) - #147753 (Suggest add bounding value for RangeTo) - #147974 (Improve diagnostics for buffer reuse with borrowed references) - #148080 ([rustdoc] Fix invalid jump to def macro link generation) - #148424 (bootstrap: Add snapshot tests for path-to-step handling) - #148500 (Update git index before running diff-index) - #148536 (cmse: add test for `async` and `const` functions) - #148770 (implement `feature(c_variadic_naked_functions)`) - #148819 (Remove specialized warning for removed target) - #148830 (miri subtree update) - #148833 (Update rustbook dependencies) - #148841 (Remove more `#[must_use]` from portable-simd) r? `@ghost` `@rustbot` modify labels: rollup

Update git index before running diff-index Discussed in https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/tidy.3A.20strange.20number.20of.20modified.20files/with/553714742. This is apparently the cause of `x test tidy` printing weird number of formatted files, and also of sometimes quirky behavior of finding the files modified from a base commit.

Rollup of 16 pull requests Successful merges: - #146627 (Simplify `jemalloc` setup) - #147753 (Suggest add bounding value for RangeTo) - #147832 (rustdoc: Don't pass `RenderOptions` to `DocContext`) - #147974 (Improve diagnostics for buffer reuse with borrowed references) - #148080 ([rustdoc] Fix invalid jump to def macro link generation) - #148465 (Adjust spans into the `for` loops context before creating the new desugaring spans.) - #148500 (Update git index before running diff-index) - #148531 (rustc_target: introduce Abi, Env, Os) - #148536 (cmse: add test for `async` and `const` functions) - #148770 (implement `feature(c_variadic_naked_functions)`) - #148780 (fix filecheck typos in tests) - #148819 (Remove specialized warning for removed target) - #148830 (miri subtree update) - #148833 (Update rustbook dependencies) - #148834 (fix(rustdoc): Color doctest errors) - #148841 (Remove more `#[must_use]` from portable-simd) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #148500 - Kobzol:git-update-inex, r=jieyouxu Update git index before running diff-index Discussed in https://rust-lang.zulipchat.com/#narrow/channel/326414-t-infra.2Fbootstrap/topic/tidy.3A.20strange.20number.20of.20modified.20files/with/553714742. This is apparently the cause of `x test tidy` printing weird number of formatted files, and also of sometimes quirky behavior of finding the files modified from a base commit.

Rollup of 16 pull requests Successful merges: - rust-lang/rust#146627 (Simplify `jemalloc` setup) - rust-lang/rust#147753 (Suggest add bounding value for RangeTo) - rust-lang/rust#147832 (rustdoc: Don't pass `RenderOptions` to `DocContext`) - rust-lang/rust#147974 (Improve diagnostics for buffer reuse with borrowed references) - rust-lang/rust#148080 ([rustdoc] Fix invalid jump to def macro link generation) - rust-lang/rust#148465 (Adjust spans into the `for` loops context before creating the new desugaring spans.) - rust-lang/rust#148500 (Update git index before running diff-index) - rust-lang/rust#148531 (rustc_target: introduce Abi, Env, Os) - rust-lang/rust#148536 (cmse: add test for `async` and `const` functions) - rust-lang/rust#148770 (implement `feature(c_variadic_naked_functions)`) - rust-lang/rust#148780 (fix filecheck typos in tests) - rust-lang/rust#148819 (Remove specialized warning for removed target) - rust-lang/rust#148830 (miri subtree update) - rust-lang/rust#148833 (Update rustbook dependencies) - rust-lang/rust#148834 (fix(rustdoc): Color doctest errors) - rust-lang/rust#148841 (Remove more `#[must_use]` from portable-simd) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned Mark-Simulacrum Nov 4, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Nov 4, 2025

jyn514 reviewed Nov 4, 2025

View reviewed changes

jieyouxu assigned jieyouxu and unassigned Mark-Simulacrum Nov 5, 2025

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 6, 2025

Update git index before running diff-index

69da9af

Kobzol force-pushed the git-update-inex branch from 96536a6 to 69da9af Compare November 11, 2025 10:19

jieyouxu approved these changes Nov 11, 2025

View reviewed changes

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: This is awaiting some action (such as code changes or more information) from the author. labels Nov 11, 2025

GuillaumeGomez mentioned this pull request Nov 11, 2025

Rollup of 6 pull requests #148829

Closed

Zalathar mentioned this pull request Nov 11, 2025

Rollup of 13 pull requests #148844

Closed

Zalathar mentioned this pull request Nov 11, 2025

Rollup of 12 pull requests #148845

Closed

Zalathar mentioned this pull request Nov 12, 2025

Rollup of 16 pull requests #148851

Merged

bors merged commit de8f0c0 into rust-lang:main Nov 12, 2025
11 checks passed

rustbot added this to the 1.93.0 milestone Nov 12, 2025

Kobzol deleted the git-update-inex branch November 12, 2025 06:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update git index before running diff-index#148500