[PATCH 1/2] mergetools/bc: add `bc4` to the alias list for Beyond Compare
- From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Nov 11, 2020, 20:33 UTC
- Message-ID
- <0e2b11ae9851525d24e5f4e2bb0919bf4f0fd788.1605126798.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.787.git.1605126798.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
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> --- mergetools/bc | 1 + 1 file changed, 1 insertion(+)
diff --git a/mergetools/bc b/mergetools/bc index a89086ee72..26c19d46a5 100644 --- a/mergetools/bc +++ b/mergetools/bc @@ -25,4 +25,5 @@ translate_merge_tool_path() { list_tool_variants () { echo bc echo bc3 + echo bc4 }
-- gitgitgadget