| commit | eab335c46d6677ff50e9fe94352150641bc05507 | |
| author | David Aguilar <davvid@gmail.com> | |
| Fri, 10 Oct 2014 08:19:47 +0000 (10 01:19 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 16 Oct 2014 19:07:48 +0000 (16 12:07 -0700) | ||
| tree | 5914a1e57a6d984b1402ab3f0970f685c9d8ff90 | treesnapshot (tar.gz zip) |
| parent | 9e8f8dea46b52682b3fca67d8602c694c10013e1 | commitdiff |
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>
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>
| git-mergetool.sh | diffblobblamehistory |