update

Author: tgross35

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

@@ -87,9 +87,8 @@ impl GitSync {
 
         let prep_message = format!(
             "Update the upstream Rust version\n\n\
-            Update the version file to the following commit:\n\n    \
-            {new_summary}\n\n\
-            in order to prepare for merging from {upstream_repo}.
+            To prepare for merging from {upstream_repo}, set the version file to:\n\n    \
+            {new_summary}\n\
             ",
         );
         self.run([
@@ -109,7 +108,7 @@ impl GitSync {
             "Merge ref {upstream_head_short}{filter} from {upstream_url}\n\n\
             Pull recent changes from {upstream_repo} via Josh.\n\n
             Upstream ref: {new_upstream_base}\n\
-            Filtered ref: {incoming_ref}
+            Filtered ref: {incoming_ref}\n\
             ",
             upstream_head_short = &new_upstream_base[..12],
             filter = self.josh_filter
@@ -130,7 +129,7 @@ impl GitSync {
         self.run([
             "git",
             "merge",
-            &incoming_ref,
+            "FETCH_HEAD",
             "--no-verify",
             "--no-ff",
             "-m",