From: "SZEDER Gábor" <szeder@ira.uka.de>
To: David Aguilar <davvid@gmail.com>
Cc: Phil Susi <phillsusi@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Philip Oakley <philipoakley@iee.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Sebastian Schuberth <sschuberth@gmail.com>
Subject: Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool
Date: Wed, 20 May 2015 13:09:29 +0200 [thread overview]
Message-ID: <20150520130929.Horde.vYwOuIDRpi6hr15rOUbW1w7@webmail.informatik.kit.edu> (raw)
In-Reply-To: <1432112843-973-2-git-send-email-davvid@gmail.com>
Quoting David Aguilar <davvid@gmail.com>:
> +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"
This variable is not used elsewhere, right? Then you might want to
mark it as local to make this clear.
> + 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
Please pardon my ignorance and curiosity, but what is the purpose of
this last printf?
It outputs the same as in the case when winmerge is in $PATH at the
beginning of the function. However, if we reach this printf, then
winmerge is not in $PATH, so what will be executed?
Gábor
> +}
> --
> 2.4.1.218.gc09a0e5
next prev parent reply other threads:[~2015-05-20 11:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-20 9:07 [PATCH v6 1/2] mergetool--lib: set IFS for difftool and mergetool David Aguilar
2015-05-20 9:07 ` [PATCH v6 2/2] mergetools: add winmerge as a builtin tool David Aguilar
2015-05-20 11:09 ` SZEDER Gábor [this message]
2015-05-22 19:58 ` David Aguilar
2015-05-22 20:05 ` Junio C Hamano
2015-05-22 20:16 ` David Aguilar
2015-05-20 20:13 ` Junio C Hamano
2015-05-20 20:20 ` Sebastian Schuberth
2015-05-20 21:00 ` Junio C Hamano
2015-05-20 21:20 ` Sebastian Schuberth
2015-05-21 10:06 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150520130929.Horde.vYwOuIDRpi6hr15rOUbW1w7@webmail.informatik.kit.edu \
--to=szeder@ira.uka.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=philipoakley@iee.org \
--cc=phillsusi@gmail.com \
--cc=sschuberth@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).