pre-push should forbid unrelated staged changes while pushing · Issue #2486 · pre-commit/pre-commit · GitHub
Skip to content

pre-push should forbid unrelated staged changes while pushing #2486

Open
#3113
Open
pre-push should forbid unrelated staged changes while pushing#2486
#3113
Labels
bug

Description

@bnchou
bnchou
opened on Aug 16, 2022

search tried in the issue tracker

yes

describe your issue

I configured dotnet format as push hook in my .pre-commit-config.yaml
I installed them using

pre-commit install --install-hooks --hook-type pre-commit --hook-type pre-push

I committed a modification with dotnet format not following correct rules, it passes
I try to push, it is rejected with error

 error: failed to push some refs to

And it corrects my file after dotnet format
When I try to push again, I have the same error.

When I add the file in staged changes without commit it, I can push.
I expect to be rejected even if I put the correct file in staged changes.

pre-commit --version

pre-commit 2.20.0

.pre-commit-config.yaml

default_stages: [commit]
repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v4.1.0
    hooks:
      - id: check-added-large-files
      - id: check-case-conflict
  - repo: local
    hooks:
    - id: dotnet-format
      name: dotnet-format
      language: system
      entry: dotnet format --include
      types_or: ["c#"]
      stages : [push]

~/.cache/pre-commit/pre-commit.log (if present)

No response

Activity

  1. asottile commented on Aug 16, 2022

    @asottile
    asottile
    on Aug 16, 2022
    Member

    you'll have to provide more information and a reproduction

  2. asottile commented on Aug 16, 2022

    @asottile
    asottile
    on Aug 16, 2022
    Member

    also show the full output, do not redact anything

  3. bnchou commented on Aug 16, 2022

    @bnchou
    bnchou
    on Aug 16, 2022
    Author

    Not related to dotnet format
    .pre-commit-config.yaml

    default_stages: [commit]
repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v4.1.0
    hooks:
      - id: check-added-large-files
      - id: check-case-conflict
      - id: check-merge-conflict
      - id: check-symlinks
      - id: check-yaml
        files: .*\.(yaml|yml)$
      - id: detect-private-key
      - id: end-of-file-fixer
      - id: mixed-line-ending
      - id: trailing-whitespace
        stages: [push]

    Installation

     pre-commit install --install-hooks --hook-type pre-commit --hook-type pre-push

    Output:

    pre-commit installed at .git/hooks/pre-commit
pre-commit installed at .git/hooks/pre-push

    Create a file with some whitespaces at end

    spacestotrail

    Add and commit the file

    git add spaces.txt 
git commit -m "Add spaces"

    Output

    check for added large files..............................................Passed
check for case conflicts.................................................Passed
check for merge conflicts................................................Passed
check for broken symlinks............................(no files to check)Skipped
check yaml...........................................(no files to check)Skipped
detect private key.......................................................Passed
fix end of files.........................................................Passed
mixed line ending........................................................Passed
[features/pre-commit-issue 9768261] Add spaces
 1 file changed, 1 insertion(+)
 create mode 100644 spaces.txt

    Try to git push

    fix end of files.........................................................Passed
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing spaces.txt

error: failed to push some refs to '*****'

    Add the spaces.txt in staged to commit but don't commit anything

    git add spaces.txt

    Try to git push

    fix end of files.........................................................Passed
trim trailing whitespace.................................................Passed
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Delta compression using up to 4 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 295 bytes | 98.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
remote: Analyzing objects... (3/3) (91 ms)
remote: Storing packfile... done (86 ms)
remote: Storing index... done (48 ms)
To ****
   52c39c7..9768261  features/pre-commit-issue -> features/pre-commit-issue

    It succeeds to push with spaces at the end

  4. asottile commented on Aug 17, 2022

    @asottile
    asottile
    on Aug 17, 2022
    Member

    hmmm interesting -- the "unstaged changes" check I guess really only makes sense for commit -- it should additionally reject push if there's staged things

  5. asottile
    added
    bug
    on Aug 17, 2022
  6. asottile
    changed the title [-]dotnet format pre-push hook allow push when correct file is in staged changes[/-] [+]pre-push should forbid unrelated staged changes while pushing[/+] on Aug 17, 2022
  7. pre-commit
    deleted a comment from ShafinKhadem on Oct 25, 2022

  8. asottile commented on Oct 25, 2022

    @asottile
    asottile
    on Oct 25, 2022 · Hidden as off-topic

  9. JosephRangel commented on Mar 28, 2023

    @JosephRangel
    JosephRangel
    on Mar 28, 2023

    is this issue solved?

  10. asottile commented on Mar 28, 2023

    @asottile
    asottile
    on Mar 28, 2023
    Member

    is the issue closed?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    bug

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions