summaryrefslogtreecommitdiff
path: root/git-difftool.perl
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2012-07-23 03:57:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-23 04:43:04 (GMT)
commitb965e8f44ad76a810c60406d01b45b87d6ac2701 (patch)
treeeef7901c9528802cc29e0dcbd4536118b715916c /git-difftool.perl
parentc9bdd505200120a8dab0f7417ad3fd7553e39e3f (diff)
downloadgit-b965e8f44ad76a810c60406d01b45b87d6ac2701.zip
git-b965e8f44ad76a810c60406d01b45b87d6ac2701.tar.gz
git-b965e8f44ad76a810c60406d01b45b87d6ac2701.tar.bz2
difftool: Call the temp directory "git-difftool"
The "diffall" name was left over from when this functionality was part of the "git-diffall" script in contrib/. Make the naming consistent. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-difftool.perl')
-rwxr-xr-xgit-difftool.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-difftool.perl b/git-difftool.perl
index 0ce6168..2ae344c 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -104,7 +104,7 @@ sub setup_dir_diff
exit(0) if (length($diffrtn) == 0);
# Setup temp directories
- my $tmpdir = tempdir('git-diffall.XXXXX', CLEANUP => 1, TMPDIR => 1);
+ my $tmpdir = tempdir('git-difftool.XXXXX', CLEANUP => 1, TMPDIR => 1);
my $ldir = "$tmpdir/left";
my $rdir = "$tmpdir/right";
mkpath($ldir) or die $!;