| commit | 9c66cd3bd0a70b2cf56589a4df2cf63814270635 | |
| 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> | |
| Wed, 15 Oct 2014 21:10:52 +0000 (15 14:10 -0700) | ||
| tree | ecd669864fc4031ea10c7120fc06a19d3aa275c2 | treesnapshot (tar.gz zip) |
| parent | 76ee96a9b6f75e7d1c01e68ade72194179aa512d | 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 |