Pre-commit failed tests

Astropy
1

Hello,

I’m trying to add a simple change to documentation related to issue #16624. I’m just trying to removed the three paragraphs about affiliated packages in astropy/docs/development/codeguide.rst and replace them with a link to the affiliated packages information on the astropy website.

I keep running into check-case-conflict and check-merge-conflict (trace below) in Git when I attempt to commit my changes and I am, admittedly, super green, so I’m not sure how to go about solving this. Can anyone lend a hand?

check for added large files..............................................Passed
check for case conflicts.................................................Failed
- hook id: check-case-conflict
- exit code: 1

Traceback (most recent call last):
  File "<frozen runpy>", line 198, in _run_module_as_main
  File "<frozen runpy>", line 88, in _run_code
  File "...\.cache\pre-commit\repo_o3jkek1\py_env-default\Scripts\check-case-conflict.EXE\__main__.py", line 7, in <module>
    sys.exit(main())
             ~~~~^^
  File "...\.cache\pre-commit\repo_o3jkek1\py_env-default\Lib\site-packages\pre_commit_hooks\check_case_conflict.py", line 68, in main
    return find_conflicting_filenames(args.filenames)
  File "...\.cache\pre-commit\repo_o3jkek1\py_env-default\Lib\site-packages\pre_commit_hooks\check_case_conflict.py", line 29, in find_conflicting_filenames
    repo_files = set(cmd_output('git', 'ls-files').splitlines())
                     ~~~~~~~~~~^^^^^^^^^^^^^^^^^^^
  File "...\.cache\pre-commit\repo_o3jkek1\py_env-default\Lib\site-packages\pre_commit_hooks\util.py", line 23, in cmd_output
    raise CalledProcessError(cmd, retcode, proc.returncode, stdout, stderr)
pre_commit_hooks.util.CalledProcessError: (('git', 'ls-files'), 0, 128, '', b'error: missing config value GIT_CONFIG_VALUE_0\nfatal: unable to parse command-line config\n')

check json...........................................(no files to check)Skipped
check for merge conflicts................................................Failed
- hook id: check-merge-conflict
- exit code: 1

Traceback (most recent call last):
  File "<frozen runpy>", line 198, in _run_module_as_main
  File "<frozen runpy>", line 88, in _run_code
  File "...\.cache\pre-commit\repo_o3jkek1\py_env-default\Scripts\check-merge-conflict.EXE\__main__.py", line 7, in <module>
    sys.exit(main())
             ~~~~^^
  File "...\.cache\pre-commit\repo_o3jkek1\py_env-default\Lib\site-packages\pre_commit_hooks\check_merge_conflict.py", line 37, in main
    if not is_in_merge() and not args.assume_in_merge:
           ~~~~~~~~~~~^^
  File "...\.cache\pre-commit\repo_o3jkek1\py_env-default\Lib\site-packages\pre_commit_hooks\check_merge_conflict.py", line 20, in is_in_merge
    git_dir = cmd_output('git', 'rev-parse', '--git-dir').rstrip()
              ~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "...\.cache\pre-commit\repo_o3jkek1\py_env-default\Lib\site-packages\pre_commit_hooks\util.py", line 23, in cmd_output
    raise CalledProcessError(cmd, retcode, proc.returncode, stdout, stderr)
pre_commit_hooks.util.CalledProcessError: (('git', 'rev-parse', '--git-dir'), 0, 128, '', b'error: missing config value GIT_CONFIG_VALUE_0\nfatal: unable to parse command-line config\n')

check for broken symlinks............................(no files to check)Skipped
check toml...........................................(no files to check)Skipped
check xml............................................(no files to check)Skipped
check yaml...........................................(no files to check)Skipped
detect private key.......................................................Passed
fix end of files.........................................................Passed
trim trailing whitespace.................................................Passed
rst directives end with two colons.......................................Passed
rst ``inline code`` next to normal text..................................Passed
no unicode replacement chars.............................................Passed
codespell................................................................Passed
ruff.................................................(no files to check)Skipped
ruff-format..........................................(no files to check)Skipped
sp-repo-review...........................................................Passed
changelog filenames..................................(no files to check)Skipped
changelog filenames for other category...............(no files to check)Skipped