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

[PATCH v3 0/9] difftool: teach command to perform directory diffs

From
Tim Henigan <tim.henigan@gmail.com>
Date
Mar 21, 2012, 19:35 UTC
Message-ID
<1332358560-13774-1-git-send-email-tim.henigan@gmail.com>
Changes in v3:
  - Removed unused shell variable (SUBDIRECTORY_OK) from patch 7.
  - Changed patches 7 and 8 to support calling 'difftool --dir-diff' from
    a subdirectory of the repo.
  - Changed patch 8 to support 
  - Added patch 10, which makes mixing --prompt and --no-prompt and error.
  - Added tests for new difftool options in patches 11 and 12.
  - Patches 1-6 and 9 did not change and have not been resent.
  
Series Overview:

'git difftool' is a very useful command that allows git diffs to be opened in an external tool. Currently, difftool opens a separate instance of the external tool for each file that changed. This can be tedious when many files have changed.

This series teaches difftool to perform directory diffs, so that all file changes can be opened/reviewed in a single instance of the external tool.

This is the second phase of development for this feature. The first phase was added as a separate command (git diffall) in 1252bbe (contrib: add git-diffall script). During review of that script on the Git developers list, an informal development roadmap was suggested [1]. The next phase of that plan is to integrate the 'git-diffall' feature into 'difftool'. This series gets that done.

[1]: http://thread.gmane.org/gmane.comp.version-control.git/191297/focus=191383
Tim Henigan (12):
  difftool: parse options using Getopt::Long
  difftool: exit(0) when usage is printed
  difftool: remove explicit change of PATH
  difftool: stop appending '.exe' to git
  difftool: eliminate setup_environment function
  difftool: replace system call with Git::command_noisy
  difftool: teach difftool to handle directory diffs
  difftool: teach dir-diff to copy modified files back to working tree
  difftool: print list of valid tools with '--tool-help'
  difftool: do not allow mix of '--prompt' with '--no-prompt'
  t7800: add test for difftool --tool-help
  t7800: add tests for difftool --dir-diff
 Documentation/git-difftool.txt |   17 ++-
 git-difftool--helper.sh        |   19 ++-
 git-difftool.perl              |  264 +++++++++++++++++++++++++++-------------
 t/t7800-difftool.sh            |   59 +++++++--
 4 files changed, 254 insertions(+), 105 deletions(-)
-- 
1.7.10.rc1.39.g6e141f
Next: Tim Henigan
Message 1 of 17 in “difftool: teach command to perform directory diffs”
  1. 0/9 difftool: teach command to perform directory diffsTim Henigan, Mar 21, 2012
  2. 7/9 difftool: teach difftool to handle directory diffsTim Henigan, Mar 21, 2012
  3. 8/9 difftool: teach dir-diff to copy modified files back to working treeTim Henigan, Mar 21, 2012
  4. 10/9 difftool: do not allow mix of '--prompt' with '--no-prompt'Tim Henigan, Mar 21, 2012
  5. Junio C HamanoMar 21, 2012
  6. 10/9 difftool: fix regression in '--prompt' optionsTim Henigan, Mar 22, 2012
  7. Junio C HamanoMar 22, 2012
  8. Thomas RastMar 22, 2012
  9. Tim HeniganMar 22, 2012
  10. Junio C HamanoMar 22, 2012
  11. Tim HeniganMar 22, 2012
  12. Junio C HamanoMar 22, 2012
  13. Junio C HamanoMar 22, 2012
  14. 11/9 t7800: add test for difftool --tool-helpTim Henigan, Mar 21, 2012
  15. 12/9 t7800: add tests for difftool --dir-diffTim Henigan, Mar 21, 2012
  16. David AguilarMar 22, 2012
  17. Tim HeniganMar 22, 2012

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.