git/mergetools, branch v2.40.2

mergetools: vimdiff: simplify tabfirst

2022-08-10T19:39:39Z

If we wrap the tabdo command there's no need for a separate command call. Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: fix single window layouts

2022-08-10T19:39:35Z

Layouts with a single window other than "MERGED" do not work (e.g. "LOCAL" or "MERGED+LOCAL"). This is because as the documentation of bufdo says: The last buffer (or where an error occurred) becomes the current buffer. And we do always do bufdo the end. Additionally, we do it only once, when it should be per tab. Fix this by doing it once per tab right after it's created and before any buffer is switched. Cc: Fernando Ramos Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: rework tab logic

2022-08-10T19:39:32Z

If we treat tabs especially, the logic becomes much simpler. Cc: Fernando Ramos Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: fix for diffopt

2022-08-10T19:39:28Z

When diffopt has hiddenoff set and there's only one window (as is the case in the single window mode) the diff mode is turned off. We don't want that, so turn that option off. Cc: Fernando Ramos Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: silence annoying messages

2022-08-10T19:39:24Z

When using the single window mode we are greeted with the following warning: "./content_LOCAL_8975" 6L, 28B "./content_BASE_8975" 6 lines, 29 bytes "./content_REMOTE_8975" 6 lines, 29 bytes "content" 16 lines, 115 bytes Press ENTER or type command to continue every time. Silence that. Suggested-by: Fernando Ramos Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: make vimdiff3 actually work

2022-08-10T19:39:17Z

When vimdiff3 was added in 7c147b77d3 (mergetools: add vimdiff3 mode, 2014-04-20), the description made clear the intention: It's similar to the default, except that the other windows are hidden. This ensures that removed/added colors are still visible on the main merge window, but the other windows not visible. However, in 0041797449 (vimdiff: new implementation with layout support, 2022-03-30) this was broken by generating a command that never creates windows, and therefore vim never shows the diff. The layout support implementation broke the whole purpose of vimdiff3, and simply shows MERGED, which is no different from simply opening the file with vim. In order to show the diff, the windows need to be created first, and then when they are hidden the diff remains (if hidenoff isn't set), but by setting the `hidden` option the initial buffers are marked as hidden thus making the feature work. Suggested-by: Fernando Ramos Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

mergetools: vimdiff: fix comment

2022-08-10T19:39:07Z

The name of the variable is wrong, and it can be set to anything, like 1. Signed-off-by: Felipe Contreras Reviewed-by: Fernando Ramos Signed-off-by: Junio C Hamano

Merge branch 'fr/vimdiff-layout-fix' into maint

2022-07-27T20:00:28Z

Recent update to vimdiff layout code has been made more robust against different end-user vim settings. source: <20220708181024.45839-1-greenfoo@u92.eu> * fr/vimdiff-layout-fix: vimdiff: make layout engine more robust against user vim settings

Merge branch 'js/vimdiff-quotepath-fix' into maint

2022-07-27T20:00:26Z

Variable quoting fix in the vimdiff driver of "git mergetool" source: * js/vimdiff-quotepath-fix: mergetool(vimdiff): allow paths to contain spaces again

mergetool(vimdiff): allow paths to contain spaces again

2022-07-14T17:37:44Z

In 0041797449d (vimdiff: new implementation with layout support, 2022-03-30), we introduced a completely new implementation of the `vimdiff` backend for `git mergetool`. In this implementation, we no longer call `vim` directly but we accumulate in the variable `FINAL_CMD` an arbitrary number of commands for `vim` to execute, which necessitates the use of `eval` to split the commands properly into multiple command-line arguments. That same `eval` command also needs to pass the paths to `vim`, and while it looks as if they are quoted correctly, that quoting only reaches the `eval` instruction and is lost after that, therefore paths that contain whitespace characters (or other characters that are interpreted by the POSIX shell) are handled incorrectly. This is a simple reproducer: git init -b main bam-merge-fail cd bam-merge-fail echo a>"a file.txt" git add "a file.txt" git commit -m "added 'a file.txt'" echo b>"a file.txt" git add "a file.txt" git commit -m "diverged b 'a file.txt'" git checkout -b c HEAD~ echo c>"a file.txt" git add "a file.txt" git commit -m "diverged c 'a file.txt'" git checkout main git merge c git mergetool --tool=vimdiff With Git v2.37.0/v2.37.1, this will open 7 buffers, not four, and not display the correct contents at all. To fix this, let's not expand the variables containing the path parameters before passing them to the `eval` command, but let that command expand the variables instead. This fixes https://github.com/git-for-windows/git/issues/3945 Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano