summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Henigan <tim.henigan@gmail.com>2012-03-14 16:38:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-14 22:20:21 (GMT)
commitc5770f79068fb1317c1fd19da7e7bfcc075132f3 (patch)
treea2f6fcd8641ce61a32a4531141777a53996ffb1d
parenta22a9477fcd64a58fafc75d12320cda2c3ce9dbb (diff)
downloadgit-c5770f79068fb1317c1fd19da7e7bfcc075132f3.zip
git-c5770f79068fb1317c1fd19da7e7bfcc075132f3.tar.gz
git-c5770f79068fb1317c1fd19da7e7bfcc075132f3.tar.bz2
contrib/diffall: create tmp dirs without mktemp
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>
-rwxr-xr-xcontrib/diffall/git-diffall11
1 files changed, 4 insertions, 7 deletions
diff --git a/contrib/diffall/git-diffall b/contrib/diffall/git-diffall
index d706a6d..443f646 100755
--- a/contrib/diffall/git-diffall
+++ b/contrib/diffall/git-diffall
@@ -45,13 +45,10 @@ cd "$cdup" || {
exit 1
}
-# mktemp is not available on all platforms (missing from msysgit)
-# Use a hard-coded tmp dir if it is not available
-tmp="$(mktemp -d -t tmp.XXXXXX 2>/dev/null)" || {
- tmp=/tmp/git-diffall-tmp.$$
- mkdir "$tmp" || exit 1
-}
-
+# set up temp dir
+tmp=$(perl -e 'use File::Temp qw(tempdir);
+ $t=tempdir("/tmp/git-diffall.XXXXX") or exit(1);
+ print $t') || exit 1
trap 'rm -rf "$tmp" 2>/dev/null' EXIT
left=