From: "Jakub Narębski" <jnareb@gmail.com>
To: David Aguilar <davvid@gmail.com>, Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Sergio Ferrero <sferrero@ensoftcorp.com>,
Charles Bailey <charles@hashpling.org>
Subject: Re: [PATCH v2] mergetool: use more conservative temporary filenames
Date: Fri, 10 Oct 2014 13:19:40 +0200 [thread overview]
Message-ID: <5437C0CC.7030102@gmail.com> (raw)
In-Reply-To: <1412929187-57936-1-git-send-email-davvid@gmail.com>
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 <sferrero@ensoftcorp.com>
> Helped-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
> + 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
next prev parent reply other threads:[~2014-10-10 11:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-10 8:19 [PATCH v2] mergetool: use more conservative temporary filenames David Aguilar
2014-10-10 11:19 ` Jakub Narębski [this message]
2014-10-10 18:48 ` David Aguilar
2014-10-10 19:54 ` Johannes Sixt
2014-10-10 21:16 ` Junio C Hamano
2014-10-13 19:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5437C0CC.7030102@gmail.com \
--to=jnareb@gmail.com \
--cc=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sferrero@ensoftcorp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).