From 25ef0016b66459b60570c343507822c7b069ec81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= <berykubik@gmail.com>
Date: Mon, 1 Sep 2025 15:34:33 +0200
Subject: [PATCH] Add uptream diff link to pull merge commit message

---
 src/sync.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/sync.rs b/src/sync.rs
index 4eaedff..7270312 100644
--- a/src/sync.rs
+++ b/src/sync.rs
@@ -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)
         );
 
         // Merge the fetched commit.
@@ -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,