diff options
| author | David Aguilar <davvid@gmail.com> | 2014-10-10 08:19:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-16 19:07:48 (GMT) |
| commit | eab335c46d6677ff50e9fe94352150641bc05507 (patch) | |
| tree | 5914a1e57a6d984b1402ab3f0970f685c9d8ff90 /git-mergetool.sh | |
| parent | 9e8f8dea46b52682b3fca67d8602c694c10013e1 (diff) | |
| download | git-eab335c46d6677ff50e9fe94352150641bc05507.zip git-eab335c46d6677ff50e9fe94352150641bc05507.tar.gz git-eab335c46d6677ff50e9fe94352150641bc05507.tar.bz2 | |
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>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 332528f..0ff6566 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -228,11 +228,17 @@ merge_file () { return 1 fi - ext="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')" - BACKUP="./$MERGED.BACKUP.$ext" - LOCAL="./$MERGED.LOCAL.$ext" - REMOTE="./$MERGED.REMOTE.$ext" - BASE="./$MERGED.BASE.$ext" + if BASE=$(expr "$MERGED" : '\(.*\)\.[^/]*$') + then + ext=$(expr "$MERGED" : '.*\(\.[^/]*\)$') + else + BASE=$MERGED + ext= + fi + BACKUP="./${BASE}_BACKUP_$$$ext" + LOCAL="./${BASE}_LOCAL_$$$ext" + REMOTE="./${BASE}_REMOTE_$$$ext" + BASE="./${BASE}_BASE_$$$ext" base_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==1) print $1;}') local_mode=$(git ls-files -u -- "$MERGED" | awk '{if ($3==2) print $1;}') |