From: Junio C Hamano <gitster@pobox•com>
To: David Aguilar <davvid@gmail•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: Mon, 13 Oct 2014 12:30:57 -0700 [thread overview]
Message-ID: <xmqqfver3gy6.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1412929187-57936-1-git-send-email-davvid@gmail.com> (David Aguilar's message of "Fri, 10 Oct 2014 01:19:47 -0700")
David Aguilar <davvid@gmail•com> writes:
> 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>
> ---
> Changes since v1
>
> The commit message changed to say "./foo" instead of "foo".
>
> The patch now uses Junio's suggestion to minimize variables,
> and preserves the original leading ./ just in case there are
> tools that rely on having ./ in front of relative paths.
;-)
Perhaps together with the "allow temporary directory" patch, we
would want to have a few tests for these changes?
>
> git-mergetool.sh | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/git-mergetool.sh b/git-mergetool.sh
> index 9a046b7..96a61ba 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;}')
prev parent reply other threads:[~2014-10-13 19:31 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
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 [this message]
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=xmqqfver3gy6.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=charles@hashpling$(echo .)org \
--cc=davvid@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=sferrero@ensoftcorp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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