summaryrefslogtreecommitdiff
path: root/sha1-array.h
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2014-10-10 01:19:47 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-16 12:07:48 -0700
commiteab335c46d6677ff50e9fe94352150641bc05507 (patch)
tree5914a1e57a6d984b1402ab3f0970f685c9d8ff90 /sha1-array.h
parent9e8f8dea46b52682b3fca67d8602c694c10013e1 (diff)
downloadgit-eab335c46d6677ff50e9fe94352150641bc05507.tar.gz
mergetool: use more conservative temporary filenamesda/mergetool-temporary-filename
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>
Diffstat (limited to 'sha1-array.h')
0 files changed, 0 insertions, 0 deletions