Git: "-LX,Y:file" and "-- file" are incompatible

[derrickstolee]

The important issue here is using Git v2.29.x. Please see this Git mailing list discussion for more context.

The basics here is that GitLens is combining two options that should not be allowed:

git log --follow -LX,Y:file -- file

The use of --follow and -- file with -LX,Y:file should not be compatible in Git. So far, Git has not complained and worked correctly. In v2.29.[0-2], Git changed logic slightly such that this results in a segfault!

The plan of record is for Git to ship a new version that fixes the segfault. However, this might not be the end of the fix. Likely, such use will lead to a failed Git command with a warning message over stderr.

Possibly the logic here needs to change:

		if (startLine == null || renames) {
			// Don't specify a file spec when using a line number (so say the git docs), unless it is a follow
			params.push('--', file);
		}

That is, the || renames is probably invalid here. We don't want to combine -- file with -LX,Y:file. In general Git would interpret those as two separate requests for history limitation that are incompatible.

To assist GitLens users who are on a buggy version of Git and to future-proof GitLens against a possibly disruptive change in a later version of Git, it might be best to change this logic now.

[eamodio]

@derrickstolee Thank you for the report! I will update the code and remove the --follow in the line case.

[derrickstolee]

Thanks, @eamodio. I think that also the issue is the -- file part, so please be sure to avoid that portion in the line case.

[eamodio]

GitLens 10.2.3 has been published with the fix, and I'll get it fixed in the upcoming v11 release

[github-actions]

This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.