summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpudinha <rogi@skylittlesystem.org>2020-07-29 21:31:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-07-29 21:44:49 (GMT)
commit11868978c7c80d3c29071b29e7964e3d62523819 (patch)
treeea8b30e3887f0c8294f7c0a7eafff8059cc5ffa7
parent83bbf9b92ea8a10a60f44369a200b39ce5db78cd (diff)
downloadgit-11868978c7c80d3c29071b29e7964e3d62523819.zip
git-11868978c7c80d3c29071b29e7964e3d62523819.tar.gz
git-11868978c7c80d3c29071b29e7964e3d62523819.tar.bz2
mergetools: add support for nvimdiff (neovim) family
Signed-off-by: pudinha <rogi@skylittlesystem.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--contrib/completion/git-completion.bash4
-rw-r--r--git-mergetool--lib.sh7
-rw-r--r--mergetools/nvimdiff1
-rw-r--r--mergetools/vimdiff15
4 files changed, 17 insertions, 10 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ee468ea..aed08f8 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1712,8 +1712,8 @@ _git_diff ()
}
__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
- tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
- codecompare smerge
+ tkdiff vimdiff nvimdiff gvimdiff xxdiff araxis p4merge
+ bc codecompare smerge
"
_git_difftool ()
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 29fecc3..2defef2 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -304,11 +304,14 @@ list_merge_tool_candidates () {
tools="$tools smerge"
fi
case "${VISUAL:-$EDITOR}" in
+ *nvim*)
+ tools="$tools nvimdiff vimdiff emerge"
+ ;;
*vim*)
- tools="$tools vimdiff emerge"
+ tools="$tools vimdiff nvimdiff emerge"
;;
*)
- tools="$tools emerge vimdiff"
+ tools="$tools emerge vimdiff nvimdiff"
;;
esac
}
diff --git a/mergetools/nvimdiff b/mergetools/nvimdiff
new file mode 100644
index 0000000..04a5bb0
--- /dev/null
+++ b/mergetools/nvimdiff
@@ -0,0 +1 @@
+. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 3925e1f..abc8ce4 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -5,7 +5,7 @@ diff_cmd () {
merge_cmd () {
case "$1" in
- gvimdiff|vimdiff)
+ *vimdiff)
if $base_present
then
"$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
@@ -15,11 +15,11 @@ merge_cmd () {
"$LOCAL" "$MERGED" "$REMOTE"
fi
;;
- gvimdiff2|vimdiff2)
+ *vimdiff2)
"$merge_tool_path" -f -d -c 'wincmd l' \
"$LOCAL" "$MERGED" "$REMOTE"
;;
- gvimdiff3|vimdiff3)
+ *vimdiff3)
if $base_present
then
"$merge_tool_path" -f -d -c 'hid | hid | hid' \
@@ -34,10 +34,13 @@ merge_cmd () {
translate_merge_tool_path() {
case "$1" in
- gvimdiff|gvimdiff2|gvimdiff3)
+ nvimdiff*)
+ echo nvim
+ ;;
+ gvimdiff*)
echo gvim
;;
- vimdiff|vimdiff2|vimdiff3)
+ vimdiff*)
echo vim
;;
esac
@@ -48,7 +51,7 @@ exit_code_trustable () {
}
list_tool_variants () {
- for prefix in '' g; do
+ for prefix in '' g n; do
for suffix in '' 2 3; do
echo "${prefix}vimdiff${suffix}"
done