Thread (4 messages) flat view 4 messages, 3 authors, 2016-06-15

Re: [PATCH v2] mergetool: use more conservative temporary filenames

From: Jakub Narębski <hidden>
Date: 2016-06-15 23:02:41

David Aguilar wrote:
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>
Helped-by: Junio C Hamano [off-list ref]
Signed-off-by: David Aguilar <redacted>
---
+	if BASE=$(expr "$MERGED" : '\(.*\)\.[^/]*$')
+	then
+		ext=$(expr "$MERGED" : '.*\(\.[^/]*\)$')
+	else
+		BASE=$MERGED
+		ext=
+	fi
Why use expr and not POSIX shell parameter substitution?

BASE=${MERGED%.*}
ext=.${MERGED##*.}

Or something like that...

-- 
Jakub Narębski
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help