Skip to content

Commit

Permalink
mergetools/bc: add bc4 to the alias list for Beyond Compare
Browse files Browse the repository at this point in the history
As of 83bbf9b (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
git-for-windows#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>
  • Loading branch information
dscho committed Nov 11, 2020
1 parent 1186897 commit 0e2b11a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions mergetools/bc
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ translate_merge_tool_path() {
list_tool_variants () {
echo bc
echo bc3
echo bc4
}

0 comments on commit 0e2b11a

Please sign in to comment.