Sebastian Schuberth <sschuberth@xxxxxxxxx> writes:
> Signed-off-by: Sebastian Schuberth <sschuberth@xxxxxxxxx>
> ---
> mergetools/araxis | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/mergetools/araxis b/mergetools/araxis
> index 64f97c5..f8899f8 100644
> --- a/mergetools/araxis
> +++ b/mergetools/araxis
> @@ -16,5 +16,12 @@ merge_cmd () {
> }
>
> translate_merge_tool_path() {
> - echo compare
> + # Only accept "compare" in a path that contains "araxis" to not
> + # accidently use e.g. ImageMagick's "compare".
> + if type compare | grep -i araxis >/dev/null 2>&1
> + then
> + echo compare
> + else
> + echo "$1"
> + fi
> }
I do not use araxis, and I do not know how rigid its installation
procedure is to prevent the end user from naming a path that does
not have the string in it.
For example, when the user tells it to install in "/home/ss/bin", if
it installs its "compare" program in "/home/ss/bin/araxis/compare"
without allowing the "/araxis/" part to be stripped away, the above
heuristics is sufficiently safe. Otherwise, it is not.
It is unclear from your proposed commit log message what assurance
do we have that it is installed under such a path and why the
heuristics the patch implements is the sane way forward.
Please convince me.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html