File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -121,10 +121,10 @@ rustc-pull)
121
121
# Update rust-version file. As a separate commit, since making it part of
122
122
# the merge has confused the heck out of josh in the past.
123
123
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)
125
125
# 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)
128
128
exit 0
129
129
;;
130
130
rustc-push)
You can’t perform that action at this time.
0 commit comments