delta/git.git/contrib, branch th/git-diffall

contrib/diffall: fix cleanup trap on Windows

2012-03-14T22:22:38+00:00

Prior to this commit, the cleanup trap that removes the tmp dir
created by the script would fail on Windows. The error was silently
ignored by the script.

On Windows, a directory cannot be removed while it is the working
directory of the process (thanks to Johannes Sixt on the Git list
for this info [1]).

This commit eliminates the 'cd' into the tmp directory that caused
the error.

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

Signed-off-by: Tim Henigan 
Signed-off-by: Junio C Hamano

contrib/diffall: eliminate duplicate while loops

2012-03-14T22:22:08+00:00

There were 3 instances of a 'while read; do' that used identical logic
to populate '/tmp/right_dir'. This commit groups them into a single loop.

Signed-off-by: Tim Henigan 
Signed-off-by: Junio C Hamano

contrib/diffall: eliminate use of tar

2012-03-14T22:20:25+00:00

The 'tar' utility is not available on all platforms (some only support
'gnutar').  An earlier commit created a work-around for this problem,
but a better solution is to eliminate the use of 'tar' completely.

Signed-off-by: Tim Henigan 
Signed-off-by: Junio C Hamano

contrib/diffall: create tmp dirs without mktemp

2012-03-14T22:20:21+00:00

mktemp is not available on all platforms.  Instead of littering the code
with a work-around, this commit replaces mktemp with a one-line Perl
script.

Signed-off-by: Tim Henigan 
Signed-off-by: Junio C Hamano

contrib/diffall: comment actual reason for 'cdup'

2012-03-14T22:19:55+00:00

The comment from an earlier commit did not reflect the actual reason this
operation is needed.

Signed-off-by: Tim Henigan 
Signed-off-by: Junio C Hamano

Merge branch 'th/git-diffall'

2012-03-02T04:59:25+00:00

* th/git-diffall:
  contrib: add git-diffall script

Merge branch 'pj/completion-remote-set-url-branches'

2012-02-28T21:26:04+00:00

* pj/completion-remote-set-url-branches:
  completion: normalize increment/decrement style
  completion: remote set-*  and

Merge branch 'maint'

2012-02-27T23:37:02+00:00

* maint:
  Update draft release notes to 1.7.9.3
  CodingGuidelines: do not use 'which' in shell scripts
  CodingGuidelines: Add a note about spaces after redirection
  post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly
  post-receive-email: remove unused variable

contrib: add git-diffall script

2012-02-27T20:37:10+00:00

The 'git difftool' allows the user to view diffs using an external tool.
It runs a separate instance of the tool for each file in the diff. This
makes it tedious to review changes spanning multiple files.

The 'git-diffall' script instead prepares temporary directories with the
files to be compared and launches a single instance of the external diff
tool to view them (i.e. a directory diff).

The 'diff.tool' or 'merge.tool' configuration variable is used to specify
which external tool is used.

Signed-off-by: Tim Henigan 
Signed-off-by: Junio C Hamano

post-receive-email: match up $LOGBEGIN..$LOGEND pairs correctly

2012-02-27T19:01:16+00:00

Signed-off-by: Michael Haggerty 
Signed-off-by: Junio C Hamano