Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add git author #14935

Merged
merged 1 commit into from Jan 10, 2017
Merged

Add git author #14935

merged 1 commit into from Jan 10, 2017

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented Jan 10, 2017

fix servo/saltfs#575


This change is Reviewable

@highfive
Copy link

highfive commented Jan 10, 2017

Heads up! This PR modifies the following files:

@paulrouget paulrouget assigned aneeshusa and unassigned pcwalton Jan 10, 2017
@paulrouget paulrouget force-pushed the paulrouget:gitAuthor branch from 888b58a to 879ec8b Jan 10, 2017
Copy link
Member

aneeshusa left a comment

LGTM aside from 2 nits.

@@ -52,7 +52,8 @@ update_brew() {
> "${tmp_dir}/Formula/servo-bin.rb"

git -C "${tmp_dir}" add ./Formula/servo-bin.rb
git -C "${tmp_dir}" commit -m "Version bump: ${version}"
git -C "${tmp_dir}" commit --author="Tom Servo <servo@servo.org>" \

This comment has been minimized.

@aneeshusa

aneeshusa Jan 10, 2017

Member

nit: move --author=... to next line

@@ -52,7 +52,8 @@ update_brew() {
> "${tmp_dir}/Formula/servo-bin.rb"

git -C "${tmp_dir}" add ./Formula/servo-bin.rb
git -C "${tmp_dir}" commit -m "Version bump: ${version}"
git -C "${tmp_dir}" commit --author="Tom Servo <servo@servo.org>" \
-m "Version bump: ${version}"

This comment has been minimized.

@aneeshusa

aneeshusa Jan 10, 2017

Member

nit: use full form (--message=...) for consistency

@paulrouget paulrouget force-pushed the paulrouget:gitAuthor branch from 879ec8b to feffd41 Jan 10, 2017
@paulrouget
Copy link
Contributor Author

paulrouget commented Jan 10, 2017

Comments addressed.

@aneeshusa
Copy link
Member

aneeshusa commented Jan 10, 2017

Thanks for the fix! I'm actually not sure how this was working before...
@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2017

📌 Commit feffd41 has been approved by aneeshusa

@paulrouget
Copy link
Contributor Author

paulrouget commented Jan 10, 2017

@bors-servo: retry

@bors-servo
Copy link
Contributor

bors-servo commented Jan 10, 2017

Testing commit feffd41 with merge 124301c...

bors-servo added a commit that referenced this pull request Jan 10, 2017
Add git author

fix servo/saltfs#575

<!-- 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/14935)
<!-- Reviewable:end -->
@bors-servo bors-servo mentioned this pull request Jan 10, 2017
@bors-servo bors-servo merged commit feffd41 into servo:master Jan 10, 2017
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@aneeshusa aneeshusa mentioned this pull request Jan 13, 2017
3 of 5 tasks complete
bors-servo added a commit that referenced this pull request Jan 13, 2017
…ad, 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 -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

5 participants
You can’t perform that action at this time.