git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool

From
Junio C Hamano <gitster@pobox.com>
Date
May 20, 2015, 20:13 UTC
Message-ID
<xmqqtwv7m2hw.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1432112843-973-2-git-send-email-davvid@gmail.com>
David Aguilar <davvid@gmail.com> writes:
> +	for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' |
> +		cut -d '=' -f 2- | sort -u)

Is the final "sort" really desired? I am wondering if there are fixed precedence/preference order among variants of %PROGRAMFILES% environment variables that the users on the platform are expected to stick to, but the "sort" is sorting by the absolute pathnames of where these things are, which may not reflect that order.

Not that I personally care too deeply, as I would expect that it is likely any one of them found would just work fine ;-)

Show 10 quoted lines
> +	do
> +		if test -n "$directory" && test -x "$directory/$winmerge_exe"
> +		then
> +			printf '%s' "$directory/$winmerge_exe"
> +			return
> +		fi
> +	done
> +
> +	printf WinMergeU.exe
> +}
Previous: David AguilarNext: Sebastian Schuberth
Message 7 of 11 in “mergetool--lib: set IFS for difftool and mergetool”
  1. 1/2 mergetool--lib: set IFS for difftool and mergetoolDavid Aguilar, May 20, 2015
  2. 2/2 mergetools: add winmerge as a builtin toolDavid Aguilar, May 20, 2015
  3. SZEDER GáborMay 20, 2015
  4. David AguilarMay 22, 2015
  5. Junio C HamanoMay 22, 2015
  6. David AguilarMay 22, 2015
  7. Junio C HamanoMay 20, 2015
  8. Sebastian SchuberthMay 20, 2015
  9. Junio C HamanoMay 20, 2015
  10. Sebastian SchuberthMay 20, 2015
  11. Johannes SchindelinMay 21, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.