From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.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>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Jeff King" <peff@peff.net>
Subject: [PATCH v5 0/3] difftool dir-diff symlink bug fix and cleanup patches
Date: Wed, 22 Sep 2021 21:12:49 -0700 [thread overview]
Message-ID: <20210923041252.52596-1-davvid@gmail.com> (raw)
This is a resend of previously submitted patches.
Links to previous discussions:
https://public-inbox.org/git/20210919203832.91207-1-davvid@gmail.com/
https://public-inbox.org/git/20210920220855.18637-1-davvid@gmail.com/
https://public-inbox.org/git/CAPig+cTBfP5_czsPiALcF3tODJmNfXvNkTjqVFRbHCS535d-ng@mail.gmail.com/
Patches 2/3 and 3/3 have been rebased against "next" to resolve
the clash with ab/retire-option-argument.
Patch 1/3 is maint-worthy and can be applied there without conflicts.
The commit message now uses the commit message ref format when referring to
other commits. Its test was adjusted to do "cd xyz" instead of "cd ./xyz".
Patch 2/3 has the strbuf leak avoidance brought up in the v4 round.
Patch 3/3 is trivial and unchanged.
David Aguilar (3):
difftool: fix symlink-file writing in dir-diff mode
difftool: create a tmpdir path without repeated slashes
difftool: add a missing space to the run_dir_diff() comments
builtin/difftool.c | 52 +++++++++++++++----------------
t/t7800-difftool.sh | 75 +++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 99 insertions(+), 28 deletions(-)
--
2.33.0.720.g59ef144b50
next reply other threads:[~2021-09-23 4:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 4:12 David Aguilar [this message]
2021-09-23 4:12 ` [PATCH v5 1/3] difftool: fix symlink-file writing in dir-diff mode David Aguilar
2021-09-23 21:46 ` Junio C Hamano
2021-09-30 17:03 ` David Aguilar
2021-09-23 4:12 ` [PATCH v5 2/3] difftool: create a tmpdir path without repeated slashes David Aguilar
2021-09-24 10:35 ` Ævar Arnfjörð Bjarmason
2021-09-30 17:05 ` David Aguilar
2021-09-23 4:12 ` [PATCH v5 3/3] difftool: add a missing space to the run_dir_diff() comments David Aguilar
2021-09-23 18:24 ` [PATCH v5 0/3] difftool dir-diff symlink bug fix and cleanup patches 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=20210923041252.52596-1-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.