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

False Positive When A Pushed Commit Is Amended #93

Open
Kurt-von-Laven opened this issue Sep 24, 2021 · 0 comments
Open

False Positive When A Pushed Commit Is Amended #93

Kurt-von-Laven opened this issue Sep 24, 2021 · 0 comments

Comments

@Kurt-von-Laven
Copy link

protect-first-parent reports an error once you amend a commit that has already been pushed to a feature branch even though this doesn't constitute a foxtrot merge.

Protect first parent..........................................................Failed
- hook id: protect-first-parent
- exit code: 1

[ERROR] Foxtrot merge

Maybe you deleted a commit that was already pushed.
Maybe you ran "git pull" without the --rebase flag.

A possible fix is to run these commands client-side before pushing:

    git fetch --all
    git rebase origin/pre-commit

Check the result with "git log --graph" before pushing again.

Perhaps a distinction should be made between the default branch and other branches?

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

No branches or pull requests

1 participant