Jacob Nisnevich [off-list ref] writes:
quoted hunk
Signed-off-by: Jacob Nisnevich <redacted>
---
git-mergetool--lib.sh | 25 +++++++++++++++++++++++++
mergetools/winmerge | 21 +--------------------
2 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 54ac8e4..c5fa820 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -372,3 +372,28 @@ get_merge_tool () {
fi
echo "$merge_tool"
}
+
+mergetool_find_win32_cmd () {
+ executable=$1
+ folder=$2
+
+ # Use executable.com if it exists in $PATH
s/executable.com/$executable/
+ if type -p $executable >/dev/null 2>&1
This needs to be quoted,
if type -p "$executable" >/dev/null 2>&1
+ then
+ printf '%s' $executable
Likewise.
+ return
+ fi
+
+ # Look for executable in the typical locations
+ for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' |
+ cut -d '=' -f 2- | sort -u)
+ do
+ if test -n "$directory" && test -x "$directory/$folder/$executable"
+ then
+ printf '%s' "$directory/$folder/$executable"
+ return
+ fi
+ done
+
+ printf '%s' $executable
Likewise.
Other than these points, I do not see anything wrong in this patch.
Thanks.
By the way, "directory/folder/stuff" sounds somewhat strange, no?
OK I add the quotes and modified the comment. I also changed $folder to
$sub_directory. I think that makes a little bit more sense and sounds a lot
better.
Jacob Nisnevich (2):
mergetools: create mergetool_find_win32_cmd() helper function for
winmerge
mergetools: add support for ExamDiff
git-mergetool--lib.sh | 25 +++++++++++++++++++++++++
mergetools/examdiff | 18 ++++++++++++++++++
mergetools/winmerge | 21 +--------------------
3 files changed, 44 insertions(+), 20 deletions(-)
create mode 100644 mergetools/examdiff
--
1.9.1
Signed-off-by: Jacob Nisnevich <redacted>
---
git-mergetool--lib.sh | 25 +++++++++++++++++++++++++
mergetools/winmerge | 21 +--------------------
2 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 54ac8e4..302c56d 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -372,3 +372,28 @@ get_merge_tool () {
fi
echo "$merge_tool"
}
+
+mergetool_find_win32_cmd () {
+ executable=$1
+ sub_directory=$2
+
+ # Use $executable if it exists in $PATH
+ if type -p "$executable" >/dev/null 2>&1
+ then
+ printf '%s' "$executable"
+ return
+ fi
+
+ # Look for executable in the typical locations
+ for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' |
+ cut -d '=' -f 2- | sort -u)
+ do
+ if test -n "$directory" && test -x "$directory/$sub_directory/$executable"
+ then
+ printf '%s' "$directory/$sub_directory/$executable"
+ return
+ fi
+ done
+
+ printf '%s' "$executable"
+}diff --git a/mergetools/winmerge b/mergetools/winmerge
index 74a66d4..f3819d3 100644
--- a/mergetools/winmerge
+++ b/mergetools/winmerge
@@ -13,24 +13,5 @@ merge_cmd () {
}
translate_merge_tool_path() {
- # Use WinMergeU.exe if it exists in $PATH
- if type -p WinMergeU.exe >/dev/null 2>&1
- then
- printf WinMergeU.exe
- return
- fi
-
- # Look for WinMergeU.exe in the typical locations
- winmerge_exe="WinMerge/WinMergeU.exe"
- for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' |
- cut -d '=' -f 2- | sort -u)
- do
- if test -n "$directory" && test -x "$directory/$winmerge_exe"
- then
- printf '%s' "$directory/$winmerge_exe"
- return
- fi
- done
-
- printf WinMergeU.exe
+ mergetool_find_win32_cmd "WinMergeU.exe" "WinMerge"
}--
1.9.1
Signed-off-by: Jacob Nisnevich <redacted>
---
mergetools/examdiff | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 mergetools/examdiff
diff --git a/mergetools/examdiff b/mergetools/examdiff
new file mode 100644
index 0000000..7b524d4
--- /dev/null
+++ b/mergetools/examdiff
@@ -0,0 +1,18 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE" -nh
+}
+
+merge_cmd () {
+ touch "$BACKUP"
+ if $base_present
+ then
+ "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh
+ else
+ "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh
+ fi
+ check_unchanged
+}
+
+translate_merge_tool_path() {
+ mergetool_find_win32_cmd "ExamDiff.com" "ExamDiff Pro"
+}--
1.9.1