global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 02:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

mergetool: fixed parsing of registry entry for kdiff3

Browse Source 
The old code failed on Windows Vista. The output of
reg.exe or something else may be a bit different.
This patch improves the parsing code to be more robust.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
This commit is contained in:
Johannes Schmidt-Ehrenberg
2007-08-13 19:00:39 +02:00
committed by Dmitry Kakurin
parent 331406ad30
commit 20e93f53e3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-mergetool.sh
View File

@@ -323,7 +323,7 @@ if test -z "$merge_tool" ; then
fi
fi
regentry="$(REG QUERY 'HKEY_LOCAL_MACHINE\SOFTWARE\KDiff3\diff-ext' 2>/dev/null)" && {
KDIFF3=$(echo "$regentry" | grep diffcommand | cut -f 3 | sed -e 's@\\@/@g')
KDIFF3=$(echo "$regentry" | grep diffcommand | awk -F 'REG_SZ' '{ print $2 }' | sed -e 's/^ *//'| sed -e 's@\\@/@g')
KDIFF3SEPARATOR=
merge_tool_candidates="$merge_tool_candidates kdiff3"
}