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 bots to .mailmap #105079

Merged
merged 2 commits into from
Nov 30, 2022
Merged

Add bots to .mailmap #105079

merged 2 commits into from
Nov 30, 2022

Conversation

nnethercote
Copy link
Contributor

Before:
```
$ git shortlog -se | grep "\<bors\>"
 27755	bors <bors@rust-lang.org>
  5729	bors[bot] <26634292+bors[bot]@users.noreply.github.com>
   995	bors[bot] <bors[bot]@users.noreply.github.com>
```
After:
```
$ git shortlog -se | grep "\<bors\>"
 34479	bors <bors@rust-lang.org>
```
Before:
```
$ git shortlog -se | grep "depend"
    44	dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
     6	dependabot-preview[bot] <dependabot-preview[bot]@users.noreply.github.com>
     4	dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    74	dependabot[bot] <dependabot[bot]@users.noreply.github.com>
    93	dependabot[bot] <support@dependabot.com>
```
After:
```
$ git shortlog -se | grep "depend"
   221  dependabot[bot] <dependabot[bot]@users.noreply.github.com>
```
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 30, 2022
@nnethercote
Copy link
Contributor Author

https://thanks.rust-lang.org/rust/all-time/ has an entry:

1433 bors-voyager[bot] 9

but I don't see bors-voyager anywhere in the commit history. Not sure what's going on there.

@jyn514
Copy link
Member

jyn514 commented Nov 30, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 30, 2022

📌 Commit 3593a5d has been approved by jyn514

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 30, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 30, 2022
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#104697 (Restore control flow on error in EUV)
 - rust-lang#104811 (feat: implement TcpStream shutdown for wasm32-wasi)
 - rust-lang#105039 (Fix an ICE parsing a malformed literal in `concat_bytes!`.)
 - rust-lang#105071 (Add Nicholas Nethercote to `.mailmap`.)
 - rust-lang#105079 (Add bots to `.mailmap`)

Failed merges:

 - rust-lang#105074 (Add Nicholas Bishop to `.mailmap`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 815b6e5 into rust-lang:master Nov 30, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 30, 2022
@nnethercote nnethercote deleted the bots-mailmap branch November 30, 2022 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants