Skip to content

difftool improvements

John Keeping git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest5 patches 2 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5t7800: move '--symlinks' specific test to the endt/t7800-difftool.sh+15 -150 replies
2/5difftool: don't overwrite modified filesgit-difftool.perl t/t7800-difftool.sh+89 -143 replies
3/5t7800: don't hide grep outputt/t7800-difftool.sh+17 -270 replies
4/5t7800: fix tests when difftool uses --no-symlinkst/t7800-difftool.sh+1 -10 replies
5/5t7800: run --dir-diff tests with and without symlinkst/t7800-difftool.sh+19 -80 replies

Reviews trailers per patch

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

Read the v1 thread

Cover letter [PATCH 0/5] difftool improvements

This is a consolidated series replacing jk/t7800-modernize. The patches here have been rebased on master.

Patch 1 is new and moves the test added by commit 02c5631 (difftool --dir-diff: symlink all files matching the working tree) to the end of the test file. This means that once this is applied the second patch and the final three patches can become independent branches.

Patch 2 is a fix for a long standing deficiency, but the potential for this to happen has been increased by the commit mentioned above. It has already been through a couple of iterations [1].

The final three patches are the same as the current jk/t7800-modernize, with one tweaked commit message.

[1] http://article.gmane.org/gmane.comp.version-control.git/219100

John Keeping (5):
t7800: move '--symlinks' specific test to the end
difftool: don't overwrite modified files
t7800: don't hide grep output
t7800: fix tests when difftool uses --no-symlinks
t7800: run --dir-diff tests with and without symlinks

 git-difftool.perl   |  73 +++++++++++++++++++++++++++++-------
 t/t7800-difftool.sh | 105 ++++++++++++++++++++++++++++++++++------------------
 2 files changed, 127 insertions(+), 51 deletions(-)
Signature · 1 line
1.8.2.411.g65a544e