Skip to content

Update the comment about --mixed and paths #1894

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 2, 2024
Merged

Update the comment about --mixed and paths #1894

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update the comment about --mixed and paths 
This updates the comment in HEAD.reset about why `--mixed` is
omitted from the git command constructed to perform a reset where
paths are being passed, adding specific information about the git
versions where this is deprecated, and changing the more-info link
from an old GitPython issue that is no longer retrievable to #1876.
  • Loading branch information
@EliahKagan
EliahKagan committed Apr 1, 2024
commit 0152b528a035566364fc8a0e1a80829c6d495301
4 changes: 2 additions & 2 deletions git/refs/head.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ def reset(
if index:
mode = "--mixed"

# It appears some git versions declare mixed and paths deprecated.
# See http://github.com/Byron/GitPython/issues#issue/2.
# Explicit "--mixed" when passing paths is deprecated since git 1.5.4.
# See https://github.com/gitpython-developers/GitPython/discussions/1876.
if paths:
mode = None
# END special case
Expand Down