Skip to content

Commit bbe3a15

Browse files
committed
make it more obvious when the rustc-pull failed
1 parent 697d130 commit bbe3a15

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/tools/miri/miri

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ rustc-pull)
121121
# Update rust-version file. As a separate commit, since making it part of
122122
# the merge has confused the heck out of josh in the past.
123123
echo "$FETCH_COMMIT" > rust-version
124-
git commit rust-version -m "Preparing for merge from rustc"
124+
git commit rust-version -m "Preparing for merge from rustc" || (echo "FAILED to commit rust-version file, something went wrong"; exit 1)
125125
# Fetch given rustc commit and note down which one that was
126-
git fetch http://localhost:8000/rust-lang/rust.git@$FETCH_COMMIT$JOSH_FILTER.git
127-
git merge FETCH_HEAD --no-ff -m "Merge from rustc"
126+
git fetch http://localhost:8000/rust-lang/rust.git@$FETCH_COMMIT$JOSH_FILTER.git || (echo "FAILED to fetch new commits, something went wrong"; exit 1)
127+
git merge FETCH_HEAD --no-ff -m "Merge from rustc" || (echo "FAILED to merge new commits, something went wrong"; exit 1)
128128
exit 0
129129
;;
130130
rustc-push)

0 commit comments

Comments
 (0)