@@ -66,6 +66,9 @@ impl GitSync {
66
66
assert_ne ! ( previous_upstream_base, new_upstream_base, "nothing to pull" ) ;
67
67
68
68
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}" ) ;
69
72
70
73
// Fetch the latest upstream HEAD so we can get a summary. Use the Josh URL for caching.
71
74
self . run ( [
@@ -103,6 +106,7 @@ impl GitSync {
103
106
// Fetch given rustc commit.
104
107
self . run ( [ "git" , "fetch" , & josh_url_filtered] ) ;
105
108
let incoming_ref = self . read ( [ "git" , "rev-parse" , "FETCH_HEAD" ] ) ;
109
+ println ! ( "incoming ref: {incoming_ref}" ) ;
106
110
107
111
let merge_message = format ! (
108
112
"Merge ref {upstream_head_short}{filter} from {upstream_url}\n \n \
@@ -124,6 +128,7 @@ impl GitSync {
124
128
let num_roots_before = num_roots ( ) ;
125
129
126
130
let pre_merge_sha = self . read ( [ "git" , "rev-parse" , "HEAD" ] ) ;
131
+ println ! ( "pre-merge HEAD: {pre_merge_sha}" ) ;
127
132
128
133
// Merge the fetched commit.
129
134
self . run ( [
0 commit comments