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

Drop deprecated options #914

Merged
merged 3 commits into from
Jan 16, 2022
Merged

Drop deprecated options #914

merged 3 commits into from
Jan 16, 2022

Conversation

dandavison
Copy link
Owner

Fixes 906-912 but let's close them when this is released.

@dandavison dandavison force-pushed the 891-drop-deprecated-options branch 2 times, most recently from fe2858f to 0e44cf2 Compare January 16, 2022 13:52
@dandavison dandavison merged commit 9106a51 into master Jan 16, 2022
@dandavison dandavison deleted the 891-drop-deprecated-options branch January 16, 2022 16:24
@Iron-E
Copy link

Iron-E commented Mar 23, 2022

Ever since this change I have been having an issue with git:

❯ git diff main
error: Found argument '--plus-color' which wasn't expected, or isn't valid in this context

	Did you mean '--plus-style'?

	If you tried to supply `--plus-color` as a value rather than a flag, use `-- --plus-color`

USAGE:
    delta --plus-style <STYLE>

For more information try --help

Here is my .gitconfig:

[core]
	pager = delta

[interactive]
	diffFilter = delta --color-only

[delta]
	navigate = true  # use n and N to move between diff sections

[merge]
	conflictstyle = diff3

[diff]
	colorMoved = default

(This is the same as the example from the README)

@dandavison
Copy link
Owner Author

Hi @Iron-E, somehow you must be passing --plus-color to delta. Perhaps an environment variable, or an alias.

To investigate aliases, can you post the results of which delta and type -a delta and which git and type -a git?

To investigate relevant environment variables, in particular GIT_PAGER, could you run the command

env | grep -i pager

I can reproduce the error you see by setting the value of GIT_PAGER like this:

src/delta(master) GIT_PAGER='delta --plus-color=green' git show
error: Found argument '--plus-color' which wasn't expected, or isn't valid in this context

Another possibility is that git is using a config file different from, or in addition to, the one you showed.

@Iron-E
Copy link

Iron-E commented Mar 26, 2022

$GIT_PAGER was it. Thank you!

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

Successfully merging this pull request may close these issues.

2 participants