mbox series

[v5,0/3] difftool dir-diff symlink bug fix and cleanup patches

Message ID 20210923041252.52596-1-davvid@gmail.com (mailing list archive)
Headers show
Series difftool dir-diff symlink bug fix and cleanup patches | expand

Message

David Aguilar Sept. 23, 2021, 4:12 a.m. UTC 
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(-)

Comments

Junio C Hamano Sept. 23, 2021, 6:24 p.m. UTC | #1 
David Aguilar <davvid@gmail.com> writes:

> This is a resend of previously submitted patches.

Very much appreciated.
Will queue.