Skip to main content

Browse the archive

Revision eab335c46d6677ff50e9fe94352150641bc05507 authored by David Aguilar on 10 October 2014, 08:19:47 UTC, committed by Junio C Hamano on 16 October 2014, 19:07:48 UTC 
mergetool: use more conservative temporary filenames
 
Avoid filenames with multiple dots so that overly-picky tools do
not misinterpret their extension.

Previously, foo/bar.ext in the worktree would result in e.g.

	./foo/bar.ext.BASE.1234.ext

This can be improved by having only a single .ext and using
underscore instead of dot so that the extension cannot be
misinterpreted.  The resulting path becomes:

	./foo/bar_BASE_1234.ext

Suggested-by: Sergio Ferrero <sferrero@ensoftcorp.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9e8f8de
Raw File
git.rc 
1 VERSIONINFO
FILEVERSION     MAJOR,MINOR,0,0
PRODUCTVERSION  MAJOR,MINOR,0,0
BEGIN
  BLOCK "StringFileInfo"
  BEGIN
    BLOCK "040904b0"   /* LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP */
    BEGIN
      VALUE "CompanyName", "The Git Development Community\0"
      VALUE "FileDescription", "Git for Windows\0"
      VALUE "InternalName", "git\0"
      VALUE "OriginalFilename", "git.exe\0"
      VALUE "ProductName", "Git\0"
      VALUE "ProductVersion", GIT_VERSION "\0"
    END
  END

  BLOCK "VarFileInfo"
  BEGIN
    VALUE "Translation", 0x409, 1200
  END
END
back to top