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

revert commit with bogus commit message #37306

Closed
cfriedt opened this issue Jul 29, 2021 · 3 comments
Closed

revert commit with bogus commit message #37306

cfriedt opened this issue Jul 29, 2021 · 3 comments
Assignees
Labels
bug The issue is a bug, or the PR is fixing a bug priority: high High impact/importance bug

Comments

@cfriedt
Copy link
Member

cfriedt commented Jul 29, 2021

#37151 was merged with a bogus commit message including misrepresentation of the author. It's likely this was just due to incorrect usage of git.

To resolve this, please create a new PR with 2 commits:

  1. revert 160c6a8
  2. same contents as the commit above but a message that follows the commit guidelines
@cfriedt cfriedt added bug The issue is a bug, or the PR is fixing a bug priority: high High impact/importance bug labels Jul 29, 2021
@cfriedt
Copy link
Member Author

cfriedt commented Jul 29, 2021

Thanks for finding this @henrikbrixandersen , @nvlsianpu

@cfriedt cfriedt changed the title fix bogus commit message revert commit with bogus commit message Jul 29, 2021
@scottwcpg
Copy link
Collaborator

@cfriedt
I believe this happened during PR conflict resolution don't know which one.
I tried to follow your requirement to create two PR's but failed as usual.
git revert 160c6a8
Added message stating it was a git usage mistake probably during merge conflict resolution of previous PR's
Added the file that used to be in the revered commit
Created a new commit
Sync'd with tree using git pull --rebase upstream main
This resulted in a conflict with the new file. Fixing the conflict and finishing the rebase resulted in a single revert commit
I have not pushed this as I don't believe this is what you want.
What is the correct sequence of git commands to do what you want?

@cfriedt
Copy link
Member Author

cfriedt commented Jul 29, 2021

@scottwcpg - it appears that someone has already deleted commit 160c6a8 from git history, so you will need to make a new PR. I'm going to close this issue for now.

@cfriedt cfriedt closed this as completed Jul 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug The issue is a bug, or the PR is fixing a bug priority: high High impact/importance bug
Projects
None yet
Development

No branches or pull requests

2 participants