Auto merge of #15005 - aneeshusa:fix-git-author-setting-for-brew-upload, r=jdm

Fix git author setting for brew upload

<!-- Please describe your changes on the following line: -->

The fix from #14935 wasn't quite right.

cc @paulrouget

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix servo/saltfs#575 properly (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they should be tested by running the mac-nightly builder

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15005)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-01-13 06:33:56 -08:00 committed by GitHub
commit dc93a72997

View file

@ -11,7 +11,9 @@ shopt -s failglob
usage() {
printf "usage: ${0} android|linux|mac|macbrew|windows-gnu|windows-msvc\n"
printf \
"usage: %s android|linux|mac|macbrew|windows-gnu|windows-msvc\n" \
"${0}"
}
@ -52,8 +54,10 @@ update_brew() {
> "${tmp_dir}/Formula/servo-bin.rb"
git -C "${tmp_dir}" add ./Formula/servo-bin.rb
git -C "${tmp_dir}" commit \
--author="Tom Servo <servo@servo.org>" \
git -C "${tmp_dir}" \
-c user.name="Tom Servo" \
-c user.email="servo@servo.org" \
commit \
--message="Version bump: ${version}"
git -C "${tmp_dir}" push -qf \