Skip to content

difftool --dir-diff: symlink all files matching the working tree

John Keeping git 2 versions In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 4 repliesIn review
  2. v12 patches 3 repliesSuperseded

Changes in v2 from the cover letter

- A new second patch to make it safer to compare symlink targets in tests
- Test in patch 3 (formerly patch 2) re-written thanks to feedback from David Aguilar

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3git-difftool(1): fix formatting of --symlink descriptionDocumentation/git-difftool.txt+2 -20 replies
2/3difftool: avoid double slashes in symlink targetsgit-difftool.perl+3 -11 reply
3/3difftool --dir-diff: symlink all files matching the working treeDocumentation/git-difftool.txt git-difftool.perl t/t7800-difftool.sh+43 -43 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/3] difftool --dir-diff: symlink all files matching the working tree

Changes since v1:
- A new second patch to make it safer to compare symlink targets in tests
- Test in patch 3 (formerly patch 2) re-written thanks to feedback from David Aguilar

This series is based on next, although I think Git's clever enough to ignore the changes in the context of the t7800 hunk so it should apply to master as well.

John Keeping (3):
git-difftool(1): fix formatting of --symlink description
difftool: avoid double slashes in symlink targets difftool --dir-diff: symlink all files matching the working tree

 Documentation/git-difftool.txt |  8 +++++---
 git-difftool.perl              | 25 +++++++++++++++++++++----
 t/t7800-difftool.sh            | 22 ++++++++++++++++++++++
 3 files changed, 48 insertions(+), 7 deletions(-)
Signature · 1 line
1.8.2.396.g36b63d6