git/contrib/diffall, branch v2.0.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.0.22012-03-14T22:22:38Zcontrib/diffall: fix cleanup trap on Windows2012-03-14T22:22:38ZTim Henigantim.henigan@gmail.com2012-03-14T16:38:06Zurn:sha1:bfe392e3674770e8a0312d4945b0a5f2c9007eab
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 <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/diffall: eliminate duplicate while loops2012-03-14T22:22:08ZTim Henigantim.henigan@gmail.com2012-03-14T16:38:05Zurn:sha1:97549084f660c43fe4b6dc34bf60afef4948b432
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 <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/diffall: eliminate use of tar2012-03-14T22:20:25ZTim Henigantim.henigan@gmail.com2012-03-14T16:38:04Zurn:sha1:e33e01d07703d0c2c662c30e745dc93b543641c0
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 <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/diffall: create tmp dirs without mktemp2012-03-14T22:20:21ZTim Henigantim.henigan@gmail.com2012-03-14T16:38:03Zurn:sha1:c5770f79068fb1317c1fd19da7e7bfcc075132f3
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 <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/diffall: comment actual reason for 'cdup'2012-03-14T22:19:55ZTim Henigantim.henigan@gmail.com2012-03-14T16:38:02Zurn:sha1:a22a9477fcd64a58fafc75d12320cda2c3ce9dbb
The comment from an earlier commit did not reflect the actual reason this
operation is needed.
Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib: add git-diffall script2012-02-27T20:37:10ZTim Henigantim.henigan@gmail.com2012-02-24T19:48:57Zurn:sha1:1252bbe1c685450ec76ac750e8b0c2e0b762f93f
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 <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>