Skip to content

Commit 2939459

Browse files
committed
update
1 parent 54d7091 commit 2939459

File tree

1 file changed

+5
-0
lines changed
  • library/compiler-builtins/crates/josh-sync/src

1 file changed

+5
-0
lines changed

library/compiler-builtins/crates/josh-sync/src/sync.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ impl GitSync {
6666
assert_ne!(previous_upstream_base, new_upstream_base, "nothing to pull");
6767

6868
let orig_head = self.read(["git", "rev-parse", "HEAD"]);
69+
println!("original upstream base: {previous_upstream_base}");
70+
println!("new upstream base: {new_upstream_base}");
71+
println!("original HEAD: {orig_head}");
6972

7073
// Fetch the latest upstream HEAD so we can get a summary. Use the Josh URL for caching.
7174
self.run([
@@ -103,6 +106,7 @@ impl GitSync {
103106
// Fetch given rustc commit.
104107
self.run(["git", "fetch", &josh_url_filtered]);
105108
let incoming_ref = self.read(["git", "rev-parse", "FETCH_HEAD"]);
109+
println!("incoming ref: {incoming_ref}");
106110

107111
let merge_message = format!(
108112
"Merge ref {upstream_head_short}{filter} from {upstream_url}\n\n\
@@ -124,6 +128,7 @@ impl GitSync {
124128
let num_roots_before = num_roots();
125129

126130
let pre_merge_sha = self.read(["git", "rev-parse", "HEAD"]);
131+
println!("pre-merge HEAD: {pre_merge_sha}");
127132

128133
// Merge the fetched commit.
129134
self.run([

0 commit comments

Comments
 (0)