From: Junio C Hamano <gitster@pobox.com>
To: David Aguilar <davvid@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Alan Blotz" <work@blotz.org>,
"Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Jeff King" <peff@peff.net>
Subject: Re: [PATCH v2 3/4] difftool: use a strbuf to create the tmpdir path
Date: Mon, 20 Sep 2021 11:35:07 -0700 [thread overview]
Message-ID: <xmqqr1djayec.fsf@gitster.g> (raw)
In-Reply-To: <20210919023329.23356-1-davvid@gmail.com> (David Aguilar's message of "Sat, 18 Sep 2021 19:33:29 -0700")
David Aguilar <davvid@gmail.com> writes:
> Use a strbuf to create the buffer used for the dir-diff tmpdir.
> Strip trailing slashes "/" from the value read from TMPDIR to avoid
> double-slashes in the calculated paths.
>
> Add a unit test to ensure that double-slashes are not present.
>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
> Changes since v1:
> - Updated to use strbuf_trim_trailing_dir_sep().
>
> Thanks Peff!
> @@ -333,11 +332,11 @@ static int checkout_path(unsigned mode, struct object_id *oid,
> static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
> struct child_process *child)
This is taken hostage by the topic 'ab/retire-option-argument',
which is not yet in 'master' and can never be merged to 'maint',
which is not something you may want to do if this topic is meant as
a bugfix.
I may queue this topic on top of a merge of 'ab/retire-option-argument'
into 'master' for now.
Thanks.
next prev parent reply other threads:[~2021-09-20 18:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-19 1:57 [PATCH 1/4] t7800-difftool: cleanup temporary repositories used by tests David Aguilar
2021-09-19 1:57 ` [PATCH 2/4] difftool: add a missing space to the run_dir_diff() comments David Aguilar
2021-09-19 1:57 ` [PATCH 3/4] difftool: use a strbuf to create the tmpdir path David Aguilar
2021-09-19 2:17 ` Jeff King
2021-09-19 2:33 ` [PATCH v2 " David Aguilar
2021-09-20 18:35 ` Junio C Hamano [this message]
2021-09-19 9:00 ` [PATCH " Johannes Sixt
2021-09-19 18:13 ` David Aguilar
2021-09-19 18:46 ` Johannes Sixt
2021-09-19 19:28 ` David Aguilar
2021-09-19 19:50 ` Johannes Sixt
2021-09-19 1:57 ` [PATCH 4/4] difftool: fix symlink-file writing in dir-diff mode David Aguilar
2021-09-19 2:02 ` [PATCH v2 " David Aguilar
2021-09-19 2:21 ` [PATCH v3 " David Aguilar
2021-09-19 13:25 ` [PATCH 1/4] t7800-difftool: cleanup temporary repositories used by tests Ævar Arnfjörð Bjarmason
2021-09-20 18:28 ` 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=xmqqr1djayec.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=congdanhqx@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=work@blotz.org \
/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).