summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2014-10-10 08:19:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-15 21:10:52 (GMT)
commit9c66cd3bd0a70b2cf56589a4df2cf63814270635 (patch)
treeecd669864fc4031ea10c7120fc06a19d3aa275c2
parent76ee96a9b6f75e7d1c01e68ade72194179aa512d (diff)
downloadgit-9c66cd3bd0a70b2cf56589a4df2cf63814270635.zip
git-9c66cd3bd0a70b2cf56589a4df2cf63814270635.tar.gz
git-9c66cd3bd0a70b2cf56589a4df2cf63814270635.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>
-rwxr-xr-xgit-mergetool.sh16
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;}')