Skip to content

Add uptream diff link to pull merge commit message #23

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 4, 2025
Merged

Add uptream diff link to pull merge commit message #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,16 @@ Pull recent changes from https://github.com/{upstream_repo} via Josh.

Upstream ref: {upstream_sha}
Filtered ref: {incoming_ref}
Upstream diff: https://github.com/{DEFAULT_UPSTREAM_REPO}/compare/{prev_upstream_sha}...{upstream_sha}

This merge was created using https://github.com/rust-lang/josh-sync.
"#,
upstream_head_short = &upstream_sha[..12],
prev_upstream_sha = self
.context
.last_upstream_sha
.as_deref()
.unwrap_or(&upstream_sha)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this will be a kind of pointless diff if last_upstream_sha is not set?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, but that should only ever happen on the very first pull, so I don't think it's very important.

);

// Merge the fetched commit.
Expand Down Expand Up @@ -367,7 +373,7 @@ fn prepare_rustc_checkout(verbose: bool) -> anyhow::Result<PathBuf> {
"git",
"clone",
"--filter=blob:none",
"https://github.com/rust-lang/rust",
&format!("https://github.com/{DEFAULT_UPSTREAM_REPO}"),
path,
],
verbose,
Expand Down
Loading