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

bors takes credit for squashed PRs #136

Open
camelid opened this issue Feb 25, 2021 · 4 comments · May be fixed by #152
Open

bors takes credit for squashed PRs #136

camelid opened this issue Feb 25, 2021 · 4 comments · May be fixed by #152

Comments

@camelid
Copy link
Member

camelid commented Feb 25, 2021

bors takes authorship credit for @bors squash PRs: rust-lang/rust@4b80687 (PR is rust-lang/rust#81398).

Also, not sure if this is related, but GitHub doesn't realize the PR is merged when bors squash-merges it (you can see an example in the same PR).

@camelid
Copy link
Member Author

camelid commented Mar 20, 2021

I believe this is the code at fault:

homu/homu/main.py

Lines 969 to 977 in 93ea32a

args = [base_sha]
if repo_cfg.get('autosquash', False):
args += ['-i', '--autosquash']
utils.logged_call(git_cmd('-c',
'user.name=' + git_cfg['name'],
'-c',
'user.email=' + git_cfg['email'],
'rebase',
*args))

I think git_cfg is bors's config, not the PR author's.

@kellda
Copy link
Contributor

kellda commented Sep 9, 2021

@camelid autosquash is not actually used, the code at fault is a bit further down (implemented in 143278a)

Is to ok to take the info from the first or last commit ?

@kellda
Copy link
Contributor

kellda commented Sep 9, 2021

Btw it seems one can't tell GitHub that a PR was merged, and GitHub can't find it by itself since the merged commit is not the same as those originally in the PR.

@RalfJung
Copy link
Member

Opened #181 for the PR closing part; let's not track two problems in one issue -- the title says this is about the commit author.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants