[PATCH] mergetool: use more conservative temporary filenames
From: David Aguilar <hidden>
Date: 2016-06-15 23:02:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> Signed-off-by: David Aguilar <redacted> --- git-mergetool.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 9a046b7..1f33051 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh@@ -228,11 +228,15 @@ merge_file () { return 1 fi - ext="$$$(expr "$MERGED" : '.*\(\.[^/]*\)$')" - BACKUP="./$MERGED.BACKUP.$ext" - LOCAL="./$MERGED.LOCAL.$ext" - REMOTE="./$MERGED.REMOTE.$ext" - BASE="./$MERGED.BASE.$ext" + ext=$(expr "$MERGED" : '.*\(\.[^/]*\)$') + base=$(basename "$MERGED" "$ext") + dir=$(dirname "$MERGED") + suffix="$$""$ext" + + BACKUP="$dir/$base"_BACKUP_"$suffix" + BASE="$dir/$base"_BASE_"$suffix" + LOCAL="$dir/$base"_LOCAL_"$suffix" + REMOTE="$dir/$base"_REMOTE_"$suffix" 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;}')
--
2.1.2.337.gd0cf3c1