[PATCH 1/2] mergetool: refactored kdiff3 -> KDIFF3
- From
Steffen Prohaska <prohaska@zib.de>
- Date
- Aug 10, 2007, 23:56 UTC
- Message-ID
- <11867901612954-git-send-email-prohaska@zib.de>
Use shell variable KDIFF3 instead of kdiff3 to call kdiff3. This will be used in detection of the absolute absolute path.
Signed-off-by: Steffen Prohaska <prohaska@zib.de> --- git-mergetool.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
This change is needed to be able to provide an absolute path to kdiff3, which will be looked up in the Windows Registry. See the following patch.
diff --git a/git-mergetool.sh b/git-mergetool.sh index e6bbb6b..90a69b3 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -13,6 +13,8 @@ SUBDIRECTORY_OK=Yes . git-sh-setup require_work_tree +KDIFF3=kdiff3 + # Returns true if the mode reflects a symlink is_symlink () { test "$1" = 120000 @@ -191,10 +193,10 @@ merge_file () { case "$merge_tool" in kdiff3) if base_present ; then - (kdiff3 --auto --L1 "$path (Base)" -L2 "$path (Local)" --L3 "$path (Remote)" \ + ("$KDIFF3" --auto --L1 "$path (Base)" -L2 "$path (Local)" --L3 "$path (Remote)" \ -o "$path" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1) else - (kdiff3 --auto -L1 "$path (Local)" --L2 "$path (Remote)" \ + ("$KDIFF3" --auto -L1 "$path (Local)" --L2 "$path (Remote)" \ -o "$path" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1) fi status=$?
-- 1.5.3.rc4.744.g68381