We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 7d59cb3 commit c92957dCopy full SHA for c92957d
josh-sync/src/sync.rs
@@ -45,6 +45,11 @@ impl GitSync {
45
let josh_url =
46
format!("http://localhost:{JOSH_PORT}/{UPSTREAM_REPO}.git@{commit}{JOSH_FILTER}.git");
47
48
+ let previous_base_commit = sh.read_file("rust-version")?.trim().to_string();
49
+ if previous_base_commit == commit {
50
+ return Err(anyhow::anyhow!("No changes since last pull"));
51
+ }
52
+
53
// Update rust-version file. As a separate commit, since making it part of
54
// the merge has confused the heck out of josh in the past.
55
// We pass `--no-verify` to avoid running git hooks.
0 commit comments