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

SA5001: clarify message #1554

Closed
wants to merge 1 commit into from
Closed

SA5001: clarify message #1554

wants to merge 1 commit into from

Conversation

arp242
Copy link
Contributor

@arp242 arp242 commented May 31, 2024

Clarify the message by putting the function name in there.

Fixes #1489

Clarify the message by putting the function name in there.

Fixes dominikh#1489
@dominikh
Copy link
Owner

@arp242 FYI, I plan to merge all of your PRs once I'm done with some refactoring (which is currently blocked on an x/tools CL). Hopefully soon.

@arp242
Copy link
Contributor Author

arp242 commented May 31, 2024

@arp242 FYI, I plan to merge all of your PRs once I'm done with some refactoring (which is currently blocked on an x/tools CL). Hopefully soon.

Coolio, no hurries. I figured something along these lines. Most PRs aren't too large or complex, and don't mind solving any merge conflicts later on (if need be). And if it gets merged next month or whatever then that's fine with me.

I know it's a bit much, but I got some spare time at the moment and I've been planing to fix some of these issues for years, so it's a bit of a "do it now" or "do it never", so "do it now" seems better. But let me know if there's anything you don't want me to do and that's fine.

@dominikh dominikh closed this in d39a04f Jun 1, 2024
@ccoVeille
Copy link

For this PR and others created by @arp242 I'm confused by the PR status.

It's marked as closed, but the PR wasn't merged. So it's like the code was simply ignored is there something I'm missing?

I feel like the PR number was used in another PR to say "close other PR" while we usually close only issues.

@ccoVeille
Copy link

ccoVeille commented Jun 1, 2024

Where there merged by pushing commits to master outside PR consideration?

As I said I might be missing something, but it looks like to me the workflow look like this:

  • people opens PRs in branches
  • owner cherry pick the commits from these branches
  • owner pushes them to master without respecting PR logic or workflow
  • PRs are closed as if they were discarded, so not merged

I'm a bit doubtful and lost by this uncommon workflow

And somewhere in the middle, the commit messages are rewritten to mention the initial PRs. Which means to me that if the commits where signed by the one who wrote the commits, so the commit messages where altered from what the user wrote, I'm unsure how it respect the concept of signed commit

@ccoVeille
Copy link

Screenshot_20240601_183202_GitHub.jpg

I mean it appears to everyone they have been discarded while they were merged

@dominikh
Copy link
Owner

dominikh commented Jun 1, 2024

The PRs were applied by downloading them as patches, applying them, and making minor modifications to the commits as needed. I use https://github.com/leahneukirchen/git-merge-pr for this process. The created commits contain Closes: commands to close the respective PRs. That GitHub cannot differentiate between closing a PR because it was applied in a different way than pushing commits that match the SHAs from the PR and closing a PR because it has been rejected is a fault of GitHub.

@dominikh
Copy link
Owner

dominikh commented Jun 1, 2024

This PR was applied as, and closed by, d39a04f.

@ccoVeille
Copy link

This PR was applied as, and closed by, d39a04f.

Yes, it's a commit pushed to master without a PR (apparently), while the current PR was there and ready to be merged

@Xe
Copy link

Xe commented Jun 1, 2024

GitHub doesn't have a way to say "this exact patch wasn't merged, but the maintainer downloaded it and merged it themselves after editing it locally", which is halfway between "merged" and "closed". Pull requests only operate on that exact patch being merged, not a similar patch derived from a PR.

@ccoVeille
Copy link

ccoVeille commented Jun 1, 2024

Thanks for your replies

I missed this one, I'm only seeing now
#1554 (comment)

For me, it's an uncommon workflow, and somehow invalid one. But OK, it's clearer.

@arp242 arp242 deleted the SA5001-msg branch June 1, 2024 18:48
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 this pull request may close these issues.

confusing error message with SA5001
4 participants