]> git.ipfire.org Git - thirdparty/git.git/commit
mergetools/bc: add `bc4` to the alias list for Beyond Compare
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 11 Nov 2020 20:33:17 +0000 (20:33 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Nov 2020 21:00:10 +0000 (13:00 -0800)
commit6bc9082c0fa37d25b7cf9c3ab3c85c78c7a19daf
tree442ee20cd6553601b8180da39fd435c707d94522
parent11868978c7c80d3c29071b29e7964e3d62523819
mergetools/bc: add `bc4` to the alias list for Beyond Compare

As of 83bbf9b92ea8 (mergetool--lib: improve support for vimdiff-style
tool variants, 2020-07-29), we already list `bc` and `bc3` as aliases
for that mergetool/difftool.

However, the current Beyond Compare version is _4_, therefore the `bc4`
alias is missing from that list.

Most notably, this is the root cause of the breakage reported in
https://github.com/git-for-windows/git/issues/2893 where a
well-configured `bc4` difftool stopped working as of v2.29.0:
`setup_tool` would notice that after stripping off the trailing digit,
it finds a match in `mergetools/` (the `bc` file), source it, and then
the alias would not match the list offered by the `list_tool_variants`
function, and simply exit without doing anything, but pretending
success.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
mergetools/bc