git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 0/3] difftool dir-diff symlink bug fix and cleanup patches

From
David Aguilar <davvid@gmail.com>
Date
Sep 19, 2021, 20:38 UTC
Message-ID
<20210919203832.91207-1-davvid@gmail.com>

This patch series fixes a regression in difftool that can lead to data loss. The symlink-file writing in difftool's dir-diff mode has been fixed to no longer write-through to the symlink targets.

Please consider patching older Git versions with the fix from 1/3.
Changes since last time:
- This series has been reordered so that 1/3 is the patch that fixes the bug.
  The subsequent patches are cleanup.
- Patch 1/4 from before, which removed the tmp test repos, has been dropped.
- Patch 1/3 was updated to not remove its tmp test repo.
- Patch 1/3 was updated to consistently use "echo" in its tests.
- Patch 1/3 was updated to fix a "syminks" -> "symlinks" test comment typo.
- Patch 2/3 was reworded to improve the repeated slashes justification.
- Patch 3/3 "add a missing space to the ... comments" is unchanged.
David Aguilar (3):
  difftool: fix symlink-file writing in dir-diff mode
  difftool: use a strbuf to create a tmpdir path without double-slashes
  difftool: add a missing space to the run_dir_diff() comments
 builtin/difftool.c  | 32 ++++++++++---------
 t/t7800-difftool.sh | 75 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 91 insertions(+), 16 deletions(-)
-- 
2.33.0.720.g5b0b3ce580
Next: David Aguilar
Message 1 of 10 in “difftool dir-diff symlink bug fix and cleanup patches”
  1. 0/3 difftool dir-diff symlink bug fix and cleanup patchesDavid Aguilar, Sep 19, 2021
  2. 1/3 difftool: fix symlink-file writing in dir-diff modeDavid Aguilar, Sep 19, 2021
  3. Ævar Arnfjörð BjarmasonSep 20, 2021
  4. 2/3 difftool: use a strbuf to create a tmpdir path without repeated slashesDavid Aguilar, Sep 19, 2021
  5. Eric SunshineSep 20, 2021
  6. difftool: create a tmpdir path without repeated slashesDavid Aguilar, Sep 20, 2021
  7. 3/3 difftool: add a missing space to the run_dir_diff() commentsDavid Aguilar, Sep 19, 2021
  8. Junio C HamanoSep 20, 2021
  9. David AguilarSep 20, 2021
  10. Junio C HamanoSep 22, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.